From 3a044decb0a5d7be822c888b2d5374573d7df96e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:23:50 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- parts/abbrev/abbrevpart.cpp | 4 ++-- parts/appwizard/appwizarddlg.cpp | 6 +++--- parts/appwizard/appwizardfactory.cpp | 4 ++-- parts/appwizard/appwizardfactory.h | 2 +- parts/documentation/plugins/djvu/docdjvuplugin.cpp | 2 +- parts/documentation/plugins/pdb/docpdbplugin.cpp | 2 +- parts/documentation/plugins/pdf/docpdfplugin.cpp | 2 +- parts/documentation/protocols/chm/chm.cpp | 2 +- parts/documentation/protocols/chm/kchmpart.cpp | 12 ++++++------ parts/documentation/protocols/chm/kchmpart.h | 12 ++++++------ parts/documentation/tools/htdig/htdigindex.cpp | 2 +- parts/fullscreen/fullscreen_part.cpp | 4 ++-- parts/snippet/snippet_part.cpp | 6 +++--- parts/snippet/snippet_part.h | 4 ++-- 14 files changed, 32 insertions(+), 32 deletions(-) (limited to 'parts') diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index b1717f1e..11f3a4d3 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -50,9 +50,9 @@ public: : KDevGenericFactory( data ) { } - virtual KInstance *createInstance() + virtual TDEInstance *createInstance() { - KInstance *instance = KDevGenericFactory::createInstance(); + TDEInstance *instance = KDevGenericFactory::createInstance(); KStandardDirs *dirs = instance->dirs(); dirs->addResourceType( "codetemplates", KStandardDirs::kde_default( "data" ) + "kdevabbrev/templates/" ); diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 38dba43f..92632de0 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -511,9 +511,9 @@ void AppWizardDialog::accept() m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" ); m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) ); - // This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE} - // and unsurprisingly, KAboutData doesn't cover every imaginable case. - // These are the licenses known to KDE-3.2 KAboutData, KDevelop doesn't have all of these as prepared options today + // This isn't too pretty, but we have several templates that use TDEAboutData::License_${LICENSE} + // and unsurprisingly, TDEAboutData doesn't cover every imaginable case. + // These are the licenses known to KDE-3.2 TDEAboutData, KDevelop doesn't have all of these as prepared options today TQString license = license_combo->currentText(); if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"|| license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" || diff --git a/parts/appwizard/appwizardfactory.cpp b/parts/appwizard/appwizardfactory.cpp index 76b25836..f60a23dc 100644 --- a/parts/appwizard/appwizardfactory.cpp +++ b/parts/appwizard/appwizardfactory.cpp @@ -23,9 +23,9 @@ AppWizardFactory::AppWizardFactory() { } -KInstance *AppWizardFactory::createInstance() +TDEInstance *AppWizardFactory::createInstance() { - KInstance *instance = KDevGenericFactory::createInstance(); + TDEInstance *instance = KDevGenericFactory::createInstance(); KStandardDirs *dirs = instance->dirs(); dirs->addResourceType("apptemplates", KStandardDirs::kde_default("data") + "kdevappwizard/templates/"); dirs->addResourceType("appimports", KStandardDirs::kde_default("data") + "kdevappwizard/imports/"); diff --git a/parts/appwizard/appwizardfactory.h b/parts/appwizard/appwizardfactory.h index 23fdfe29..57af5b3c 100644 --- a/parts/appwizard/appwizardfactory.h +++ b/parts/appwizard/appwizardfactory.h @@ -26,7 +26,7 @@ public: static const KDevPluginInfo *info(); protected: - virtual KInstance *createInstance(); + virtual TDEInstance *createInstance(); }; #endif diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index c93812ad..fca1b3b8 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -27,7 +27,7 @@ #include -static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0"); +static const TDEAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0"); typedef KDevGenericFactory DocDjvuPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) ) diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index cddc9106..f252c03e 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -27,7 +27,7 @@ #include -static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0"); +static const TDEAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0"); typedef KDevGenericFactory DocPDBPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) ) diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index 898fcc0e..c6dcb8ee 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -27,7 +27,7 @@ #include -static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0"); +static const TDEAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0"); typedef KDevGenericFactory DocPDFPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) ) diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 1d7543c3..3f0fbc54 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -41,7 +41,7 @@ extern "C" { int kdemain( int argc, char **argv ) { - KInstance instance( "kio_chm" ); + TDEInstance instance( "kio_chm" ); kdDebug() << "*** Starting kio_chm " << endl; diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index b1d9d166..c9c5f58e 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -32,8 +32,8 @@ extern "C" } } -KInstance* KChmPartFactory::s_instance = 0L; -KAboutData* KChmPartFactory::s_about = 0L; +TDEInstance* KChmPartFactory::s_instance = 0L; +TDEAboutData* KChmPartFactory::s_about = 0L; KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name ) : KParts::Factory( parent, name ) @@ -54,13 +54,13 @@ KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const c return part; } -KInstance* KChmPartFactory::instance() +TDEInstance* KChmPartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData( "kchmpart", + s_about = new TDEAboutData( "kchmpart", I18N_NOOP( "KChm" ), "1.0pre" ); - s_instance = new KInstance( s_about ); + s_instance = new TDEInstance( s_about ); } return s_instance; } @@ -69,7 +69,7 @@ KInstance* KChmPartFactory::instance() KChmPart::KChmPart( TQWidget * parent, const char * name ) : KDevHTMLPart( ), m_job(0) { - KInstance * instance = new KInstance( "kchmpart" ); + TDEInstance * instance = new TDEInstance( "kchmpart" ); setInstance( instance ); m_extension=new KParts::BrowserExtension(this); setOptions(-1); diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 5c4369c3..3ed054fe 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -27,8 +27,8 @@ #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KChmPartFactory: public KParts::Factory { @@ -43,11 +43,11 @@ class KChmPartFactory: public KParts::Factory TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; }; @@ -69,7 +69,7 @@ class KChmPart : public KDevHTMLPart */ protected: //virtual bool openFile(); - KInstance *m_instance; + TDEInstance *m_instance; KParts::BrowserExtension *m_extension; KIO::TransferJob *m_job; TQCString m_htmlData; diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index a728da7b..328a0387 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -450,7 +450,7 @@ int main(int argc, char *argv[]) KCmdLineLastOption }; - KAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"), + TDEAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"), "0.2", I18N_NOOP("TDE Index generator for documentation files.")); TDECmdLineArgs::init(argc, argv, &aboutData); diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index 7311cb62..9b6f49e6 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -31,10 +31,10 @@ FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStrin : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) { setInstance(FullScreenFactory::instance()); -// const KAboutData &abdata1 = *(info()); +// const TDEAboutData &abdata1 = *(info()); // kdDebug() << abdata1.appName() << endl; const KDevPluginInfo &_info = *info(); - const KAboutData *abdata = _info; + const TDEAboutData *abdata = _info; kdDebug() << abdata->appName() << endl; setXMLFile("kdevpart_fullscreen.rc"); diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 04993028..cd7da532 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -79,11 +79,11 @@ void SnippetPart::setupActions() /*! \fn SnippetPart::aboutData() */ -KAboutData* SnippetPart::aboutData() +TDEAboutData* SnippetPart::aboutData() { - KAboutData *data = new KAboutData ("snippetpart", I18N_NOOP("SnippetPart"), "1.1", + TDEAboutData *data = new TDEAboutData ("snippetpart", I18N_NOOP("SnippetPart"), "1.1", I18N_NOOP( "SnippetPart for TDevelop" ), - KAboutData::License_LGPL_V2, + TDEAboutData::License_LGPL_V2, I18N_NOOP( "(c) 2003" ), 0, "http://www.kdevelop.org"); data->addAuthor ("Robert Gruber", I18N_NOOP("Author"), "rgruber@users.sourceforge.net", "http://kmp3indexer.sf.net"); diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h index f9266e75..8ffd8fce 100644 --- a/parts/snippet/snippet_part.h +++ b/parts/snippet/snippet_part.h @@ -16,7 +16,7 @@ class SnippetWidget; -class KAboutData; +class TDEAboutData; class KDialogBase; /* @@ -33,7 +33,7 @@ public: SnippetPart(TQObject *parent, const char *name, const TQStringList &); ~SnippetPart(); - KAboutData * aboutData(); + TDEAboutData * aboutData(); TQStringList getAllLanguages(); TQStringList getProjectLanguages(); -- cgit v1.2.3