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/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 +- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'kbabel/kbabeldict/modules/tmx') 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