Rename KInstance and KAboutData to avoid conflicts with KDE4

7 files changed, 15 insertions, 15 deletions

diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index e80f0603f..411a95748 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -101,16 +101,16 @@ KControlApp::~KControlApp()
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
   KLocale::setMainCatalogue("kcontrol");
-  KAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"),
-    KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), KAboutData::License_GPL,
+  TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"),
+    KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL,
     I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
 
-  KAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"),
-    KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), KAboutData::License_GPL,
+  TDEAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"),
+    KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), TDEAboutData::License_GPL,
     I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
 
   TQCString argv_0 = argv[0];
-  KAboutData *aboutData;
+  TDEAboutData *aboutData;
   if (argv_0.right(11) == "kinfocenter")
   {
      aboutData = &aboutKInfoCenter;
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 5be813dc0..584480837 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -253,7 +253,7 @@ void ConfigModule::embedded()
   _embedStack->raiseWidget(_embedWidget); // put it above the busy label
 }
 
-const KAboutData *ConfigModule::aboutData() const
+const TDEAboutData *ConfigModule::aboutData() const
 {
   if (!_module) return 0;
   return _module->aboutData();
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index bcdc7d7e4..fc5406fa6 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -27,7 +27,7 @@
 
 template<class ConfigModule> class TQPtrList;
 class TQStringList;
-class KAboutData;
+class TDEAboutData;
 class KCModule;
 class ProxyWidget;
 class KProcess;
@@ -50,7 +50,7 @@ public:
 
   bool isActive() { return _module != 0; };
   ProxyWidget *module();
-  const KAboutData *aboutData() const;
+  const TDEAboutData *aboutData() const;
 
 
 public slots:
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index a385d859e..7e3f30de4 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -320,7 +320,7 @@ void ProxyWidget::clientChanged(bool state)
   emit changed(state);
 }
 
-const KAboutData *ProxyWidget::aboutData() const
+const TDEAboutData *ProxyWidget::aboutData() const
 {
   return _client->aboutData();
 }
diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h
index f8a7e9ee3..e1cff0351 100644
--- a/kcontrol/kcontrol/proxywidget.h
+++ b/kcontrol/kcontrol/proxywidget.h
@@ -29,7 +29,7 @@ class TQPushButton;
 class TQFrame;
 
 class KCModule;
-class KAboutData;
+class TDEAboutData;
 
 #include "dockcontainer.h"
 #include <tqscrollview.h>
@@ -46,7 +46,7 @@ public:
   ~ProxyWidget();
 
   TQString quickHelp() const;
-  const KAboutData *aboutData() const;
+  const TDEAboutData *aboutData() const;
 
 public slots:
 
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 0c2c9a68e..bd3c70222 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -486,15 +486,15 @@ void TopLevel::reportBug()
     bool deleteit = false;
 
     if (!_active) // report against kcontrol
-        dummyAbout = const_cast<KAboutData*>(KGlobal::instance()->aboutData());
+        dummyAbout = const_cast<TDEAboutData*>(KGlobal::instance()->aboutData());
     else
     {
         if (_active->aboutData())
-            dummyAbout = const_cast<KAboutData*>(_active->aboutData());
+            dummyAbout = const_cast<TDEAboutData*>(_active->aboutData());
         else
         {
             snprintf(buffer, sizeof(buffer), "kcm%s", _active->library().latin1());
-            dummyAbout = new KAboutData(buffer, _active->moduleName().utf8(), "2.0");
+            dummyAbout = new TDEAboutData(buffer, _active->moduleName().utf8(), "2.0");
             deleteit = true;
         }
     }
diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h
index 8cc4a7a67..1a7e1735f 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -100,7 +100,7 @@ private:
    * against a module with no about data
    * we construct one for him
    **/
-  KAboutData *dummyAbout;
+  TDEAboutData *dummyAbout;
 };
 
 #endif