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

12 files changed, 88 insertions, 88 deletions

diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index 0f15b1005..7b67a5529 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -179,7 +179,7 @@ bool ExchangeAccount::authenticate( int windowId )
 
   kdDebug() << "Authenticating to base URL: " << baseURL().prettyURL() << endl;
 
-  KIO::AuthInfo info;
+  TDEIO::AuthInfo info;
   info.url = baseURL();
   info.username = mAccount;
   info.password = mPassword;
@@ -194,7 +194,7 @@ bool ExchangeAccount::authenticate( int windowId )
   stream << info << windowId;
 
   dcopClient->send( "kded", "kpasswdserver",
-                    "addAuthInfo(KIO::AuthInfo, long int)", params );
+                    "addAuthInfo(TDEIO::AuthInfo, long int)", params );
 
   dcopClient->detach();
   delete dcopClient;
@@ -237,13 +237,13 @@ void ExchangeAccount::calcFolderURLs()
 
   mError = false;
 
-  KIO::DavJob* job = KIO::davPropFind( baseURL(), doc, "1", false );
+  TDEIO::DavJob* job = TDEIO::davPropFind( baseURL(), doc, "1", false );
   job->addMetaData( "errorPage", "false" );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotFolderResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotFolderResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeAccount::slotFolderResult( KIO::Job *job )
+void ExchangeAccount::slotFolderResult( TDEIO::Job *job )
 {
   kdDebug() << "ExchangeAccount::slotFolderResult()" << endl;
   if ( job->error() ) {
@@ -254,7 +254,7 @@ void ExchangeAccount::slotFolderResult( KIO::Job *job )
     mError = true;
     return;
   }
-  TQDomDocument &response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument &response = static_cast<TDEIO::DavJob *>( job )->response();
 
   TQDomElement prop = response.documentElement().namedItem( "response" )
                      .namedItem( "propstat" ).namedItem( "prop" ).toElement();
@@ -297,14 +297,14 @@ TQString ExchangeAccount::tryMailbox( const TQString &_url, const TQString &user
   url.setPass( password );
 
   TQString tmpFile;
-  if ( !KIO::NetAccess::download( url, tmpFile, 0 ) ) {
+  if ( !TDEIO::NetAccess::download( url, tmpFile, 0 ) ) {
     kdWarning() << "Trying to find mailbox failed: not able to download " << url.prettyURL() << endl;
     return TQString();
   }
   TQFile file( tmpFile );
   if ( !file.open( IO_ReadOnly ) ) {
     kdWarning() << "Trying to find mailbox failed: not able to open temp file " << tmpFile << endl;
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
     return TQString();
   }
 
@@ -332,7 +332,7 @@ TQString ExchangeAccount::tryMailbox( const TQString &_url, const TQString &user
     }
     file.close();
 
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
     return result;
 }
 
diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h
index 71b6b889d..0d8bfcdf8 100644
--- a/libkpimexchange/core/exchangeaccount.h
+++ b/libkpimexchange/core/exchangeaccount.h
@@ -81,7 +81,7 @@ class KDE_EXPORT ExchangeAccount : public TQObject
                                const TQString &password );
 
   private slots:
-    void slotFolderResult( KIO::Job * );
+    void slotFolderResult( TDEIO::Job * );
 
   private:
     TQString mHost;
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index fe320b0f0..eadcc2bed 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -102,7 +102,7 @@ void ExchangeClient::test()
   "  <allprop/>\r\n"
   "</propfind>\r\n";
 
-  KIO::DavJob* job = new KIO::DavJob( url, (int) KIO::DAV_PROPFIND, query, false );
+  TDEIO::DavJob* job = new TDEIO::DavJob( url, (int) TDEIO::DAV_PROPFIND, query, false );
   job->addMetaData( "davDepth", "0" );
 */
 //  ExchangeMonitor* monitor = new ExchangeMonitor( mAccount );
diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h
index b9b0acd50..6c994c02a 100644
--- a/libkpimexchange/core/exchangeclient.h
+++ b/libkpimexchange/core/exchangeclient.h
@@ -33,7 +33,7 @@ namespace KCal {
   class Calendar;
 }
 
-namespace KIO { 
+namespace TDEIO { 
   class Job; 
 }
 
diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp
index eecfbd7f3..b23e9527e 100644
--- a/libkpimexchange/core/exchangedelete.cpp
+++ b/libkpimexchange/core/exchangedelete.cpp
@@ -72,19 +72,19 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
 	" AND (\"urn:schemas:calendar:instancetype\" = 0\r\n"
 	"      OR \"urn:schemas:calendar:instancetype\" = 1)\r\n";
 
-  KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
+  TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
   job->setWindow( mWindow );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFindUidResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *)));
 }
 
-void ExchangeDelete::slotFindUidResult( KIO::Job * job )
+void ExchangeDelete::slotFindUidResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
     emit finished( this, ExchangeClient::CommunicationError, "IO Error: " + TQString::number(job->error()) + ":" + job->errorString() );
     return;
   }
-  TQDomDocument& response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument& response = static_cast<TDEIO::DavJob *>( job )->response();
 
   TQDomElement item = response.documentElement().firstChild().toElement();
   TQDomElement hrefElement = item.namedItem( "href" ).toElement();
@@ -102,12 +102,12 @@ void ExchangeDelete::slotFindUidResult( KIO::Job * job )
 
 void ExchangeDelete::startDelete( const KURL& url )
 {
-  KIO::SimpleJob* job = KIO::file_delete( url, false ); // no GUI
+  TDEIO::SimpleJob* job = TDEIO::file_delete( url, false ); // no GUI
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotDeleteResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDeleteResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeDelete::slotDeleteResult( KIO::Job* job )
+void ExchangeDelete::slotDeleteResult( TDEIO::Job* job )
 {
   kdDebug() << "Finished Delete" << endl;
   if ( job->error() ) {
diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h
index 0c2c60e49..151657e57 100644
--- a/libkpimexchange/core/exchangedelete.h
+++ b/libkpimexchange/core/exchangedelete.h
@@ -41,8 +41,8 @@ class KDE_EXPORT ExchangeDelete : public TQObject {
     ~ExchangeDelete();
 
   private slots:
-    void slotDeleteResult( KIO::Job * );
-    void slotFindUidResult( KIO::Job * );
+    void slotDeleteResult( TDEIO::Job * );
+    void slotFindUidResult( TDEIO::Job * );
 
   signals:
     void finished( ExchangeDelete* worker, int result, const TQString& moreInfo );
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 60879d266..75b5f100f 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -108,12 +108,12 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start,
   kdDebug() << "ExchangeDownload::download() davSearch URL: "
             << mAccount->calendarURL() << endl;
 
-  KIO::DavJob *job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
+  TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
                                      sql, false );
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotSearchResult( KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotSearchResult( TDEIO::Job *) ) );
 }
 
 void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool showProgress )
@@ -134,11 +134,11 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh
 
   increaseDownloads();
 
-  KIO::DavJob *job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false );
-  KIO::Scheduler::scheduleJob(job);
+  TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false );
+  TDEIO::Scheduler::scheduleJob(job);
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotSearchResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
 }
 
 // Original query TODO: make query configurable
@@ -176,7 +176,7 @@ TQString ExchangeDownload::dateSelectQuery( const TQDate& start, const TQDate& e
 }
 #endif
 
-void ExchangeDownload::slotSearchResult( KIO::Job *job )
+void ExchangeDownload::slotSearchResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     kdError() << "ExchangeDownload::slotSearchResult() error: "
@@ -188,7 +188,7 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job )
     finishUp( ExchangeClient::CommunicationError, job );
     return;
   }
-  TQDomDocument &response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument &response = static_cast<TDEIO::DavJob *>( job )->response();
 
   kdDebug() << "Search result: " << endl << response.toString() << endl;
 
@@ -197,7 +197,7 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job )
   decreaseDownloads();
 }
 
-void ExchangeDownload::slotMasterResult( KIO::Job *job )
+void ExchangeDownload::slotMasterResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     kdError() << "Error result for Master search: " << job->error() << endl;
@@ -205,7 +205,7 @@ void ExchangeDownload::slotMasterResult( KIO::Job *job )
     finishUp( ExchangeClient::CommunicationError, job );
     return;
   }
