Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

10 files changed, 25 insertions, 25 deletions

diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h
index 37a9b8537..af1dc3019 100644
--- a/kcontrol/kcontrol/aboutwidget.h
+++ b/kcontrol/kcontrol/aboutwidget.h
@@ -24,7 +24,7 @@
 #include <tqlistview.h>
 #include <tqhbox.h>
 
-class KCModuleInfo;
+class TDECModuleInfo;
 class TQPixmap;
 class KPixmap;
 class ConfigModule;
diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp
index 723895de3..e99cfa799 100644
--- a/kcontrol/kcontrol/kcrootonly.cpp
+++ b/kcontrol/kcontrol/kcrootonly.cpp
@@ -24,7 +24,7 @@
 #include "kcrootonly.h"
 
 KCRootOnly::KCRootOnly(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
    TQVBoxLayout *layout=new TQVBoxLayout(this);
    TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"
diff --git a/kcontrol/kcontrol/kcrootonly.h b/kcontrol/kcontrol/kcrootonly.h
index b52fab34b..e167c4452 100644
--- a/kcontrol/kcontrol/kcrootonly.h
+++ b/kcontrol/kcontrol/kcrootonly.h
@@ -4,7 +4,7 @@
 
 #include <kcmodule.h>
 
-class KCRootOnly: public KCModule {
+class KCRootOnly: public TDECModule {
 public:
 	KCRootOnly(TQWidget *parent, const char *name);
 };
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 7edc8bd43..ad61b11c1 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -65,7 +65,7 @@ KControlApp::KControlApp()
   connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
 
   TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel);
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("General");
   // Initial size is:
   // never bigger than workspace as reported by desk
@@ -88,7 +88,7 @@ KControlApp::~KControlApp()
 {
   if (toplevel)
     {
-      KConfig *config = TDEGlobal::config();
+      TDEConfig *config = TDEGlobal::config();
       config->setGroup("General");
       TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
       config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp
index 687b3a412..98135a27f 100644
--- a/kcontrol/kcontrol/moduleIface.cpp
+++ b/kcontrol/kcontrol/moduleIface.cpp
@@ -43,7 +43,7 @@ TQPalette ModuleIface::getPalette(){
 }
 
 TQString ModuleIface::getStyle() {
-	KConfig config(  "kdeglobals" );
+	TDEConfig config(  "kdeglobals" );
 	config.setGroup( "General" );
 	return config.readEntry("widgetStyle");
 }
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 592eb52c2..047fa75e6 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -47,7 +47,7 @@ template class TQPtrList<ConfigModule>;
 
 
 ConfigModule::ConfigModule(const KService::Ptr &s)
-  : KCModuleInfo(s), _changed(false), _module(0), _embedWidget(0),
+  : TDECModuleInfo(s), _changed(false), _module(0), _embedWidget(0),
     _rootProcess(0), _embedLayout(0), _embedFrame(0), _embedStack(0)
 {
 }
@@ -64,12 +64,12 @@ ProxyWidget *ConfigModule::module()
 
   bool run_as_root = needsRootPrivileges() && (getuid() != 0);
 
-  KCModule *modWidget = 0;
+  TDECModule *modWidget = 0;
 
   if (run_as_root && isHiddenByDefault())
      modWidget = new KCRootOnly(0, "root_only");
   else
-      modWidget = KCModuleLoader::loadModule(*this);
+      modWidget = TDECModuleLoader::loadModule(*this);
 
   if (modWidget)
     {
@@ -110,7 +110,7 @@ void ConfigModule::deleteClient()
   delete _embedLayout;
   _embedLayout = 0;
 
-  KCModuleLoader::unloadModule(*this);
+  TDECModuleLoader::unloadModule(*this);
   _changed = false;
 }
 
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index bb612e376..f2bce1d6d 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -28,7 +28,7 @@
 template<class ConfigModule> class TQPtrList;
 class TQStringList;
 class TDEAboutData;
-class KCModule;
+class TDECModule;
 class ProxyWidget;
 class TDEProcess;
 class QXEmbed;
@@ -36,7 +36,7 @@ class TQVBoxLayout;
 class TQVBox;
 class TQWidgetStack;
 
-class ConfigModule : public TQObject, public KCModuleInfo
+class ConfigModule : public TQObject, public TDECModuleInfo
 {
   Q_OBJECT
 
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index 7e3f30de4..5d540d2c6 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -103,13 +103,13 @@ RootInfoWidget::RootInfoWidget(TQWidget *parent, const char *name = 0)
 class ProxyView : public TQScrollView
 {
 public:
-    ProxyView(KCModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name);
+    ProxyView(TDECModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name);
 
 private:
     virtual void resizeEvent(TQResizeEvent *);
 
     TQWidget *contentWidget;
-    KCModule    *client;
+    TDECModule    *client;
     bool scroll;
 };
 
@@ -124,7 +124,7 @@ public:
 };
 
 
-ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name)
+ProxyView::ProxyView(TDECModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name)
     : TQScrollView(parent, name), client(_client)
 {
   setResizePolicy(TQScrollView::AutoOneFit);
@@ -157,7 +157,7 @@ void ProxyView::resizeEvent(TQResizeEvent *e)
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
+ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
              bool run_as_root)
   : TQWidget(0, name)
   , _client(client)
@@ -215,10 +215,10 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
 
   // only enable the requested buttons
   int b = _client->buttons();
-  trinity_setVisible(_handbook, (b & KCModule::Help));
-  trinity_setVisible(_default, mayModify && (b & KCModule::Default));
-  trinity_setVisible(_apply, mayModify && (b & KCModule::Apply));
-  trinity_setVisible(_reset, mayModify && (b & KCModule::Apply));
+  trinity_setVisible(_handbook, (b & TDECModule::Help));
+  trinity_setVisible(_default, mayModify && (b & TDECModule::Default));
+  trinity_setVisible(_apply, mayModify && (b & TDECModule::Apply));
+  trinity_setVisible(_reset, mayModify && (b & TDECModule::Apply));
   trinity_setVisible(_root, run_as_root);
 
   // disable initial buttons
diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h
index e1cff0351..bb951ccdf 100644
--- a/kcontrol/kcontrol/proxywidget.h
+++ b/kcontrol/kcontrol/proxywidget.h
@@ -28,7 +28,7 @@ class TQWidget;
 class TQPushButton;
 class TQFrame;
 
-class KCModule;
+class TDECModule;
 class TDEAboutData;
 
 #include "dockcontainer.h"
@@ -42,7 +42,7 @@ class ProxyWidget : public TQWidget
 
 public:
 
-  ProxyWidget(KCModule *client, TQString title, const char *name=0, bool run_as_root = false);
+  ProxyWidget(TDECModule *client, TQString title, const char *name=0, bool run_as_root = false);
   ~ProxyWidget();
 
   TQString quickHelp() const;
@@ -73,7 +73,7 @@ private:
 
   TQPushButton *_handbook, *_default, *_apply, *_reset, *_root;
   TQFrame      *_sep;
-  KCModule    *_client;
+  TDECModule    *_client;
     ProxyView *view;
 
 };
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 62b23591a..fbfc86cd7 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -57,7 +57,7 @@ TopLevel::TopLevel(const char* name)
   report_bug = 0;
 
   // read settings
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("Index");
   TQString viewmode = config->readEntry("ViewMode", "Tree");
 
@@ -196,7 +196,7 @@ TopLevel::TopLevel(const char* name)
 
 TopLevel::~TopLevel()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("Index");
   if (KCGlobal::viewMode() == Tree)
     config->writeEntry("ViewMode", "Tree");