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

11 files changed, 21 insertions, 21 deletions

diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp
index efff4e06..3091640b 100644
--- a/ktalkd/kcmktalkd/answmachpage.cpp
+++ b/ktalkd/kcmktalkd/answmachpage.cpp
@@ -31,7 +31,7 @@
 
 KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, 
 	KSimpleConfig *_config) 
-    : KCModule (parent, name)
+    : TDECModule (parent, name)
 {
 	if (!_config) {
 		delete_config = true;
diff --git a/ktalkd/kcmktalkd/answmachpage.h b/ktalkd/kcmktalkd/answmachpage.h
index f35bf9b2..c61b241f 100644
--- a/ktalkd/kcmktalkd/answmachpage.h
+++ b/ktalkd/kcmktalkd/answmachpage.h
@@ -39,7 +39,7 @@
 
 class KSimpleConfig;
 
-class KAnswmachPageConfig : public KCModule
+class KAnswmachPageConfig : public TDECModule
 {
   Q_OBJECT
   
diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp
index 33438651..0c07c992 100644
--- a/ktalkd/kcmktalkd/forwmachpage.cpp
+++ b/ktalkd/kcmktalkd/forwmachpage.cpp
@@ -28,7 +28,7 @@
 
 KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name,
 	KSimpleConfig *_config) 
-    : KCModule (parent, name)
+    : TDECModule (parent, name)
 {
     if (!_config) {
 		delete_config = true;
diff --git a/ktalkd/kcmktalkd/forwmachpage.h b/ktalkd/kcmktalkd/forwmachpage.h
index 66179139..3881e5ca 100644
--- a/ktalkd/kcmktalkd/forwmachpage.h
+++ b/ktalkd/kcmktalkd/forwmachpage.h
@@ -39,7 +39,7 @@
 
 class KSimpleConfig;
 
-class KForwmachPageConfig : public KCModule
+class KForwmachPageConfig : public TDECModule
 {
   Q_OBJECT
   
diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp
index 06f1e9b8..0975365c 100644
--- a/ktalkd/kcmktalkd/main.cpp
+++ b/ktalkd/kcmktalkd/main.cpp
@@ -31,7 +31,7 @@
 #include <tqlayout.h>
 
 KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name)
-    : KCModule(parent, name)
+    : TDECModule(parent, name)
 {
     config = new KSimpleConfig("ktalkdrc");
     announceconfig = new KSimpleConfig("ktalkannouncerc");
@@ -88,22 +88,22 @@ void KTalkdConfigModule::resizeEvent(TQResizeEvent *)
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_ktalkd(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_ktalkd(TQWidget *parent, const char *)
 	{
 		return new KTalkdConfigModule(parent, "kcmktalkd");
 }
 
-	KDE_EXPORT KCModule *create_ktalkd_answmach(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_ktalkd_answmach(TQWidget *parent, const char *)
 {
 		return new KAnswmachPageConfig(parent, "kcmktalkd");
 	}
 
-	KDE_EXPORT KCModule *create_ktalkd_sound(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_ktalkd_sound(TQWidget *parent, const char *)
 	{
 		return new KSoundPageConfig(parent, "kcmktalkd");
 	}
 
-	KDE_EXPORT KCModule *create_ktalkd_forwmach(TQWidget *parent, const char *)
+	KDE_EXPORT TDECModule *create_ktalkd_forwmach(TQWidget *parent, const char *)
 	{
 		return new KForwmachPageConfig(parent, "kcmktalkd");
 	}
diff --git a/ktalkd/kcmktalkd/main.h b/ktalkd/kcmktalkd/main.h
index 23eef0d0..fde80624 100644
--- a/ktalkd/kcmktalkd/main.h
+++ b/ktalkd/kcmktalkd/main.h
@@ -32,7 +32,7 @@ class KSoundPageConfig;
 class KAnswmachPageConfig;
 class KForwmachPageConfig;
 
-class KTalkdConfigModule : public KCModule
+class KTalkdConfigModule : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp
index b52051d6..f69d90b0 100644
--- a/ktalkd/kcmktalkd/soundpage.cpp
+++ b/ktalkd/kcmktalkd/soundpage.cpp
@@ -46,7 +46,7 @@
 
 KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name,
 	KSimpleConfig *_config, KSimpleConfig *_announceconfig)
-    : KCModule (parent, name)
+    : TDECModule (parent, name)
 {
 	if (!_config) {
 		delete_config = true;
diff --git a/ktalkd/kcmktalkd/soundpage.h b/ktalkd/kcmktalkd/soundpage.h
index 0faa049f..3e6102bd 100644
--- a/ktalkd/kcmktalkd/soundpage.h
+++ b/ktalkd/kcmktalkd/soundpage.h
@@ -43,7 +43,7 @@ class TQLabel;
 class TQListBox;
 class TQPushButton;
 
-class KSoundPageConfig : public KCModule
+class KSoundPageConfig : public TDECModule
 {
   Q_OBJECT
   
diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp
index 02115bea..1c0e9931 100644
--- a/ktalkd/ktalkd/readcfg++.cpp
+++ b/ktalkd/ktalkd/readcfg++.cpp
@@ -77,9 +77,9 @@ int booleanresult(const char * s)
 }
 
 /*  User configuration file, ktalkdrc in localconfigdir(). */
-KConfig * ktalkdcfg = 0;
+TDEConfig * ktalkdcfg = 0;
 /*  User config file for talk announces, ktalkannouncerc in localconfigdir(). */
-KConfig * ktkanncfg = 0;
+TDEConfig * ktkanncfg = 0;
 
 /*  Initiate user-config-file reading. */
 int init_user_config(const char * l_name)
@@ -102,18 +102,18 @@ ktalk_debug("%s",pw->pw_dir);
       endpwent();
 ktalk_debug("%s","endpwent");
  
-//WABA: New KConfig should be able to handle this gracefully:
+//WABA: New TDEConfig should be able to handle this gracefully:
      if (stat(TQFile::encodeName(tkannFileName),&buf)!=-1) {
           // check if it exists, 'cause otherwise it would be created empty with
           // root as owner !
-          ktkanncfg = new KConfig(tkannFileName);
+          ktkanncfg = new TDEConfig(tkannFileName);
           ktkanncfg -> setGroup("ktalkannounce");
           ktkanncfg -> setDollarExpansion(true);
       } else ktkanncfg = 0L;
       if (stat(TQFile::encodeName(cfgFileName),&buf)!=-1) {
           // check if it exists, 'cause otherwise it would be created empty with
           // root as owner !
-          ktalkdcfg = new KConfig(cfgFileName);
+          ktalkdcfg = new TDEConfig(cfgFileName);
           ktalkdcfg -> setGroup("ktalkd");
           ktalkdcfg -> setDollarExpansion(true);
           ktalk_debug("User config file ok");
@@ -133,7 +133,7 @@ ktalk_debug("%s","done");
 
 int read_user_config(const char * key, char * result, int max)
 {
-    KConfig * cfg;
+    TDEConfig * cfg;
     if (!strncmp(key,"Sound",5))
         // Any key starting with Sound is in ktalkannouncerc
         // talkprg is there too, but we don't care about it here
@@ -185,7 +185,7 @@ int process_config_file(void)
   // Has to be done, for any $TDEBINDIR in ktalkdrc.
   setenv("TDEBINDIR", TQFile::encodeName(ktalkdlg_dir), 0/*don't overwrite*/);
 
-  KConfig * syscfg = new KConfig( "ktalkdrc" );
+  TDEConfig * syscfg = new TDEConfig( "ktalkdrc" );
 
   syscfg -> setGroup("ktalkd");
   syscfg -> setDollarExpansion(true);
diff --git a/ktalkd/ktalkd/talkd.cpp b/ktalkd/ktalkd/talkd.cpp
index 76355121..feb11f28 100644
--- a/ktalkd/ktalkd/talkd.cpp
+++ b/ktalkd/ktalkd/talkd.cpp
@@ -350,7 +350,7 @@ main(int argc, char *argv[])
 	socklen_t sz = sizeof(sn);
 	int do_debug=0, do_badpackets=0, ch;
 
-	new TDEInstance("ktalkd"); // for KConfig and friends
+	new TDEInstance("ktalkd"); // for TDEConfig and friends
 	ktable = new KTalkdTable();
 
 	/* make sure we're a daemon */
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index a1e1338c..6ac67cca 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -118,7 +118,7 @@ int main (int argc, char **argv)
     printf("#\n");
     fflush(stdout);
 
-    KConfig *cfg = new KConfig ( "ktalkannouncerc" );
+    TDEConfig *cfg = new TDEConfig ( "ktalkannouncerc" );
     cfg->setGroup ("ktalkannounce");
     bool bSound = cfg->readNumEntry ("Sound", 0);