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

3 files changed, 14 insertions, 14 deletions

diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp
index 98c8e828..f87dfef7 100644
--- a/lib/store/KoStore.cpp
+++ b/lib/store/KoStore.cpp
@@ -132,7 +132,7 @@ KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, con
   else
   {
     const bool downloaded =
-        KIO::NetAccess::download( url, tmpFile, window );
+        TDEIO::NetAccess::download( url, tmpFile, window );
 
     if (!downloaded)
     {
@@ -194,14 +194,14 @@ bool KoStore::open( const TQString & _name )
   if ( m_bIsOpen )
   {
     kdWarning(s_area) << "KoStore: File is already opened" << endl;
-    //return KIO::ERR_INTERNAL;
+    //return TDEIO::ERR_INTERNAL;
     return false;
   }
 
   if ( m_sName.length() > 512 )
   {
       kdError(s_area) << "KoStore: Filename " << m_sName << " is too long" << endl;
-      //return KIO::ERR_MALFORMED_URL;
+      //return TDEIO::ERR_MALFORMED_URL;
       return false;
   }
 
@@ -211,7 +211,7 @@ bool KoStore::open( const TQString & _name )
     if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there
     {
       kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl;
-      //return KIO::ERR_FILE_ALREADY_EXIST;
+      //return TDEIO::ERR_FILE_ALREADY_EXIST;
       return false;
     }
 
@@ -228,7 +228,7 @@ bool KoStore::open( const TQString & _name )
       return false;
   }
   else
-    //return KIO::ERR_UNSUPPORTED_ACTION;
+    //return TDEIO::ERR_UNSUPPORTED_ACTION;
     return false;
 
   m_bIsOpen = true;
@@ -247,7 +247,7 @@ bool KoStore::close()
   if ( !m_bIsOpen )
   {
     kdWarning(s_area) << "KoStore: You must open before closing" << endl;
-    //return KIO::ERR_INTERNAL;
+    //return TDEIO::ERR_INTERNAL;
     return false;
   }
 
diff --git a/lib/store/KoTarStore.cpp b/lib/store/KoTarStore.cpp
index db45d155..5d131a90 100644
--- a/lib/store/KoTarStore.cpp
+++ b/lib/store/KoTarStore.cpp
@@ -87,11 +87,11 @@ KoTarStore::~KoTarStore()
     // Now we have still some job to do for remote files.
     if ( m_fileMode == KoStoreBase::RemoteRead )
     {
-        KIO::NetAccess::removeTempFile( m_localFileName );
+        TDEIO::NetAccess::removeTempFile( m_localFileName );
     }
     else if ( m_fileMode == KoStoreBase::RemoteWrite )
     {
-        KIO::NetAccess::upload( m_localFileName, m_url, m_window );
+        TDEIO::NetAccess::upload( m_localFileName, m_url, m_window );
         // ### FIXME: delete temp file
     }
 }
@@ -137,13 +137,13 @@ bool KoTarStore::openRead( const TQString& name )
     if ( entry == 0L )
     {
         //kdWarning(s_area) << "Unknown filename " << name << endl;
-        //return KIO::ERR_DOES_NOT_EXIST;
+        //return TDEIO::ERR_DOES_NOT_EXIST;
         return false;
     }
     if ( entry->isDirectory() )
     {
         kdWarning(s_area) << name << " is a directory !" << endl;
-        //return KIO::ERR_IS_DIRECTORY;
+        //return TDEIO::ERR_IS_DIRECTORY;
         return false;
     }
     KTarFile * f = (KTarFile *) entry;
diff --git a/lib/store/KoZipStore.cpp b/lib/store/KoZipStore.cpp
index c1b7d01f..635ad248 100644
--- a/lib/store/KoZipStore.cpp
+++ b/lib/store/KoZipStore.cpp
@@ -98,11 +98,11 @@ KoZipStore::~KoZipStore()
     // Now we have still some job to do for remote files.
     if ( m_fileMode == KoStoreBase::RemoteRead )
     {
-        KIO::NetAccess::removeTempFile( m_localFileName );
+        TDEIO::NetAccess::removeTempFile( m_localFileName );
     }
     else if ( m_fileMode == KoStoreBase::RemoteWrite )
     {
-        KIO::NetAccess::upload( m_localFileName, m_url, m_window );
+        TDEIO::NetAccess::upload( m_localFileName, m_url, m_window );
         // ### FIXME: delete temp file
     }
 }
@@ -148,13 +148,13 @@ bool KoZipStore::openRead( const TQString& name )
     if ( entry == 0L )
     {
         //kdWarning(s_area) << "Unknown filename " << name << endl;
-        //return KIO::ERR_DOES_NOT_EXIST;
+        //return TDEIO::ERR_DOES_NOT_EXIST;
         return false;
     }
     if ( entry->isDirectory() )
     {
         kdWarning(s_area) << name << " is a directory !" << endl;
-        //return KIO::ERR_IS_DIRECTORY;
+        //return TDEIO::ERR_IS_DIRECTORY;
         return false;
     }
     // Must cast to KZipFileEntry, not only KArchiveFile, because device() isn't virtual!