From 63bcbec9a09626ba09945de06b3eb74f50f3b228 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:22:42 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp | 2 +- kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h | 2 +- kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp | 12 ++++++------ kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h | 10 +++++----- .../kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp | 2 +- kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h | 2 +- kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp | 12 ++++++------ kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h | 10 +++++----- kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp | 12 ++++++------ kbabel/kbabeldict/modules/poauxiliary/pa_factory.h | 10 +++++----- kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp | 2 +- kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h | 2 +- kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp | 12 ++++++------ kbabel/kbabeldict/modules/pocompendium/pc_factory.h | 10 +++++----- kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp | 2 +- kbabel/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 +- 20 files changed, 65 insertions(+), 65 deletions(-) (limited to 'kbabel/kbabeldict/modules') 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; -- cgit v1.2.1