Rename KInstance and KAboutData to avoid conflicts with KDE4

2 files changed, 10 insertions, 10 deletions

diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index baf177f..abba6a4 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -52,7 +52,7 @@ K_EXPORT_COMPONENT_FACTORY( libkttsjobmgrpart, KttsJobMgrFactory )
 * We need one static instance of the factory for our C 'main'
 * function
 */
-KInstance *KttsJobMgrFactory::s_instance = 0L;
+TDEInstance *KttsJobMgrFactory::s_instance = 0L;
 
 KttsJobMgrFactory::~KttsJobMgrFactory()
 {
@@ -73,16 +73,16 @@ TQObject *KttsJobMgrFactory::createObject(TQObject *parent, const char *name, co
     return obj;
 }
 
-KInstance *KttsJobMgrFactory::instance()
+TDEInstance *KttsJobMgrFactory::instance()
 {
     if ( !s_instance )
-        s_instance = new KInstance( aboutData() );
+        s_instance = new TDEInstance( aboutData() );
     return s_instance;
 }
 
-KAboutData *KttsJobMgrFactory::aboutData()
+TDEAboutData *KttsJobMgrFactory::aboutData()
 {
-  KAboutData *about = new KAboutData("kttsjobmgr", I18N_NOOP("KttsJobMgr"), "1.99");
+  TDEAboutData *about = new TDEAboutData("kttsjobmgr", I18N_NOOP("KttsJobMgr"), "1.99");
   return about;
 }
 
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.h b/kttsd/kttsjobmgr/kttsjobmgr.h
index f7c1a41..0a7a1d5 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.h
+++ b/kttsd/kttsjobmgr/kttsjobmgr.h
@@ -26,8 +26,8 @@
 #include "kspeech_stub.h"
 #include "kspeechsink.h"
 
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 class KttsJobMgrBrowserExtension;
 class KListView;
 class TQListViewItem;
@@ -46,11 +46,11 @@ public:
                             const char* classname = TQOBJECT_OBJECT_NAME_STRING,
                             const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
-    static KAboutData *aboutData();
+    static TDEInstance *instance();
+    static TDEAboutData *aboutData();
 
 private:
-    static KInstance *s_instance;
+    static TDEInstance *s_instance;
 };
 
 class KttsJobMgrPart: