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

1 files changed, 10 insertions, 10 deletions

diff --git a/kresources/remote/resourceremote.h b/kresources/remote/resourceremote.h
index 656fa9e34..2c3fd5fad 100644
--- a/kresources/remote/resourceremote.h
+++ b/kresources/remote/resourceremote.h
@@ -38,7 +38,7 @@
 
 #include <libkcal/resourcecached.h>
 
-namespace KIO {
+namespace TDEIO {
 class FileCopyJob;
 class Job;
 }
@@ -57,9 +57,9 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
 
   public:
     /**
-      Create resource from configuration information stored in KConfig object.
+      Create resource from configuration information stored in TDEConfig object.
     */
-    ResourceRemote( const KConfig * );
+    ResourceRemote( const TDEConfig * );
     /**
       Create remote resource.
       
@@ -69,8 +69,8 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
     ResourceRemote( const KURL &downloadUrl, const KURL &uploadUrl = KURL() );
     virtual ~ResourceRemote();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     void setDownloadUrl( const KURL & );
     KURL downloadUrl() const;
@@ -94,10 +94,10 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
 
 
   protected slots:
-    void slotLoadJobResult( KIO::Job * );
-    void slotSaveJobResult( KIO::Job * );
+    void slotLoadJobResult( TDEIO::Job * );
+    void slotSaveJobResult( TDEIO::Job * );
 
-    void slotPercent( KIO::Job *, unsigned long percent );
+    void slotPercent( TDEIO::Job *, unsigned long percent );
 
   protected:
     bool doLoad();
@@ -114,8 +114,8 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
     bool mUseProgressManager;
     bool mUseCacheFile;
 
-    KIO::FileCopyJob *mDownloadJob;
-    KIO::FileCopyJob *mUploadJob;
+    TDEIO::FileCopyJob *mDownloadJob;
+    TDEIO::FileCopyJob *mUploadJob;
     
     KPIM::ProgressItem *mProgress;