-  TQDomDocument &response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument &response = static_cast<TDEIO::DavJob *>( job )->response();
 
   kdDebug() << "Search (master) result: " << endl << response.toString() << endl;
 
@@ -297,12 +297,12 @@ void ExchangeDownload::handleRecurrence( TQString uid )
 
   increaseDownloads();
 
-  KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
+  TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
                                      query, false );
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotMasterResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) );
 }
 
 void ExchangeDownload::readAppointment( const KURL& url )
@@ -345,15 +345,15 @@ void ExchangeDownload::readAppointment( const KURL& url )
 
   increaseDownloads();
 
-  KIO::DavJob* job = KIO::davPropFind( url, doc, "0", false );
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::DavJob* job = TDEIO::davPropFind( url, doc, "0", false );
+  TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
   job->addMetaData( "errorPage", "false" );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotPropFindResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeDownload::slotPropFindResult( KIO::Job *job )
+void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
 {
   kdDebug() << "slotPropFindResult" << endl;
 
@@ -364,7 +364,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
     return;
   }
 
-  TQDomDocument response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument response = static_cast<TDEIO::DavJob *>( job )->response();
   kdDebug() << "Response: " << endl;
   kdDebug() << response.toString() << endl;
 
@@ -589,7 +589,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
     mCalendar->addEvent( event );
   } else {
     kdDebug() << "EMIT gotEvent" << endl;
-    emit gotEvent( event, static_cast<KIO::DavJob *>( job )->url() );
+    emit gotEvent( event, static_cast<TDEIO::DavJob *>( job )->url() );
 //    mEvents->append( event );
   }
 
@@ -633,7 +633,7 @@ void ExchangeDownload::finishUp( int result, const TQString &moreInfo )
 //  }
 }
 
-void ExchangeDownload::finishUp( int result, KIO::Job *job )
+void ExchangeDownload::finishUp( int result, TDEIO::Job *job )
 {
   finishUp( result, TQString("WebDAV job error code = ") +
                     TQString::number( job->error() ) + ";\n" + "\"" +
diff --git a/libkpimexchange/core/exchangedownload.h b/libkpimexchange/core/exchangedownload.h
index a28cc7106..33d135603 100644
--- a/libkpimexchange/core/exchangedownload.h
+++ b/libkpimexchange/core/exchangedownload.h
@@ -55,16 +55,16 @@ class ExchangeDownload : public TQObject {
     void finished( ExchangeDownload*, int result, const TQString& moreInfo, TQPtrList<KCal::Event>& events );
 
   private slots:
-    void slotSearchResult( KIO::Job *job );
-    void slotMasterResult( KIO::Job* job );
-    void slotPropFindResult( KIO::Job * );
+    void slotSearchResult( TDEIO::Job *job );
+    void slotMasterResult( TDEIO::Job* job );
+    void slotPropFindResult( TDEIO::Job * );
 
   private:
     void handleAppointments( const TQDomDocument &, bool recurrence );
     void readAppointment( const KURL& url );
     void handleRecurrence( TQString uid );
     void finishUp( int result, const TQString& moreInfo=TQString() );
-    void finishUp( int result, KIO::Job* job );
+    void finishUp( int result, TDEIO::Job* job );
 
     void increaseDownloads();
     void decreaseDownloads();
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index c9f8c627a..531a2417e 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -129,11 +129,11 @@ ExchangeMonitor::~ExchangeMonitor()
   if ( ! mSubscriptionMap.isEmpty() ) {
     TQString headers = "Subscription-ID: " + makeIDString( mSubscriptionMap.keys() );
     kdDebug() << "Subsubscribing all watches, headers:" << endl << headers << endl;
-    KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_UNSUBSCRIBE, TQString(), false );
+    TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_UNSUBSCRIBE, TQString(), false );
     job->addMetaData( "customHTTPHeader", headers );
     // Can't do, this is a destructor!
     // job->addMetaData( "PropagateHttpHeader", "true" );
-    // connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(KIO::Job *)));
+    // connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
   }
   kdDebug() << "Finished ExchangeMonitor destructor" << endl;
 
@@ -158,10 +158,10 @@ void ExchangeMonitor::addWatch( const KURL &url, int mode, int depth )
   kdDebug() << "Headers: " << headers << endl;
 
   KURL myURL = toDAV( url );
-  KIO::DavJob *job = new KIO::DavJob( myURL, (int) KIO::DAV_SUBSCRIBE, TQString(), false );
+  TDEIO::DavJob *job = new TDEIO::DavJob( myURL, (int) TDEIO::DAV_SUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", headers );
   job->addMetaData( "PropagateHttpHeader", "true" );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotSubscribeResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotSubscribeResult(TDEIO::Job *)));
 }
 
 void ExchangeMonitor::removeWatch( const KURL &url ) 
