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

2 files changed, 21 insertions, 21 deletions

diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 52384afad..1b4cc7b8f 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -76,7 +76,7 @@ void Scalix::get( const KURL &url )
   if ( path.contains( "/freebusy/" ) ) {
     retrieveFreeBusy( url );
   } else {
-    error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
+    error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
   }
 }
 
@@ -87,7 +87,7 @@ void Scalix::put( const KURL& url, int, bool, bool )
   if ( path.contains( "/freebusy/" ) ) {
     publishFreeBusy( url );
   } else {
-    error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
+    error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
   }
 }
 
@@ -115,11 +115,11 @@ void Scalix::retrieveFreeBusy( const KURL &url )
 
   mFreeBusyData = TQString();
 
-  KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
-  connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotRetrieveResult( KIO::Job* ) ) );
+  TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
+  connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) );
 
   tqApp->eventLoop()->enterLoop();
 }
@@ -144,7 +144,7 @@ void Scalix::publishFreeBusy( const KURL &url )
     calendar = path.mid( secondSlash + 1, lastSlash - secondSlash - 1 );
 
   if ( requestUser.isEmpty() || calendar.isEmpty() ) {
-    error( KIO::ERR_SLAVE_DEFINED, i18n( "No user or calendar given!" ) );
+    error( TDEIO::ERR_SLAVE_DEFINED, i18n( "No user or calendar given!" ) );
     return;
   };
 
@@ -157,7 +157,7 @@ void Scalix::publishFreeBusy( const KURL &url )
     const int newSize = readData(buffer);
     if ( newSize < 0 ) {
       // read error: network in unknown state so disconnect
-      error( KIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") );
+      error( TDEIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") );
       return;
     }
 
@@ -181,14 +181,14 @@ void Scalix::publishFreeBusy( const KURL &url )
                                                    url.user() : url.user() + ":" + url.pass() )
                                                 .arg( url.host() );
 
-  KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotPublishResult( KIO::Job* ) ) );
+  TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) );
 
   tqApp->eventLoop()->enterLoop();
 }
 
-void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data )
+void Scalix::slotInfoMessage( TDEIO::Job *job, const TQString &data )
 {
   if ( job->error() ) {
     // error is handled in slotResult
@@ -199,10 +199,10 @@ void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data )
 }
 
 
-void Scalix::slotRetrieveResult( KIO::Job *job )
+void Scalix::slotRetrieveResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    error( KIO::ERR_SLAVE_DEFINED, job->errorString() );
+    error( TDEIO::ERR_SLAVE_DEFINED, job->errorString() );
   } else {
     data( mFreeBusyData.utf8() );
     finished();
@@ -211,10 +211,10 @@ void Scalix::slotRetrieveResult( KIO::Job *job )
   tqApp->eventLoop()->exitLoop();
 }
 
-void Scalix::slotPublishResult( KIO::Job *job )
+void Scalix::slotPublishResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    error( KIO::ERR_SLAVE_DEFINED, job->errorString() );
+    error( TDEIO::ERR_SLAVE_DEFINED, job->errorString() );
   } else {
     finished();
   }
diff --git a/kresources/scalix/kioslave/scalix.h b/kresources/scalix/kioslave/scalix.h
index 62c2428b4..dc034b7b5 100644
--- a/kresources/scalix/kioslave/scalix.h
+++ b/kresources/scalix/kioslave/scalix.h
@@ -26,7 +26,7 @@
 
 #include <tqobject.h>
 
-class Scalix : public TQObject, public KIO::SlaveBase
+class Scalix : public TQObject, public TDEIO::SlaveBase
 {
   Q_OBJECT
   
@@ -38,9 +38,9 @@ class Scalix : public TQObject, public KIO::SlaveBase
     void put( const KURL &url, int permissions, bool overwrite, bool resume );
 
   private slots:
-    void slotRetrieveResult( KIO::Job* );
-    void slotPublishResult( KIO::Job* );
-    void slotInfoMessage( KIO::Job*, const TQString& );
+    void slotRetrieveResult( TDEIO::Job* );
+    void slotPublishResult( TDEIO::Job* );
+    void slotInfoMessage( TDEIO::Job*, const TQString& );
 
   private:
     void retrieveFreeBusy( const KURL& );