From 63bcbec9a09626ba09945de06b3eb74f50f3b228 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:22:42 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- cervisia/cervisiapart.cpp | 6 +++--- cervisia/cervisiapart.h | 4 ++-- cervisia/cvsservice/cvsaskpass.cpp | 4 ++-- cervisia/cvsservice/main.cpp | 4 ++-- cervisia/main.cpp | 4 ++-- kapptemplate/ChangeLog | 4 ++-- kapptemplate/kapp/main.cpp | 2 +- kapptemplate/kpartapp/app_part.cpp | 4 ++-- kapptemplate/kpartapp/app_part.h | 4 ++-- kapptemplate/kpartapp/main.cpp | 2 +- kbabel/catalogmanager/main.cpp | 4 ++-- kbabel/kbabel/main.cpp | 4 ++-- kbabel/kbabeldict/aboutmoduledlg.cpp | 2 +- kbabel/kbabeldict/aboutmoduledlg.h | 4 ++-- kbabel/kbabeldict/kbabeldictbox.cpp | 4 ++-- kbabel/kbabeldict/main.cpp | 4 ++-- .../modules/dbsearchengine/KDBSearchEngine.cpp | 2 +- .../modules/dbsearchengine/KDBSearchEngine.h | 2 +- .../modules/dbsearchengine/dbse_factory.cpp | 12 ++++++------ .../kbabeldict/modules/dbsearchengine/dbse_factory.h | 10 +++++----- .../modules/dbsearchengine2/KDBSearchEngine2.cpp | 2 +- .../modules/dbsearchengine2/KDBSearchEngine2.h | 2 +- .../modules/dbsearchengine2/dbse2_factory.cpp | 12 ++++++------ .../modules/dbsearchengine2/dbse2_factory.h | 10 +++++----- kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp | 12 ++++++------ kbabel/kbabeldict/modules/poauxiliary/pa_factory.h | 10 +++++----- .../kbabeldict/modules/poauxiliary/poauxiliary.cpp | 2 +- kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h | 2 +- .../kbabeldict/modules/pocompendium/pc_factory.cpp | 12 ++++++------ kbabel/kbabeldict/modules/pocompendium/pc_factory.h | 10 +++++----- .../kbabeldict/modules/pocompendium/pocompendium.cpp | 2 +- .../kbabeldict/modules/pocompendium/pocompendium.h | 2 +- kbabel/kbabeldict/modules/tmx/pc_factory.cpp | 12 ++++++------ kbabel/kbabeldict/modules/tmx/pc_factory.h | 10 +++++----- kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp | 2 +- kbabel/kbabeldict/modules/tmx/tmxcompendium.h | 2 +- kbabel/kbabeldict/searchengine.h | 2 +- kbugbuster/main.cpp | 4 ++-- kioslave/svn/svn.cpp | 2 +- kmtrace/kmtrace.cpp | 2 +- kompare/komparenavtreepart/komparenavtreepart.cpp | 10 +++++----- kompare/komparenavtreepart/komparenavtreepart.h | 10 +++++----- kompare/komparepart/kompare_part.cpp | 4 ++-- kompare/komparepart/kompare_part.h | 2 +- kompare/main.cpp | 4 ++-- kspy/main.cpp | 4 ++-- kstartperf/kstartperf.cpp | 4 ++-- kuiviewer/kuiviewer_part.cpp | 6 +++--- kuiviewer/kuiviewer_part.h | 4 ++-- kuiviewer/main.cpp | 4 ++-- kunittest/example/simple/maingui.cpp | 4 ++-- kunittest/guimodrunner.cpp | 6 +++--- scripts/fixheaders | 6 +++--- tdecachegrind/tdecachegrind/main.cpp | 4 ++-- umbrello/umbrello/docgenerators/main.cpp | 4 ++-- umbrello/umbrello/main.cpp | 4 ++-- umbrello/umbrello/plugin.h | 4 ++-- 57 files changed, 142 insertions(+), 142 deletions(-) diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp index da2d1556..775b5220 100644 --- a/cervisia/cervisiapart.cpp +++ b/cervisia/cervisiapart.cpp @@ -730,12 +730,12 @@ void CervisiaPart::aboutCervisia() } -KAboutData* CervisiaPart::createAboutData() +TDEAboutData* CervisiaPart::createAboutData() { - KAboutData* about = new KAboutData( + TDEAboutData* about = new TDEAboutData( "cervisiapart", I18N_NOOP("Cervisia Part"), CERVISIA_VERSION, I18N_NOOP("A CVS frontend"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("Copyright (c) 1999-2002 Bernd Gehrmann"), 0, "http://www.kde.org/apps/cervisia"); diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h index f1a7ea5b..5ab4efe4 100644 --- a/cervisia/cervisiapart.h +++ b/cervisia/cervisiapart.h @@ -40,7 +40,7 @@ class TQSplitter; class TQTimer; class UpdateView; class ProtocolView; -class KAboutData; +class TDEAboutData; class KListView; class KRecentFilesAction; class CvsService_stub; @@ -67,7 +67,7 @@ public: TQString sandBox() const { return sandbox; } - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); public slots: // unused because we overwrite the default behaviour of openURL() diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp index ac6a6796..1215a812 100644 --- a/cervisia/cvsservice/cvsaskpass.cpp +++ b/cervisia/cvsservice/cvsaskpass.cpp @@ -37,9 +37,9 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain(int argc, char** argv) { - KAboutData about("cvsaskpass", I18N_NOOP("cvsaskpass"), "0.1", + TDEAboutData about("cvsaskpass", I18N_NOOP("cvsaskpass"), "0.1", I18N_NOOP("ssh-askpass for the CVS DCOP Service"), - KAboutData::License_LGPL, + TDEAboutData::License_LGPL, I18N_NOOP("Copyright (c) 2003 Christian Loose")); TDECmdLineArgs::init(argc, argv, &about); diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp index bcb666a2..7b4ab31e 100644 --- a/cervisia/cvsservice/main.cpp +++ b/cervisia/cvsservice/main.cpp @@ -27,8 +27,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv) { - KAboutData about("cvsservice", I18N_NOOP("CVS DCOP service"), "0.1", - I18N_NOOP("DCOP service for CVS"), KAboutData::License_LGPL, + TDEAboutData about("cvsservice", I18N_NOOP("CVS DCOP service"), "0.1", + I18N_NOOP("DCOP service for CVS"), TDEAboutData::License_LGPL, "Copyright (c) 2002-2003 Christian Loose"); about.addAuthor("Christian Loose", I18N_NOOP("Developer"), "christian.loose@hamburg.de"); diff --git a/cervisia/main.cpp b/cervisia/main.cpp index 1290995b..9d9c89a9 100644 --- a/cervisia/main.cpp +++ b/cervisia/main.cpp @@ -146,8 +146,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { "annotate ", I18N_NOOP("Show annotation dialog for the given file"), 0 }, KCmdLineLastOption }; - KAboutData about("cervisia", I18N_NOOP("Cervisia"), CERVISIA_VERSION, - I18N_NOOP("A CVS frontend"), KAboutData::License_GPL, + TDEAboutData about("cervisia", I18N_NOOP("Cervisia"), CERVISIA_VERSION, + I18N_NOOP("A CVS frontend"), TDEAboutData::License_GPL, I18N_NOOP("Copyright (c) 1999-2002 Bernd Gehrmann\n" "Copyright (c) 2002-2007 the Cervisia authors"), 0, "http://www.kde.org/apps/cervisia"); diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog index dc15a2a2..8cb9b55a 100644 --- a/kapptemplate/ChangeLog +++ b/kapptemplate/ChangeLog @@ -98,7 +98,7 @@ Oct-14-2000 - Malte Starostik (v0.7.2) o Added option to not run ./configure on newly created project Sep-26-2000 - Kurt Granroth (v0.7.1) - o Added hooks for more KAboutData information + o Added hooks for more TDEAboutData information o Now building moc files as moc.cpp instead of #including them Jul-21-2000 - Kurt Granroth (v0.7) @@ -122,7 +122,7 @@ Feb-26-2000 - Kurt Granroth (v0.6) o Converted to use the new XML UI framework (big change!) Jan-12-2000 - Kurt Granroth (v0.5.2) - o Use KAboutData and TDECmdLineArgs + o Use TDEAboutData and TDECmdLineArgs Dec-28-1999 - Kurt Granroth (v0.5.1) o The po Makefile now uses the autogenerated rules. I don't know diff --git a/kapptemplate/kapp/main.cpp b/kapptemplate/kapp/main.cpp index abf4cf92..14cabdd4 100644 --- a/kapptemplate/kapp/main.cpp +++ b/kapptemplate/kapp/main.cpp @@ -20,7 +20,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}"); + TDEAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, TDEAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}"); about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp index adbda9db..a95c0711 100644 --- a/kapptemplate/kpartapp/app_part.cpp +++ b/kapptemplate/kpartapp/app_part.cpp @@ -83,12 +83,12 @@ void ${APP_NAME}Part::setModified(bool modified) ReadWritePart::setModified(modified); } -KAboutData *${APP_NAME}Part::createAboutData() +TDEAboutData *${APP_NAME}Part::createAboutData() { // the non-i18n name here must be the same as the directory in // which the part's rc file is installed ('partrcdir' in the // Makefile) - KAboutData *aboutData = new KAboutData("${APP_NAME_LC}part", I18N_NOOP("${APP_NAME}Part"), "${APP_VERSION}"); + TDEAboutData *aboutData = new TDEAboutData("${APP_NAME_LC}part", I18N_NOOP("${APP_NAME}Part"), "${APP_VERSION}"); aboutData->addAuthor("${AUTHOR}", 0, "${EMAIL}"); return aboutData; } diff --git a/kapptemplate/kpartapp/app_part.h b/kapptemplate/kpartapp/app_part.h index 556c3502..1150a21d 100644 --- a/kapptemplate/kpartapp/app_part.h +++ b/kapptemplate/kpartapp/app_part.h @@ -9,7 +9,7 @@ class TQWidget; class TQPainter; class KURL; class TQMultiLineEdit; -class KAboutData; +class TDEAboutData; /** * This is a "Part". It that does all the real work in a KPart @@ -47,7 +47,7 @@ public: */ virtual void setModified(bool modified); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); protected: /** diff --git a/kapptemplate/kpartapp/main.cpp b/kapptemplate/kpartapp/main.cpp index 55cb53d7..dc584543 100644 --- a/kapptemplate/kpartapp/main.cpp +++ b/kapptemplate/kpartapp/main.cpp @@ -19,7 +19,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}"); + TDEAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, TDEAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}"); about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index ef17c176..b7d04b43 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -183,8 +183,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { KLocale::setMainCatalogue("kbabel"); - KAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION, - I18N_NOOP("An advanced catalog manager for KBabel"),KAboutData::License_GPL, + TDEAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION, + I18N_NOOP("An advanced catalog manager for KBabel"),TDEAboutData::License_GPL, I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://kbabel.kde.org"); about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org"); diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index 1e8ca625..1ecea9ed 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -544,8 +544,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION, - I18N_NOOP("An advanced PO file editor"),KAboutData::License_GPL, + TDEAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION, + I18N_NOOP("An advanced PO file editor"),TDEAboutData::License_GPL, I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://kbabel.kde.org"); about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org"); diff --git a/kbabel/kbabeldict/aboutmoduledlg.cpp b/kbabel/kbabeldict/aboutmoduledlg.cpp index 861fe01a..aaa4ca0f 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.cpp +++ b/kbabel/kbabeldict/aboutmoduledlg.cpp @@ -35,7 +35,7 @@ #include #include -AboutModuleDlg::AboutModuleDlg(const KAboutData *aboutData, TQWidget *parent) +AboutModuleDlg::AboutModuleDlg(const TDEAboutData *aboutData, TQWidget *parent) : KAboutApplication(aboutData, parent) , _aboutData(aboutData) { diff --git a/kbabel/kbabeldict/aboutmoduledlg.h b/kbabel/kbabeldict/aboutmoduledlg.h index 56b82930..3b1abaa9 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.h +++ b/kbabel/kbabeldict/aboutmoduledlg.h @@ -44,13 +44,13 @@ class AboutModuleDlg : public KAboutApplication public: - AboutModuleDlg(const KAboutData *aboutData, TQWidget* parent=0); + AboutModuleDlg(const TDEAboutData *aboutData, TQWidget* parent=0); public slots: virtual void helpClickedSlot(const TQString&); private: - const KAboutData *_aboutData; + const TDEAboutData *_aboutData; }; #endif diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 239801d3..fa483d85 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -372,7 +372,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) rcConfig.setGroup("SearchEngine"); TQStringList appList = rcConfig.readListEntry("Applications"); - KInstance *inst = KGlobal::instance(); + TDEInstance *inst = KGlobal::instance(); if(inst && !appList.isEmpty() && !appList.contains(inst->instanceName())) { continue; @@ -1230,7 +1230,7 @@ void KBabelDictBox::about() { KAboutContainer *page = aboutDlg->addScrolledContainerPage(e->name()); - const KAboutData *aboutData = e->about(); + const TDEAboutData *aboutData = e->about(); if(aboutData) { diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index fb783fa4..9cdffa29 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.cpp @@ -111,8 +111,8 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("kbabel"); - KAboutData about("kbabeldict",I18N_NOOP("KBabel - Dictionary"),VERSION, - I18N_NOOP("A dictionary for translators"),KAboutData::License_GPL, + TDEAboutData about("kbabeldict",I18N_NOOP("KBabel - Dictionary"),VERSION, + I18N_NOOP("A dictionary for translators"),TDEAboutData::License_GPL, I18N_NOOP("(c) 2000,2001,2002,2003 The KBabeldict developers"),0,"http://kbabel.kde.org"); about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org"); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 46948614..76b3bdc9 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -1398,7 +1398,7 @@ KDBSearchEngine::scanFile () delete sca; } -const KAboutData * +const TDEAboutData * KDBSearchEngine::about () const { diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h index d7715e4e..d246c5a7 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h @@ -196,7 +196,7 @@ public: virtual PrefWidget *preferencesWidget(TQWidget *parent); - virtual const KAboutData *about() const; + virtual const TDEAboutData *about() const; virtual TQString name() const; diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp index 86975874..d18fd691 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp @@ -17,8 +17,8 @@ extern "C" } -KInstance *DbSeFactory::s_instance = 0; -KAboutData *DbSeFactory::s_about = 0; +TDEInstance *DbSeFactory::s_instance = 0; +TDEAboutData *DbSeFactory::s_about = 0; DbSeFactory::DbSeFactory( TQObject *parent, const char *name) @@ -58,22 +58,22 @@ TQObject *DbSeFactory::createObject( TQObject *parent, const char *name, } -KInstance *DbSeFactory::instance() +TDEInstance *DbSeFactory::instance() { if(!s_instance) { - s_about = new KAboutData( "kdbsearchengine", + s_about = new TDEAboutData( "kdbsearchengine", I18N_NOOP("Translation Database") , "0.3" , I18N_NOOP("A fast translation search engine based on databases") - , KAboutData::License_GPL + , TDEAboutData::License_GPL , I18N_NOOP("Copyright 2000-2001 by Andrea Rizzi") ,0,0, "rizzi@kde.org"); s_about->addAuthor("Andrea Rizzi",0,"rizzi@kde.org"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h index ddebfa46..c5fb96af 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h @@ -2,8 +2,8 @@ #define DBSE_FACTORY_H #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class DbSeFactory : public KLibFactory { @@ -17,11 +17,11 @@ public: const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; }; #endif diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index 826800d9..9620bf63 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -238,7 +238,7 @@ bool KDBSearchEngine2::init() } } -const KAboutData *KDBSearchEngine2::about() const +const TDEAboutData *KDBSearchEngine2::about() const { return DbSe2Factory::instance()->aboutData(); } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h index a9377d68..29615e9e 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h @@ -83,7 +83,7 @@ class KDBSearchEngine2 : public SearchEngine virtual PrefWidget* preferencesWidget(TQWidget *parent); /** @returns information about this SearchEngine */ - virtual const KAboutData *about() const; + virtual const TDEAboutData *about() const; /** @returns the i18n name of this search engine */ TQString name() const {return i18n("DB SearchEngine II");} diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp index 55f6a16f..b82528b9 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp @@ -18,8 +18,8 @@ extern "C" }; -KInstance *DbSe2Factory::s_instance = 0; -KAboutData *DbSe2Factory::s_about = 0; +TDEInstance *DbSe2Factory::s_instance = 0; +TDEAboutData *DbSe2Factory::s_about = 0; DbSe2Factory::DbSe2Factory( TQObject *parent, const char *name) @@ -59,22 +59,22 @@ TQObject *DbSe2Factory::createObject( TQObject *parent, const char *name, } -KInstance *DbSe2Factory::instance() +TDEInstance *DbSe2Factory::instance() { if(!s_instance) { - s_about = new KAboutData( "kdbsearchengine2", + s_about = new TDEAboutData( "kdbsearchengine2", I18N_NOOP("Translation Database") , "1.99" , I18N_NOOP("A fast translation search engine based on databases") - , KAboutData::License_GPL + , TDEAboutData::License_GPL , I18N_NOOP("Copyright 2000-2003 by Andrea Rizzi") ,0,0, "rizzi@kde.org"); s_about->addAuthor("Andrea Rizzi",0,"rizzi@kde.org"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h index 267ec14f..a34cf1ed 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h @@ -2,8 +2,8 @@ #define DBSE2_FACTORY_H #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class DbSe2Factory : public KLibFactory { @@ -17,11 +17,11 @@ public: const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; }; #endif diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp index f17397f9..9d658220 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp @@ -50,8 +50,8 @@ extern "C" } -KInstance *PaFactory::s_instance = 0; -KAboutData *PaFactory::s_about = 0; +TDEInstance *PaFactory::s_instance = 0; +TDEAboutData *PaFactory::s_about = 0; PaFactory::PaFactory( TQObject *parent, const char *name) @@ -88,20 +88,20 @@ TQObject *PaFactory::createObject( TQObject *parent, const char *name } -KInstance *PaFactory::instance() +TDEInstance *PaFactory::instance() { if(!s_instance) { - s_about = new KAboutData( "poauxiliary", I18N_NOOP("PO Auxiliary") + s_about = new TDEAboutData( "poauxiliary", I18N_NOOP("PO Auxiliary") , "1.0" , I18N_NOOP("A simple module for exact searching in a PO file") - , KAboutData::License_GPL + , TDEAboutData::License_GPL , "Copyright 2000, Matthias Kiefer" ,0,0, "kiefer@kde.org"); s_about->addAuthor("Matthias Kiefer",0,"kiefer@kde.org"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h index 640bcf8a..a0a5a361 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h @@ -36,8 +36,8 @@ #define PA_FACTORY_H #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class PaFactory : public KLibFactory { @@ -51,11 +51,11 @@ public: , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; }; #endif diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index 110dd874..fad15a21 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -136,7 +136,7 @@ PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *parent) return prefWidget; } -const KAboutData *PoAuxiliary::about() const +const TDEAboutData *PoAuxiliary::about() const { return PaFactory::instance()->aboutData(); } diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h index b5fd7af7..eaa8b890 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h @@ -67,7 +67,7 @@ public: virtual PrefWidget *preferencesWidget(TQWidget *parent); - virtual const KAboutData *about() const; + virtual const TDEAboutData *about() const; virtual TQString name() const; diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp index cb61de6b..16101750 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp @@ -50,8 +50,8 @@ extern "C" } -KInstance *PcFactory::s_instance = 0; -KAboutData *PcFactory::s_about = 0; +TDEInstance *PcFactory::s_instance = 0; +TDEAboutData *PcFactory::s_about = 0; PcFactory::PcFactory( TQObject *parent, const char *name) @@ -88,20 +88,20 @@ TQObject *PcFactory::createObject( TQObject *parent, const char *name } -KInstance *PcFactory::instance() +TDEInstance *PcFactory::instance() { if(!s_instance) { - s_about = new KAboutData( "pocompendium", I18N_NOOP("PO Compendium") + s_about = new TDEAboutData( "pocompendium", I18N_NOOP("PO Compendium") , "1.0" , I18N_NOOP("A module for searching in a PO file") - , KAboutData::License_GPL + , TDEAboutData::License_GPL , "Copyright 2000-2001, Matthias Kiefer" ,0,0, "kiefer@kde.org"); s_about->addAuthor("Matthias Kiefer",0,"kiefer@kde.org"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h b/kbabel/kbabeldict/modules/pocompendium/pc_factory.h index 0d287259..bd94712a 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.h @@ -36,8 +36,8 @@ #define PC_FACTORY_H #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class PcFactory : public KLibFactory { @@ -51,11 +51,11 @@ public: , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; }; #endif diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 7c462099..95557332 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -173,7 +173,7 @@ PrefWidget *PoCompendium::preferencesWidget(TQWidget *parent) return prefWidget; } -const KAboutData *PoCompendium::about() const +const TDEAboutData *PoCompendium::about() const { return PcFactory::instance()->aboutData(); } diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h index c0d33d5e..ef6eec63 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h @@ -70,7 +70,7 @@ public: virtual PrefWidget *preferencesWidget(TQWidget *parent); - virtual const KAboutData *about() const; + virtual const TDEAboutData *about() const; virtual TQString name() const; diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp index 864f9fed..4847283d 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp @@ -50,8 +50,8 @@ extern "C" } -KInstance *PcFactory::s_instance = 0; -KAboutData *PcFactory::s_about = 0; +TDEInstance *PcFactory::s_instance = 0; +TDEAboutData *PcFactory::s_about = 0; PcFactory::PcFactory( TQObject *parent, const char *name) @@ -88,21 +88,21 @@ TQObject *PcFactory::createObject( TQObject *parent, const char *name } -KInstance *PcFactory::instance() +TDEInstance *PcFactory::instance() { if(!s_instance) { - s_about = new KAboutData( "tmxcompendium", I18N_NOOP("TMX Compendium") + s_about = new TDEAboutData( "tmxcompendium", I18N_NOOP("TMX Compendium") , "1.0" , I18N_NOOP("A module for searching in a TMX file") - , KAboutData::License_GPL + , TDEAboutData::License_GPL , "Copyright 2002, Stanislav Visnovsky" ,0,0, "visnovsky@kde.org"); s_about->addAuthor("Matthias Kiefer",0,"kiefer@kde.org"); s_about->addAuthor("Stanislav Visnovsky",0,"visnovsky@kde.org"); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.h b/kbabel/kbabeldict/modules/tmx/pc_factory.h index 0e5ba547..6c8a900f 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.h +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.h @@ -38,8 +38,8 @@ #define PC_FACTORY_H #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class PcFactory : public KLibFactory { @@ -53,11 +53,11 @@ public: , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); - static KInstance *instance(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_about; + static TDEInstance *s_instance; + static TDEAboutData *s_about; }; #endif diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 3f212f1e..37c3f4bf 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -164,7 +164,7 @@ PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent) return prefWidget; } -const KAboutData *TmxCompendium::about() const +const TDEAboutData *TmxCompendium::about() const { return PcFactory::instance()->aboutData(); } diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h index b4e61c9e..8f75f5e6 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h @@ -68,7 +68,7 @@ public: virtual PrefWidget *preferencesWidget(TQWidget *parent); - virtual const KAboutData *about() const; + virtual const TDEAboutData *about() const; virtual TQString name() const; diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h index 4dfb7f2a..ace70b9c 100644 --- a/kbabel/kbabeldict/searchengine.h +++ b/kbabel/kbabeldict/searchengine.h @@ -359,7 +359,7 @@ public: virtual PrefWidget* preferencesWidget(TQWidget *parent)=0; /** @returns information about this SearchEngine */ - virtual const KAboutData *about() const= 0; + virtual const TDEAboutData *about() const= 0; /** @returns the i18n name of this search engine */ virtual TQString name() const= 0; diff --git a/kbugbuster/main.cpp b/kbugbuster/main.cpp index e472dec7..ec30480c 100644 --- a/kbugbuster/main.cpp +++ b/kbugbuster/main.cpp @@ -44,8 +44,8 @@ static const KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kbugbuster", I18N_NOOP( "KBugBuster" ), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kbugbuster", I18N_NOOP( "KBugBuster" ), + VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001,2002,2003 the KBugBuster authors") ); aboutData.addAuthor( "Martijn Klingens", 0, "klingens@kde.org" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp index 9d06c516..cfb4b243 100644 --- a/kioslave/svn/svn.cpp +++ b/kioslave/svn/svn.cpp @@ -1574,7 +1574,7 @@ void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { extern "C" { KDE_EXPORT int kdemain(int argc, char **argv) { - KInstance instance( "kio_svn" ); + TDEInstance instance( "kio_svn" ); kdDebug(7128) << "*** Starting kio_svn " << endl; diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp index 4e13b6da..fb568582 100644 --- a/kmtrace/kmtrace.cpp +++ b/kmtrace/kmtrace.cpp @@ -578,7 +578,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KInstance instance("kmtrace"); + TDEInstance instance("kmtrace"); TDECmdLineArgs::init(argc, argv, "kmtrace", "KDE Memory leak tracer", "v1.0"); diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index 9f9d775e..3dca1b12 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -659,8 +659,8 @@ KDirLVI::~KDirLVI() } // part stuff -KInstance* KompareNavTreePartFactory::s_instance = 0L; -KAboutData* KompareNavTreePartFactory::s_about = 0L; +TDEInstance* KompareNavTreePartFactory::s_instance = 0L; +TDEAboutData* KompareNavTreePartFactory::s_about = 0L; KompareNavTreePartFactory::KompareNavTreePartFactory() : KParts::Factory() @@ -687,14 +687,14 @@ KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidge return obj; } -KInstance* KompareNavTreePartFactory::instance() +TDEInstance* KompareNavTreePartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData("komparenavtreepart", I18N_NOOP("KompareNavTreePart"), "1.1"); + s_about = new TDEAboutData("komparenavtreepart", I18N_NOOP("KompareNavTreePart"), "1.1"); s_about->addAuthor("John Firebaugh", "Author", "jfirebaugh@kde.org"); s_about->addAuthor("Otto Bruggeman", "Author", "otto.bruggeman@home.nl" ); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h index 4172a8ed..0f670295 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.h +++ b/kompare/komparenavtreepart/komparenavtreepart.h @@ -170,8 +170,8 @@ private: }; // part stuff -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KompareNavTreePartFactory : public KParts::Factory { @@ -183,11 +183,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, 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; }; #endif diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index a00a7cb8..0c565820 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -476,9 +476,9 @@ void KomparePart::saveDiff() delete dlg; } -KAboutData *KomparePart::createAboutData() +TDEAboutData *KomparePart::createAboutData() { - KAboutData *about = new KAboutData("kompare", I18N_NOOP("KomparePart"), "3.2"); + TDEAboutData *about = new TDEAboutData("kompare", I18N_NOOP("KomparePart"), "3.2"); about->addAuthor("John Firebaugh", "Author", "jfirebaugh@kde.org"); about->addAuthor("Otto Bruggeman", "Author", "otto.bruggeman@home.nl" ); return about; diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h index a3de09f2..c2ed918e 100644 --- a/kompare/komparepart/kompare_part.h +++ b/kompare/komparepart/kompare_part.h @@ -87,7 +87,7 @@ public: // Do we really want to expose this ??? const Diff2::KompareModelList* model() const { return m_modelList; }; - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); public: // Reimplemented from the KompareInterface diff --git a/kompare/main.cpp b/kompare/main.cpp index 659f91f7..84a21fab 100644 --- a/kompare/main.cpp +++ b/kompare/main.cpp @@ -49,8 +49,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description, - KAboutData::License_GPL, + TDEAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2001-2004, John Firebaugh and Otto Bruggeman"), 0, "http://bruggie.dnsalias.org/kompare/" ); aboutData.addAuthor( "John Firebaugh", I18N_NOOP("Author"), "jfirebaugh@kde.org" ); aboutData.addAuthor( "Otto Bruggeman", I18N_NOOP("Author"), "otto.bruggeman@home.nl" ); diff --git a/kspy/main.cpp b/kspy/main.cpp index ed52dff5..6c5f7916 100644 --- a/kspy/main.cpp +++ b/kspy/main.cpp @@ -35,8 +35,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "spy", I18N_NOOP("Spy"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "spy", I18N_NOOP("Spy"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2001, Richard Moore", 0, 0, "rich@kde.org"); aboutData.addAuthor("Richard Moore",0, "rich@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp index 97940485..91b583da 100644 --- a/kstartperf/kstartperf.cpp +++ b/kstartperf/kstartperf.cpp @@ -71,9 +71,9 @@ TQString libkstartperf() int main(int argc, char **argv) { - KAboutData aboutData("kstartperf", I18N_NOOP("KStartPerf"), + TDEAboutData aboutData("kstartperf", I18N_NOOP("KStartPerf"), "1.0", I18N_NOOP("Measures start up time of a TDE application"), - KAboutData::License_Artistic, + TDEAboutData::License_Artistic, "Copyright (c) 2000 Geert Jansen and libkmapnotify authors"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), "jansen@kde.org", "http://www.stack.nl/~geertj/"); diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index bd87a6ee..87b332ed 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -111,14 +111,14 @@ KUIViewerPart::~KUIViewerPart() { } -KAboutData *KUIViewerPart::createAboutData() +TDEAboutData *KUIViewerPart::createAboutData() { // the non-i18n name here must be the same as the directory in // which the part's rc file is installed ('partrcdir' in the // Makefile) - KAboutData *aboutData = new KAboutData("kuiviewerpart", I18N_NOOP("KUIViewerPart"), "0.1", + TDEAboutData *aboutData = new TDEAboutData("kuiviewerpart", I18N_NOOP("KUIViewerPart"), "0.1", I18N_NOOP("Displays Designer's UI files"), - KAboutData::License_LGPL ); + TDEAboutData::License_LGPL ); aboutData->addAuthor("Richard Moore", 0, "rich@kde.org"); aboutData->addAuthor("Ian Reinhart Geiser", 0, "geiseri@kde.org"); return aboutData; diff --git a/kuiviewer/kuiviewer_part.h b/kuiviewer/kuiviewer_part.h index 644db709..779a51cd 100644 --- a/kuiviewer/kuiviewer_part.h +++ b/kuiviewer/kuiviewer_part.h @@ -28,7 +28,7 @@ class TQWidget; class KURL; class TQVBox; -class KAboutData; +class TDEAboutData; class KListAction; class KListView; @@ -56,7 +56,7 @@ public: */ virtual ~KUIViewerPart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); public slots: bool openURL( const KURL& ); diff --git a/kuiviewer/main.cpp b/kuiviewer/main.cpp index 998c539c..e7a0396f 100644 --- a/kuiviewer/main.cpp +++ b/kuiviewer/main.cpp @@ -40,9 +40,9 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1", + TDEAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1", I18N_NOOP("Displays Designer's UI files"), - KAboutData::License_LGPL ); + TDEAboutData::License_LGPL ); about.addAuthor("Richard Moore", 0, "rich@kde.org"); about.addAuthor("Ian Reinhart Geiser", 0, "geiseri@kde.org"); // Screenshot capability diff --git a/kunittest/example/simple/maingui.cpp b/kunittest/example/simple/maingui.cpp index 9c3d52ed..b292d780 100644 --- a/kunittest/example/simple/maingui.cpp +++ b/kunittest/example/simple/maingui.cpp @@ -43,8 +43,8 @@ static KCmdLineOptions options[] = int main( int argc, char** argv ) { - KAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description, - KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, + TDEAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description, + TDEAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, "Jeroen.Wijnhout@kdemail.net"); TDECmdLineArgs::init(argc, argv, &about); diff --git a/kunittest/guimodrunner.cpp b/kunittest/guimodrunner.cpp index 455cf45b..11a3532b 100644 --- a/kunittest/guimodrunner.cpp +++ b/kunittest/guimodrunner.cpp @@ -49,10 +49,10 @@ static KCmdLineOptions options[] = int main( int argc, char **argv ) { - KInstance instance("modrunner"); + TDEInstance instance("modrunner"); - KAboutData about("KUnitTestModRunner", I18N_NOOP("KUnitTestModRunner"), version, description, - KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, + TDEAboutData about("KUnitTestModRunner", I18N_NOOP("KUnitTestModRunner"), version, description, + TDEAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, "Jeroen.Wijnhout@kdemail.net"); TDECmdLineArgs::init(argc, argv, &about); diff --git a/scripts/fixheaders b/scripts/fixheaders index b1b0a15b..5cb09c0c 100644 --- a/scripts/fixheaders +++ b/scripts/fixheaders @@ -36,8 +36,8 @@ $lastdir = '.'; 'variable `QFile \S*\' has initializer but incomplete type' => "qfile", 'type `KConfigBase\' is not a base type for type `KConfig' => "kconfig", 'invalid use of undefined type `class QAccel' => "qaccel", - 'invalid use of undefined type `class KAboutData' => "kaboutdata", - 'incomplete type `KAboutData\'' => "kaboutdata", + 'invalid use of undefined type `class TDEAboutData' => "kaboutdata", + 'incomplete type `TDEAboutData\'' => "kaboutdata", 'incomplete type `QGrid\'' => "qgrid", 'invalid use of undefined type `class QGrid\'' => "qgrid", 'aggregate `class KConfig \S*\' has incomplete type' => "kconfig", @@ -74,7 +74,7 @@ $lastdir = '.'; 'implicit declaration of function `int UserIcon\(...\)\'' => "kiconloader", '`KIcon\' undeclared \(first use this function\)' => "kiconloader", 'invalid use of undefined type `class KIconLoader' => "kiconloader", - 'invalid use of undefined type `class KInstance' => "kinstance", + 'invalid use of undefined type `class TDEInstance' => "kinstance", 'invalid use of undefined type `class DCOPClient' => "dcopclient", '`DCOPClient\' undeclared \(first use this function\)' => "dcopclient", 'invalid use of undefined type `class KStatusBar\'' => "kstatusbar", diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp index eae60329..81d05ee6 100644 --- a/tdecachegrind/tdecachegrind/main.cpp +++ b/tdecachegrind/tdecachegrind/main.cpp @@ -42,11 +42,11 @@ static KCmdLineOptions options[] = int main( int argc, char ** argv ) { - KAboutData aboutData("tdecachegrind", + TDEAboutData aboutData("tdecachegrind", I18N_NOOP("KCachegrind"), TDECACHEGRIND_VERSION, I18N_NOOP("TDE Frontend for Cachegrind"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(C) 2002, 2003, 2004"), 0, "http://tdecachegrind.sf.net"); aboutData.addAuthor("Josef Weidendorfer", diff --git a/umbrello/umbrello/docgenerators/main.cpp b/umbrello/umbrello/docgenerators/main.cpp index 9813cb40..08d8c317 100644 --- a/umbrello/umbrello/docgenerators/main.cpp +++ b/umbrello/umbrello/docgenerators/main.cpp @@ -59,8 +59,8 @@ int main(int argc, char *argv[]) int nbparams = 0; params[nbparams] = NULL; - KAboutData aboutData( "umbodoc", I18N_NOOP("Umbrello UML Modeller autonomous code generator"), - UMBRELLO_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "umbodoc", I18N_NOOP("Umbrello UML Modeller autonomous code generator"), + UMBRELLO_VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller Authors"), 0, "http://uml.sf.net/"); aboutData.addAuthor("Gael de Chalendar (aka Kleag)",0, "kleag@free.fr"); diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp index 891fabee..24928759 100644 --- a/umbrello/umbrello/main.cpp +++ b/umbrello/umbrello/main.cpp @@ -90,8 +90,8 @@ extern "C" int flushEvents() { } int main(int argc, char *argv[]) { - KAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"), - UMBRELLO_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"), + UMBRELLO_VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"), 0, "http://uml.sf.net/"); aboutData.addAuthor("Paul Hensgen",0, "phensgen@users.sourceforge.net"); diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h index ce5beff0..da8e92df 100644 --- a/umbrello/umbrello/plugin.h +++ b/umbrello/umbrello/plugin.h @@ -76,8 +76,8 @@ class PluginLoader; * must not load GUI plugins. * * In order to provide application-like functionality, this class offers - * support for accessing the configuration records of the KInstance object - * corresponding to the shared library. Because the KInstance object is + * support for accessing the configuration records of the TDEInstance object + * corresponding to the shared library. Because the TDEInstance object is * only available within the scope of the shared library, the configuration * records must be set in the constructor of the derived plugin class. However, * because the construction name is passed to this constructor (as are the