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

4 files changed, 11 insertions, 11 deletions

diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp
index e527c2db4..9f8906f17 100644
--- a/kioslave/cgi/cgi.cpp
+++ b/kioslave/cgi/cgi.cpp
@@ -31,14 +31,14 @@
 
 #include "cgi.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 CgiProtocol::CgiProtocol( const TQCString &pool, const TQCString &app )
     : SlaveBase( "cgi", pool, app )
 {
   kdDebug(7124) << "CgiProtocol::CgiProtocol" << endl;
 
-  KConfig cfg( "kcmcgirc" );
+  TDEConfig cfg( "kcmcgirc" );
   cfg.setGroup( "General" );
   mCgiPaths = cfg.readListEntry( "Paths" );
 }
@@ -150,7 +150,7 @@ void CgiProtocol::get( const KURL& url )
 
     if ( !fd ) {
       kdDebug(7124) << "Error opening '" << filepath << "'" << endl;
-      error( KIO::ERR_CANNOT_OPEN_FOR_READING, filepath );
+      error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, filepath );
       return;
     }
   } else {
@@ -160,7 +160,7 @@ void CgiProtocol::get( const KURL& url )
 
     if ( !fd ) {
       kdDebug(7124) << "Error running '" << cmd << "'" << endl;
-      error( KIO::ERR_CANNOT_OPEN_FOR_READING, cmd );
+      error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, cmd );
       return;
     }
   }
diff --git a/kioslave/cgi/cgi.h b/kioslave/cgi/cgi.h
index 908b6bc99..8f9dc88c8 100644
--- a/kioslave/cgi/cgi.h
+++ b/kioslave/cgi/cgi.h
@@ -28,7 +28,7 @@ class TDEProcess;
   This class implements an ioslave for viewing CGI script output without the
   need to run a web server.
 */
-class CgiProtocol : public KIO::SlaveBase
+class CgiProtocol : public TDEIO::SlaveBase
 {
   public:
     CgiProtocol( const TQCString &pool, const TQCString &app );
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