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