@@ -179,13 +179,13 @@ void ExchangeMonitor::removeWatch( const KURL &url )
 
 void ExchangeMonitor::removeWatch( ID id )
 {
-  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_UNSUBSCRIBE, TQString(), false );
+  TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_UNSUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-id: " + TQString::number( id ));
   job->addMetaData( "PropagateHttpHeader", "true" );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
 }
 
-void ExchangeMonitor::slotSubscribeResult( KIO::Job * job )
+void ExchangeMonitor::slotSubscribeResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
@@ -245,7 +245,7 @@ void ExchangeMonitor::slotSubscribeResult( KIO::Job * job )
   mSubscriptionMap.insert( id, url );
 }
 
-void ExchangeMonitor::slotUnsubscribeResult( KIO::Job * job )
+void ExchangeMonitor::slotUnsubscribeResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
@@ -253,7 +253,7 @@ void ExchangeMonitor::slotUnsubscribeResult( KIO::Job * job )
     return;
   }
 
-  TQDomDocument& response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument& response = static_cast<TDEIO::DavJob *>( job )->response();
   kdDebug() << "UNSUBSCRIBE result: " << endl << response.toString() << endl;
 
   TQDomElement status = response.documentElement().namedItem( "response" ).namedItem( "status" ).toElement();
@@ -321,19 +321,19 @@ void ExchangeMonitor::poll( const IDList& IDs ) {
 //  }
 
   // confirm it
-  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_POLL, TQString(), false );
+  TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_POLL, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-ID: " + makeIDString( IDs ) );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotPollResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotPollResult(TDEIO::Job *)));
 }
 
-void ExchangeMonitor::slotPollResult( KIO::Job * job )
+void ExchangeMonitor::slotPollResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
     emit error( ExchangeClient::CommunicationError, "IO Error: " + TQString::number(job->error()) + ":" + job->errorString() );
     return;
   }
-  TQDomDocument& response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument& response = static_cast<TDEIO::DavJob *>( job )->response();
   kdDebug() << "POLL result: " << endl << response.toString() << endl;
 
   // Multiple results!
@@ -366,12 +366,12 @@ void ExchangeMonitor::slotRenewTimer()
 {
   kdDebug() << "ExchangeMonitor::slotRenewTimer()" << endl;
 
-  KIO::DavJob *job = new KIO::DavJob( mAccount->calendarURL(), (int) KIO::DAV_SUBSCRIBE, TQString(), false );
+  TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_SUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-id: " + makeIDString( mSubscriptionMap.keys() ) );
-  connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotRenewResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotRenewResult(TDEIO::Job *)));
 }
 
-void ExchangeMonitor::slotRenewResult( KIO::Job* job )
+void ExchangeMonitor::slotRenewResult( TDEIO::Job* job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0L );
diff --git a/libkpimexchange/core/exchangemonitor.h b/libkpimexchange/core/exchangemonitor.h
index 6f31700d2..15b4fa992 100644
--- a/libkpimexchange/core/exchangemonitor.h
+++ b/libkpimexchange/core/exchangemonitor.h
@@ -78,13 +78,13 @@ class ExchangeMonitor : public TQObject {
     void error( int result, const TQString& moreInfo );
 
   private slots:
-    void slotSubscribeResult( KIO::Job * );
-    void slotUnsubscribeResult( KIO::Job * );
+    void slotSubscribeResult( TDEIO::Job * );
+    void slotUnsubscribeResult( TDEIO::Job * );
     void slotPollTimer();
     void poll( const IDList& IDs );
-    void slotPollResult( KIO::Job * );
+    void slotPollResult( TDEIO::Job * );
     void slotRenewTimer();
-    void slotRenewResult( KIO::Job * );
+    void slotRenewResult( TDEIO::Job * );
     void slotActivated(int socket);
 
   private:
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index d317976d0..e553b40c3 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -85,14 +85,14 @@ void ExchangeUpload::findUid( TQString const &uid )
   kdDebug() << "Find uid query: " << endl << query << endl;
   kdDebug() << "Looking for uid " << uid << endl;
   
-  KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
+  TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
                                      query, false );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotFindUidResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotFindUidResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeUpload::slotFindUidResult( KIO::Job * job )
