Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 6 insertions, 6 deletions

diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index 4cf84190..a8187373 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -367,12 +367,12 @@ void karmPart::fileSaveAs()
 
 
 // It's usually safe to leave the factory code alone.. with the
-// notable exception of the KAboutData data
+// notable exception of the TDEAboutData data
 #include <kaboutdata.h>
 #include <klocale.h>
 
-KInstance*  karmPartFactory::s_instance = 0L;
-KAboutData* karmPartFactory::s_about = 0L;
+TDEInstance*  karmPartFactory::s_instance = 0L;
+TDEAboutData* karmPartFactory::s_about = 0L;
 
 karmPartFactory::karmPartFactory()
     : KParts::Factory()
@@ -401,13 +401,13 @@ KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const c
     return obj;
 }
 
-KInstance* karmPartFactory::instance()
+TDEInstance* karmPartFactory::instance()
 {
     if( !s_instance )
     {
-        s_about = new KAboutData("karmpart", I18N_NOOP("karmPart"), "0.1");
+        s_about = new TDEAboutData("karmpart", I18N_NOOP("karmPart"), "0.1");
         s_about->addAuthor("Thorsten Staerk", 0, "thorsten@staerk.de");
-        s_instance = new KInstance(s_about);
+        s_instance = new TDEInstance(s_about);
     }
     return s_instance;
 }