diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
| commit | 63bcbec9a09626ba09945de06b3eb74f50f3b228 (patch) | |
| tree | 205df87b7ca9a12d3295653c8e4a0dd7283ea03a /kbabel/kbabeldict/modules/dbsearchengine2 | |
| parent | cfe9ce987a45dd734b924ee4596946227a50609e (diff) | |
| download | tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/kbabeldict/modules/dbsearchengine2')
4 files changed, 13 insertions, 13 deletions
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 <klibloader.h> -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 |