Rename KInstance and KAboutData to avoid conflicts with KDE4

3 files changed, 12 insertions, 12 deletions

diff --git a/kmid/history.txt b/kmid/history.txt
index 34593448..568c4957 100644
--- a/kmid/history.txt
+++ b/kmid/history.txt
@@ -552,7 +552,7 @@ Sunday 5-3-2000
 Sunday 2-4-2000
 - Now Libkmid links with tdecore and qt in order to use a KConfig object to
 read the default settings as saved by the user with the midi kcontrol module.
-- It creates a "dummy" KInstance in case of the application being a non-KDE
+- It creates a "dummy" TDEInstance in case of the application being a non-KDE
 application.
 - Fixed compilation of KMid, as 1) someone renamed klinedit.h to klineedit.h
 and 2) now we have to include qiconset.h when creating an action with pictures
diff --git a/kmid/kmid_part.cpp b/kmid/kmid_part.cpp
index 5eafbe62..11e2d405 100644
--- a/kmid/kmid_part.cpp
+++ b/kmid/kmid_part.cpp
@@ -19,7 +19,7 @@ K_EXPORT_COMPONENT_FACTORY( libkmidpart, KMidFactory )
  * We need one static instance of the factory for our C 'main'
  * function
  */
-KInstance *KMidFactory::s_instance = 0L;
+TDEInstance *KMidFactory::s_instance = 0L;
 
 KMidFactory::KMidFactory()
 {
@@ -45,10 +45,10 @@ KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *
   return obj;
 }
 
-KAboutData *KMidFactory::aboutData()
+TDEAboutData *KMidFactory::aboutData()
 {
-    KAboutData *aboutdata = new KAboutData("kmid", "KMid", "2.0",
-        I18N_NOOP("MIDI/Karaoke file player"), KAboutData::License_GPL,
+    TDEAboutData *aboutdata = new TDEAboutData("kmid", "KMid", "2.0",
+        I18N_NOOP("MIDI/Karaoke file player"), TDEAboutData::License_GPL,
         I18N_NOOP("(c) 1997,98,99,2000, Antonio Larrosa Jimenez"),"",
         "http://perso.wanadoo.es/antlarr/kmid.html");
     aboutdata->addAuthor("Antonio Larrosa Jimenez",
@@ -57,10 +57,10 @@ KAboutData *KMidFactory::aboutData()
     return aboutdata;
 }
 
-KInstance *KMidFactory::instance()
+TDEInstance *KMidFactory::instance()
 {
   if ( !s_instance )
-    s_instance = new KInstance( aboutData() );
+    s_instance = new TDEInstance( aboutData() );
 
   return s_instance;
 }
diff --git a/kmid/kmid_part.h b/kmid/kmid_part.h
index c6dc170a..7e26ae14 100644
--- a/kmid/kmid_part.h
+++ b/kmid/kmid_part.h
@@ -4,8 +4,8 @@
 #include <kparts/browserextension.h>
 #include <kparts/factory.h>
 #include <tdelibs_export.h>
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 class KMidBrowserExtension;
 class kmidClient;
 
@@ -22,11 +22,11 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
                 const char* classname = TQOBJECT_OBJECT_NAME_STRING,
                 const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
-    static KAboutData *aboutData();
+    static TDEAboutData *aboutData();
   private:
-    static KInstance *s_instance;
+    static TDEInstance *s_instance;
 };
 
 class KMidPart: public KParts::ReadOnlyPart