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

2 files changed, 27 insertions, 27 deletions

diff --git a/kioslaves/videodvd/videodvd.cpp b/kioslaves/videodvd/videodvd.cpp
index ebf937f..c3398a1 100644
--- a/kioslaves/videodvd/videodvd.cpp
+++ b/kioslaves/videodvd/videodvd.cpp
@@ -36,7 +36,7 @@
 
 #include "videodvd.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C"
 {
@@ -93,34 +93,34 @@ kio_videodvdProtocol::~kio_videodvdProtocol()
 }
 
 
-KIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) const
+TDEIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) const
 {
-  KIO::UDSEntry uds;
-  KIO::UDSAtom a;
+  TDEIO::UDSEntry uds;
+  TDEIO::UDSAtom a;
 
-  a.m_uds = KIO::UDS_NAME;
+  a.m_uds = TDEIO::UDS_NAME;
   a.m_str = e->name();
   uds.append( a );
 
-  a.m_uds = KIO::UDS_ACCESS;
+  a.m_uds = TDEIO::UDS_ACCESS;
   a.m_long = e->permissions();
   uds.append( a );
 
-  a.m_uds = KIO::UDS_CREATION_TIME;
+  a.m_uds = TDEIO::UDS_CREATION_TIME;
   a.m_long = e->date();
   uds.append( a );
 
-  a.m_uds = KIO::UDS_MODIFICATION_TIME;
+  a.m_uds = TDEIO::UDS_MODIFICATION_TIME;
   a.m_long = e->date();
   uds.append( a );
 
   if( e->isDirectory() )
   {
-    a.m_uds = KIO::UDS_FILE_TYPE;
+    a.m_uds = TDEIO::UDS_FILE_TYPE;
     a.m_long = S_IFDIR;
     uds.append( a );
 
-    a.m_uds = KIO::UDS_MIME_TYPE;
+    a.m_uds = TDEIO::UDS_MIME_TYPE;
     a.m_str = "inode/directory";
     uds.append( a );
   }
@@ -128,15 +128,15 @@ KIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) c
   {
     const K3bIso9660File* file = static_cast<const K3bIso9660File*>( e );
 
-    a.m_uds = KIO::UDS_SIZE;
+    a.m_uds = TDEIO::UDS_SIZE;
     a.m_long = file->size();
     uds.append( a );
 
-    a.m_uds = KIO::UDS_FILE_TYPE;
+    a.m_uds = TDEIO::UDS_FILE_TYPE;
     a.m_long = S_IFREG;
     uds.append( a );
 
-    a.m_uds = KIO::UDS_MIME_TYPE;
+    a.m_uds = TDEIO::UDS_MIME_TYPE;
     if( e->name().endsWith( "VOB" ) )
       a.m_str = "video/mpeg";
     else
@@ -198,7 +198,7 @@ void kio_videodvdProtocol::get(const KURL& url )
       TQByteArray buffer( 10*2048 );
       int read = 0;
       int cnt = 0;
-      KIO::filesize_t totalRead = 0;
+      TDEIO::filesize_t totalRead = 0;
       while( (read = file->read( totalRead, buffer.data(), buffer.size() )) > 0 )
       {
         buffer.resize( read );
@@ -286,22 +286,22 @@ void kio_videodvdProtocol::listVideoDVDs()
 	// FIXME: cache the entry for speedup
 
         UDSEntryList udsl;
-	KIO::UDSEntry uds;
-	KIO::UDSAtom a;
+	TDEIO::UDSEntry uds;
+	TDEIO::UDSAtom a;
 	
-	a.m_uds = KIO::UDS_NAME;
+	a.m_uds = TDEIO::UDS_NAME;
 	a.m_str = iso.primaryDescriptor().volumeId;
 	uds.append( a );
 
-	a.m_uds = KIO::UDS_FILE_TYPE;
+	a.m_uds = TDEIO::UDS_FILE_TYPE;
 	a.m_long = S_IFDIR;
 	uds.append( a );
 	
-	a.m_uds = KIO::UDS_MIME_TYPE;
+	a.m_uds = TDEIO::UDS_MIME_TYPE;
 	a.m_str = "inode/directory";
 	uds.append( a );
 
-	a.m_uds = KIO::UDS_ICON_NAME;
+	a.m_uds = TDEIO::UDS_ICON_NAME;
 	a.m_str = "dvd_unmount";
 	uds.append( a );
 
@@ -327,18 +327,18 @@ void kio_videodvdProtocol::stat( const KURL& url )
     //
     // stat the root path
     //
-    KIO::UDSEntry uds;
-    KIO::UDSAtom a;
+    TDEIO::UDSEntry uds;
+    TDEIO::UDSAtom a;
     
-    a.m_uds = KIO::UDS_NAME;
+    a.m_uds = TDEIO::UDS_NAME;
     a.m_str = "/";
     uds.append( a );
     
-    a.m_uds = KIO::UDS_FILE_TYPE;
+    a.m_uds = TDEIO::UDS_FILE_TYPE;
     a.m_long = S_IFDIR;
     uds.append( a );
 
-    a.m_uds = KIO::UDS_MIME_TYPE;
+    a.m_uds = TDEIO::UDS_MIME_TYPE;
     a.m_str = "inode/directory";
     uds.append( a );
 
diff --git a/kioslaves/videodvd/videodvd.h b/kioslaves/videodvd/videodvd.h
index 8885c9a..d408931 100644
--- a/kioslaves/videodvd/videodvd.h
+++ b/kioslaves/videodvd/videodvd.h
@@ -32,7 +32,7 @@ namespace K3bDevice
   class DeviceManager;
 }
 
-class kio_videodvdProtocol : public KIO::SlaveBase
+class kio_videodvdProtocol : public TDEIO::SlaveBase
 {
 public:
   kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket);
@@ -45,7 +45,7 @@ public:
 
 private:
   K3bIso9660* openIso( const KURL&, TQString& plainIsoPath );
-  KIO::UDSEntry createUDSEntry( const K3bIso9660Entry* e ) const;
+  TDEIO::UDSEntry createUDSEntry( const K3bIso9660Entry* e ) const;
   void listVideoDVDs();
 
   static K3bDevice::DeviceManager* s_deviceManager;