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

2 files changed, 17 insertions, 17 deletions

diff --git a/lib/kio-msits/msits.cpp b/lib/kio-msits/msits.cpp
index 8171525..aa650d2 100755
--- a/lib/kio-msits/msits.cpp
+++ b/lib/kio-msits/msits.cpp
@@ -36,7 +36,7 @@
 #include "msits.h"
 #include "libchmurlfactory.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C"
 {
@@ -104,14 +104,14 @@ void ProtocolMSITS::get( const KURL& url )
 	{
 		if ( isDirectory (fileName) )
 		{
-			error( KIO::ERR_IS_DIRECTORY, url.prettyURL() );
+			error( TDEIO::ERR_IS_DIRECTORY, url.prettyURL() );
 			return;
 		}
 
 		if ( !ResolveObject ( fileName, &ui) )
 		{
 			kdDebug() << "kio_msits::get: could not resolve filename " << fileName << endl;
-        	error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
+        	error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
 			return;
 		}
 
@@ -120,7 +120,7 @@ void ProtocolMSITS::get( const KURL& url )
 		if ( RetrieveObject (&ui, (unsigned char*) buf.data(), 0, ui.length) == 0 )
 		{
 			kdDebug() << "kio_msits::get: could not retrieve filename " << fileName << endl;
-        	error( KIO::ERR_NO_CONTENT, url.prettyURL() );
+        	error( TDEIO::ERR_NO_CONTENT, url.prettyURL() );
 			return;
 		}
 	}
@@ -145,7 +145,7 @@ bool ProtocolMSITS::parseLoadAndLookup ( const KURL& url, TQString& abspath )
 
 	if ( pos == -1 )
 	{
-		error( KIO::ERR_MALFORMED_URL, url.prettyURL() );
+		error( TDEIO::ERR_MALFORMED_URL, url.prettyURL() );
 		return false;
 	}
 
@@ -160,7 +160,7 @@ bool ProtocolMSITS::parseLoadAndLookup ( const KURL& url, TQString& abspath )
 
     if ( filename.isEmpty() )
     {
-		error( KIO::ERR_MALFORMED_URL, url.prettyURL() );
+		error( TDEIO::ERR_MALFORMED_URL, url.prettyURL() );
         return false;
     }
 
@@ -175,7 +175,7 @@ bool ProtocolMSITS::parseLoadAndLookup ( const KURL& url, TQString& abspath )
 
 	if ( (tmpchm = chm_open ( TQFile::encodeName (filename))) == 0 )
 	{
-		error( KIO::ERR_COULD_NOT_READ, url.prettyURL() );
+		error( TDEIO::ERR_COULD_NOT_READ, url.prettyURL() );
         return false;
 	}
 
@@ -215,9 +215,9 @@ static void app_entry(UDSEntry& e, unsigned int uds, const TQString& str)
 static void app_dir(UDSEntry& e, const TQString & name)
 {
 	e.clear();
-	app_entry(e, KIO::UDS_NAME, name);
-	app_entry(e, KIO::UDS_FILE_TYPE, S_IFDIR);
-	app_entry(e, KIO::UDS_SIZE, 1);
+	app_entry(e, TDEIO::UDS_NAME, name);
+	app_entry(e, TDEIO::UDS_FILE_TYPE, S_IFDIR);
+	app_entry(e, TDEIO::UDS_SIZE, 1);
 }
 
 // internal function
@@ -225,9 +225,9 @@ static void app_dir(UDSEntry& e, const TQString & name)
 static void app_file(UDSEntry& e, const TQString & name, size_t size)
 {
 	e.clear();
-	app_entry(e, KIO::UDS_NAME, name);
-	app_entry(e, KIO::UDS_FILE_TYPE, S_IFREG);
-	app_entry(e, KIO::UDS_SIZE, size);
+	app_entry(e, TDEIO::UDS_NAME, name);
+	app_entry(e, TDEIO::UDS_FILE_TYPE, S_IFREG);
+	app_entry(e, TDEIO::UDS_SIZE, size);
 }
 
 void ProtocolMSITS::stat (const KURL & url)
@@ -242,7 +242,7 @@ void ProtocolMSITS::stat (const KURL & url)
 
 	if ( !ResolveObject ( fileName, &ui ) )
 	{
-        error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
+        error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
 		return;
 	}
 
@@ -281,7 +281,7 @@ void ProtocolMSITS::listDir (const KURL & url)
 
 	if ( !isDirectory (filepath) )
 	{
-		error(KIO::ERR_CANNOT_ENTER_DIRECTORY, url.path());
+		error(TDEIO::ERR_CANNOT_ENTER_DIRECTORY, url.path());
 		return;
 	}
 
@@ -295,7 +295,7 @@ void ProtocolMSITS::listDir (const KURL & url)
 							chmlib_enumerator,
 							&listing ) != 1 )
 	{
-		error(KIO::ERR_CANNOT_ENTER_DIRECTORY, url.path());
+		error(TDEIO::ERR_CANNOT_ENTER_DIRECTORY, url.path());
 		return;
 	}
 
diff --git a/lib/kio-msits/msits.h b/lib/kio-msits/msits.h
index abf1a3f..882e394 100755
--- a/lib/kio-msits/msits.h
+++ b/lib/kio-msits/msits.h
@@ -33,7 +33,7 @@
 #include "chm_lib.h"
 
 
-class ProtocolMSITS : public KIO::SlaveBase
+class ProtocolMSITS : public TDEIO::SlaveBase
 {
 public:
     ProtocolMSITS ( const TQCString&, const TQCString& );