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

2 files changed, 12 insertions, 12 deletions

diff --git a/kfile-plugins/folder/kfile_folder.cpp b/kfile-plugins/folder/kfile_folder.cpp
index fe4ea9a..f4db1f3 100644
--- a/kfile-plugins/folder/kfile_folder.cpp
+++ b/kfile-plugins/folder/kfile_folder.cpp
@@ -67,7 +67,7 @@ bool KFolderPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
     
     TQFileInfo* file;
     int items = 0;
-    KIO::filesize_t bytes = 0;
+    TDEIO::filesize_t bytes = 0;
     
     while ( (file = list.current()) != 0 ) {
         ++list;
diff --git a/kfile-plugins/lnk/read_lnk.cpp b/kfile-plugins/lnk/read_lnk.cpp
index c3825e0..1170f9a 100644
--- a/kfile-plugins/lnk/read_lnk.cpp
+++ b/kfile-plugins/lnk/read_lnk.cpp
@@ -63,7 +63,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   const char* lnkFile = 0;
 
   TQString tempFile;
-  if ( KIO::NetAccess::download(url, tempFile, 0) )
+  if ( TDEIO::NetAccess::download(url, tempFile, 0) )
     lnkFile = tempFile.latin1();
   else
     return false;
@@ -73,7 +73,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   if ( !fd )
   {
     kdWarning(7034) << "could not open file " << lnkFile << endl;
-    KIO::NetAccess::removeTempFile(tempFile);
+    TDEIO::NetAccess::removeTempFile(tempFile);
     return false;
   }
 
@@ -83,7 +83,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   {
     kdWarning(7034) << "wrong header size" << endl;
     fclose(fd);
-    KIO::NetAccess::removeTempFile(tempFile);
+    TDEIO::NetAccess::removeTempFile(tempFile);
     return false;
   }
 
@@ -91,7 +91,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   {
     kdWarning(7034) << "wrong magic in header" << endl;
     fclose(fd);
-    KIO::NetAccess::removeTempFile(tempFile);
+    TDEIO::NetAccess::removeTempFile(tempFile);
     return false;
   }
 
@@ -104,7 +104,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
     {
       kdWarning(7034) << "could not read shell item id list" << endl;
       fclose(fd);
-      KIO::NetAccess::removeTempFile(tempFile);
+      TDEIO::NetAccess::removeTempFile(tempFile);
       return false;
     }
   }
@@ -124,7 +124,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
     {
       kdWarning(7034) << "could not read file localtion table" << endl;
       fclose(fd);
-      KIO::NetAccess::removeTempFile(tempFile);
+      TDEIO::NetAccess::removeTempFile(tempFile);
       return false;
     }
 
@@ -133,7 +133,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
     if ( (loc.totalLen <= sizeof(loc)) || (loc.totalLen > 4096) )  // 4096 is just an arbitrary number I think shall be enough
     {
       fclose(fd);
-      KIO::NetAccess::removeTempFile(tempFile);
+      TDEIO::NetAccess::removeTempFile(tempFile);
       return false;
     }
 
@@ -146,7 +146,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
       kdWarning(7034) << "could not read pathes data" << endl;
       delete [] data;
       fclose(fd);
-      KIO::NetAccess::removeTempFile(tempFile);
+      TDEIO::NetAccess::removeTempFile(tempFile);
       return false;
     }
 
@@ -197,7 +197,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
       {
         kdWarning(7034) << "could not read description string length" << endl;
         fclose(fd);
-        KIO::NetAccess::removeTempFile(tempFile);
+        TDEIO::NetAccess::removeTempFile(tempFile);
         return false;
       }
 
@@ -208,7 +208,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
         kdWarning(7034) << "could not read description string" << endl;
         delete [] data;
         fclose(fd);
-        KIO::NetAccess::removeTempFile(tempFile);
+        TDEIO::NetAccess::removeTempFile(tempFile);
         return false;
       }
 
@@ -221,7 +221,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   }
 
   fclose(fd);
-  KIO::NetAccess::removeTempFile(tempFile);
+  TDEIO::NetAccess::removeTempFile(tempFile);
 
   return true;
 }