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/dbsearchengine | |
| 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/dbsearchengine')
4 files changed, 13 insertions, 13 deletions
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 <klibloader.h> -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 |