Rename KInstance and KAboutData to avoid conflicts with KDE4

6 files changed, 15 insertions, 15 deletions

diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index a07018c4..294d7581 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -46,12 +46,12 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") )
 KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
     KCModule(MrmlFactory::instance(), parent, name)
 {
-    KAboutData* ab = new KAboutData(
+    TDEAboutData* ab = new TDEAboutData(
         "kcmkmrml",
         I18N_NOOP("KCMKMrml"),
         KMRML_VERSION,
         I18N_NOOP("Advanced Search Control Module"),
-            KAboutData::License_GPL,
+            TDEAboutData::License_GPL,
         I18N_NOOP( "Copyright 2002, Carsten Pfeiffer" ),
         0,
         "http://devel-home.kde.org/~pfeiffer/kmrml/" );
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h
index 9be6db8a..8ff7d971 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.h
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.h
@@ -21,7 +21,7 @@
 
 #include <kcmodule.h>
 
-class KAboutData;
+class TDEAboutData;
 class KURLRequester;
 
 namespace KMrmlConfig
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index 3a6f6721..ab4cfcfc 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -39,7 +39,7 @@ extern "C" {
     KDE_EXPORT int kdemain( int argc, char **argv )
     {
         KLocale::setMainCatalogue("tdelibs");
-        KInstance instance( "kio_mrml" );
+        TDEInstance instance( "kio_mrml" );
         KGlobal::locale()->insertCatalogue( "kmrml" );
 
         kdDebug() << "Starting MRML " << getpid() << endl;
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 56074222..80ac57c0 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -66,7 +66,7 @@ extern "C"
     }
 }
 
-KInstance * PartFactory::s_instance = 0L;
+TDEInstance * PartFactory::s_instance = 0L;
 
 PartFactory::PartFactory()
     : KParts::Factory()
@@ -81,10 +81,10 @@ PartFactory::~PartFactory()
     s_instance = 0L;
 }
 
-KInstance * PartFactory::instance()
+TDEInstance * PartFactory::instance()
 {
     if ( !s_instance ) {
-        s_instance = new KInstance( "kmrml" );
+        s_instance = new TDEInstance( "kmrml" );
         KGlobal::locale()->insertCatalogue( "kmrml" );
     }
     return s_instance;
@@ -830,14 +830,14 @@ void MrmlPart::restoreState( TQDataStream& stream )
     m_url = url;
 }
 
-KAboutData * MrmlPart::createAboutData()
+TDEAboutData * MrmlPart::createAboutData()
 {
-    KAboutData *data = new KAboutData(
+    TDEAboutData *data = new TDEAboutData(
         "kmrml",
         I18N_NOOP("MRML Client for TDE"),
         KMRML_VERSION,
         I18N_NOOP("A tool to search for images by their content"),
-        KAboutData::License_GPL,
+        TDEAboutData::License_GPL,
         I18N_NOOP("(c) 2001-2002, Carsten Pfeiffer"),
         0,
         I18N_NOOP("http://devel-home.kde.org/~pfeiffer/kmrml/") );
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index a382d22a..7efa4e95 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -34,7 +34,7 @@ class TQCheckBox;
 class TQHGroupBox;
 class TQPushButton;
 
-class KAboutData;
+class TDEAboutData;
 class KComboBox;
 class KIntNumInput;
 
@@ -69,7 +69,7 @@ public:
     void saveState( TQDataStream& stream );
     void restoreState( TQDataStream& stream );
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
 public slots:
     virtual bool openURL( const KURL& );
@@ -157,7 +157,7 @@ public:
     PartFactory();
     ~PartFactory();
 
-    static KInstance * instance();
+    static TDEInstance * instance();
 
 protected:
     virtual KParts::Part * createPartObject( TQWidget *parentWidget = 0,
@@ -168,7 +168,7 @@ protected:
                                         const TQStringList& args = TQStringList() );
 
 private:
-    static KInstance * s_instance;
+    static TDEInstance * s_instance;
 
 };
 
diff --git a/kmrml/kmrml/mrmlsearch.cpp b/kmrml/kmrml/mrmlsearch.cpp
index 49b9353a..fbd1468d 100644
--- a/kmrml/kmrml/mrmlsearch.cpp
+++ b/kmrml/kmrml/mrmlsearch.cpp
@@ -55,7 +55,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
         query.append( path );
     }
 
-    KInstance instance( "kio_mrml" );
+    TDEInstance instance( "kio_mrml" );
 
     KMrml::Config config( instance.config() );
     KMrml::ServerSettings settings = config.defaultSettings();