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

2 files changed, 6 insertions, 6 deletions

diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp
index a5c0181c5..828f50f69 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_cgi( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_cgi( TQWidget *parent, const char * )
   {
     TDEGlobal::locale()->insertCatalogue("kcmcgi");
     return new KCMCgi( parent, "kcmcgi" );
@@ -42,7 +42,7 @@ extern "C"
 
 
 KCMCgi::KCMCgi(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
   setButtons(Default|Apply);
 
@@ -63,7 +63,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
   connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removePath() ) );
   connect( mListBox, TQT_SIGNAL( clicked ( TQListBoxItem * )),this, TQT_SLOT( slotItemSelected( TQListBoxItem *)));
 
-  mConfig = new KConfig("kcmcgirc");
+  mConfig = new TDEConfig("kcmcgirc");
 
   load();
   updateButton();
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.h b/kioslave/cgi/kcmcgi/kcmcgi.h
index d68d3fe23..f6ad715b3 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.h
+++ b/kioslave/cgi/kcmcgi/kcmcgi.h
@@ -23,9 +23,9 @@
 class TQListBox;
 class TQPushButton;
 
-class KConfig;
+class TDEConfig;
 
-class KCMCgi : public KCModule
+class KCMCgi : public TDECModule
 {
     Q_OBJECT
   public:
@@ -49,7 +49,7 @@ class KCMCgi : public KCModule
     TQPushButton *mAddButton;
     TQPushButton *mRemoveButton;
 
-    KConfig *mConfig;
+    TDEConfig *mConfig;
 };
 
 #endif