+void ExchangeUpload::slotFindUidResult( TDEIO::Job * job )
 {
   kdDebug() << "slotFindUidResult()" << endl;
 
@@ -104,7 +104,7 @@ void ExchangeUpload::slotFindUidResult( KIO::Job * job )
                    job->errorString() );
     return;
   }
-  TQDomDocument &response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument &response = static_cast<TDEIO::DavJob *>( job )->response();
 
   kdDebug() << "Search uid result: " << endl << response.toString() << endl;
 
@@ -144,19 +144,19 @@ void ExchangeUpload::tryExist()
   addElement( doc, prop, "DAV:", "displayname" );
   addElement( doc, prop, "urn:schemas:calendar", "uid" );
 
-  KIO::DavJob *job = KIO::davPropFind( url, doc, "0", false );
+  TDEIO::DavJob *job = TDEIO::davPropFind( url, doc, "0", false );
   job->setWindow( mWindow );
   job->addMetaData( "errorPage", "false" );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotPropFindResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeUpload::slotPropFindResult( KIO::Job *job )
+void ExchangeUpload::slotPropFindResult( TDEIO::Job *job )
 {
   kdDebug() << "slotPropFindResult()" << endl;
   int error = job->error(); 
   kdDebug() << "PROPFIND error: " << error << ":" << job->errorString() << endl;
-  if ( error && error != KIO::ERR_DOES_NOT_EXIST ) {
+  if ( error && error != TDEIO::ERR_DOES_NOT_EXIST ) {
     job->showErrorDialog( 0 );
     emit finished( this, ExchangeClient::CommunicationError,
                    "IO Error: " + TQString::number(error) + ":" +
@@ -330,13 +330,13 @@ void ExchangeUpload::startUpload( const KURL &url )
 
   kdDebug() << "Upload url: " << url << endl;
 
-  KIO::DavJob *job = KIO::davPropPatch( url, doc, false );
+  TDEIO::DavJob *job = TDEIO::davPropPatch( url, doc, false );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotPatchResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotPatchResult( TDEIO::Job * ) ) );
 }
 
-void ExchangeUpload::slotPatchResult( KIO::Job *job )
+void ExchangeUpload::slotPatchResult( TDEIO::Job *job )
 {
   kdDebug() << "slotPropPatchResult()" << endl;
   if ( job->error() ) {
@@ -347,7 +347,7 @@ void ExchangeUpload::slotPatchResult( KIO::Job *job )
                    job->errorString() );
     return;
   }
-  TQDomDocument response = static_cast<KIO::DavJob *>( job )->response();
+  TQDomDocument response = static_cast<TDEIO::DavJob *>( job )->response();
   kdDebug() << "Patch result: " << response.toString() << endl;
 
   // Either we have a "201 Created" (if a new event has been created) or 
diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h
index fd279faab..e592c00f4 100644
--- a/libkpimexchange/core/exchangeupload.h
+++ b/libkpimexchange/core/exchangeupload.h
@@ -41,9 +41,9 @@ class KDE_EXPORT ExchangeUpload : public TQObject {
     ~ExchangeUpload();
 
   private slots:
-    void slotPatchResult( KIO::Job * );
-    void slotPropFindResult( KIO::Job * );
-    void slotFindUidResult( KIO::Job * );
+    void slotPatchResult( TDEIO::Job * );
+    void slotPropFindResult( TDEIO::Job * );
+    void slotFindUidResult( TDEIO::Job * );
 
   signals:
     void startDownload();