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

1 files changed, 10 insertions, 10 deletions

diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h
index 51bec97c1..d5251bdc7 100644
--- a/kresources/slox/kabcresourceslox.h
+++ b/kresources/slox/kabcresourceslox.h
@@ -30,7 +30,7 @@
 #include <tqmap.h>
 #include <tqdom.h>
 
-namespace KIO {
+namespace TDEIO {
 class DavJob;
 class Job;
 }
@@ -39,7 +39,7 @@ namespace KPIM {
 class ProgressItem;
 }
 
-class KConfig;
+class TDEConfig;
 
 namespace KABC {
 
@@ -50,13 +50,13 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
     Q_OBJECT
   
   public:
-    ResourceSlox( const KConfig * );
+    ResourceSlox( const TDEConfig * );
     ResourceSlox( const KURL &url,
                   const TQString &user, const TQString &password );
     ~ResourceSlox();
 
-    void readConfig( const KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( const TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     SloxPrefs *prefs() const { return mPrefs; }
 
@@ -87,9 +87,9 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
     void uploadContacts();
 
   protected slots:
-    void slotResult( KIO::Job *job );
-    void slotUploadResult( KIO::Job *job );
-    void slotProgress( KIO::Job *job, unsigned long percent );
+    void slotResult( TDEIO::Job *job );
+    void slotUploadResult( TDEIO::Job *job );
+    void slotProgress( TDEIO::Job *job, unsigned long percent );
 
     void cancelDownload();
     void cancelUpload();
@@ -97,8 +97,8 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
   private:
     SloxPrefs *mPrefs;
 
-    KIO::DavJob *mDownloadJob;
-    KIO::DavJob *mUploadJob;
+    TDEIO::DavJob *mDownloadJob;
+    TDEIO::DavJob *mUploadJob;
     KPIM::ProgressItem *mDownloadProgress;
     KPIM::ProgressItem *mUploadProgress;