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

5 files changed, 10 insertions, 10 deletions

diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp
index 8d24a84c..49730efa 100644
--- a/kfilereplace/kfilereplacepart.cpp
+++ b/kfilereplace/kfilereplacepart.cpp
@@ -65,7 +65,7 @@ KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObjec
   setInstance(FileReplaceFactory::instance());
   TDEGlobal::locale()->insertCatalogue("kfilereplace");	
   m_parentWidget = parentWidget;
-  m_config = new KConfig("kfilereplacerc");
+  m_config = new TDEConfig("kfilereplacerc");
   m_aboutDlg = 0;
   m_stop = false;
   m_optionMask = TQDir::Files;
@@ -370,7 +370,7 @@ void KFileReplacePart::slotOpenRecentStringFile(const KURL& urlFile)
   TQString fileName;
 
   // Downloads file if need (if url is "http://...")
-  if (!(KIO::NetAccess::download(urlFile, fileName, 0)))
+  if (!(TDEIO::NetAccess::download(urlFile, fileName, 0)))
     return;
 
   // Checks it's not a directory
@@ -1050,7 +1050,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri
     {
       if(atLeastOneStringFound)
         {
-          KIO::NetAccess::file_copy(KURL::fromPathOrURL(oldPathString), KURL::fromPathOrURL(oldPathString + backupExtension), -1, true);
+          TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(oldPathString), KURL::fromPathOrURL(oldPathString + backupExtension), -1, true);
       	}
     }
 
diff --git a/kfilereplace/kfilereplacepart.h b/kfilereplace/kfilereplacepart.h
index b2206b59..57e1706d 100644
--- a/kfilereplace/kfilereplacepart.h
+++ b/kfilereplace/kfilereplacepart.h
@@ -21,7 +21,7 @@
 #include <kparts/part.h>
 class KAboutApplication;
 class TDEAboutData;
-class KConfig;
+class TDEConfig;
 
 // local
 #include "configurationclasses.h"
@@ -38,7 +38,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart
     KFileReplaceView* m_view;
     TQWidget* m_parentWidget,
            * m_w;
-    KConfig* m_config;
+    TDEConfig* m_config;
     KAboutApplication* m_aboutDlg;
     KeyValueMap m_replacementMap;
     RCOptions* m_option;
@@ -87,7 +87,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart
   //METHODS
   public:
     static TDEAboutData* createAboutData();
-    KConfig *config(){ return m_config; }
+    TDEConfig *config(){ return m_config; }
 
   protected:
     virtual bool openFile() { return false; }
diff --git a/kfilereplace/knewprojectdlg.h b/kfilereplace/knewprojectdlg.h
index 8a81c494..7be5ecb9 100644
--- a/kfilereplace/knewprojectdlg.h
+++ b/kfilereplace/knewprojectdlg.h
@@ -20,7 +20,7 @@
 #define KNEWPROJECTDLG_H
 
 //KDE
-class KConfig;
+class TDEConfig;
 
 //local
 #include "knewprojectdlgs.h"
diff --git a/kfilereplace/koptionsdlg.cpp b/kfilereplace/koptionsdlg.cpp
index 20d80e47..8d303f08 100644
--- a/kfilereplace/koptionsdlg.cpp
+++ b/kfilereplace/koptionsdlg.cpp
@@ -43,7 +43,7 @@ using namespace whatthisNameSpace;
 
 KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : KOptionsDlgS(parent,name,true)
 {
-  m_config = new KConfig("kfilereplacerc");
+  m_config = new TDEConfig("kfilereplacerc");
   m_option = info;
 
   initGUI();
diff --git a/kfilereplace/koptionsdlg.h b/kfilereplace/koptionsdlg.h
index 0ffd3da8..a9e8e620 100644
--- a/kfilereplace/koptionsdlg.h
+++ b/kfilereplace/koptionsdlg.h
@@ -20,7 +20,7 @@
 #define KOPTIONSDLG_H
 
 // KDE
-class KConfig;
+class TDEConfig;
 
 //local
 #include "configurationclasses.h"
@@ -40,7 +40,7 @@ class KOptionsDlg : public KOptionsDlgS
 
   private:
     RCOptions* m_option;
-    KConfig *m_config;
+    TDEConfig *m_config;
 
   private slots:
     void slotOK();