summaryrefslogtreecommitdiffstats
path: root/kbabel/kbabeldict/modules/tmx
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:42 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:42 -0600
commit63bcbec9a09626ba09945de06b3eb74f50f3b228 (patch)
tree205df87b7ca9a12d3295653c8e4a0dd7283ea03a /kbabel/kbabeldict/modules/tmx
parentcfe9ce987a45dd734b924ee4596946227a50609e (diff)
downloadtdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz
tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/kbabeldict/modules/tmx')
-rw-r--r--kbabel/kbabeldict/modules/tmx/pc_factory.cpp12
-rw-r--r--kbabel/kbabeldict/modules/tmx/pc_factory.h10
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp2
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendium.h2
4 files changed, 13 insertions, 13 deletions
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 <klibloader.h>
-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;