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

1 files changed, 69 insertions, 69 deletions

diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 5e5232d42..143c18c5b 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -167,8 +167,8 @@ void CachedImapJob::execute()
 
       ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
       jd.items << mFolder->label(); // for the err msg
-      KIO::SimpleJob *simpleJob = KIO::special( url.url(), packedArgs, false );
-      KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+      TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false );
+      TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
       mAccount->insertJob(simpleJob, jd);
 
       mAccount->setSentCustomLoginCommand( true );
@@ -195,19 +195,19 @@ void CachedImapJob::listMessages()
   KURL url = mAccount->getUrl();
   url.setPath( mFolder->imapPath() + ";UID=1:*;SECTION=FLAGS RFC822.SIZE");
 
-  KIO::SimpleJob *job = KIO::get(url, false, false);
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::get(url, false, false);
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-           this, TQT_SLOT( slotListMessagesResult( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+           this, TQT_SLOT( slotListMessagesResult( TDEIO::Job* ) ) );
   // send the data directly for KMFolderCachedImap
-  connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-           mFolder, TQT_SLOT( slotGetMessagesData( KIO::Job* , const TQByteArray& ) ) );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           mFolder, TQT_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) );
 }
 
-void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
+void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job )
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -236,12 +236,12 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
   url.setPath( mFolder->imapPath() +
                TQString::fromLatin1(";UID=%1").arg(uids) );
 
-  KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
+  TDEIO::SimpleJob *simpleJob = TDEIO::file_delete( url, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   mAccount->insertJob( simpleJob, jd );
-  connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
-           this, TQT_SLOT( slotDeleteNextMessages(KIO::Job *) ) );
+  connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+           this, TQT_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) );
 }
 
 void CachedImapJob::expungeFolder()
@@ -250,15 +250,15 @@ void CachedImapJob::expungeFolder()
   // Special URL that means EXPUNGE
   url.setPath( mFolder->imapPath() + TQString::fromLatin1(";UID=*") );
 
-  KIO::SimpleJob *job = KIO::file_delete( url, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::file_delete( url, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-           this, TQT_SLOT( slotExpungeResult(KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+           this, TQT_SLOT( slotExpungeResult(TDEIO::Job *) ) );
 }
 
-void CachedImapJob::slotExpungeResult( KIO::Job * job )
+void CachedImapJob::slotExpungeResult( TDEIO::Job * job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -276,7 +276,7 @@ void CachedImapJob::slotExpungeResult( KIO::Job * job )
   delete this;
 }
 
-void CachedImapJob::slotGetNextMessage(KIO::Job * job)
+void CachedImapJob::slotGetNextMessage(TDEIO::Job * job)
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -346,18 +346,18 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
   mMsg->setTransferInProgress(true);
-  KIO::SimpleJob *simpleJob = KIO::get(url, false, false);
-  KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+  TDEIO::SimpleJob *simpleJob = TDEIO::get(url, false, false);
+  TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
   mAccount->insertJob(simpleJob, jd);
-  connect(simpleJob, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
-          this, TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
-  connect(simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-          this, TQT_SLOT(slotGetNextMessage(KIO::Job *)));
-  connect(simpleJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-          mFolder, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+  connect(simpleJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+          this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
+  connect(simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+          this, TQT_SLOT(slotGetNextMessage(TDEIO::Job *)));
+  connect(simpleJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
 }
 
-void CachedImapJob::slotProcessedSize(KIO::Job *, KIO::filesize_t processed)
+void CachedImapJob::slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t processed)
 {
   emit progress( mSentBytes + processed, mTotalBytes );
 }
@@ -417,23 +417,23 @@ void CachedImapJob::slotPutNextMessage()
   jd.msgList.append( mMsg );
 
   mMsg->setTransferInProgress(true);
-  KIO::SimpleJob *simpleJob = KIO::put(url, 0, false, false, false);
-  KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+  TDEIO::SimpleJob *simpleJob = TDEIO::put(url, 0, false, false, false);
+  TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
   mAccount->insertJob(simpleJob, jd);
-  connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
-           TQT_SLOT( slotPutMessageResult(KIO::Job *) ) );
-  connect( simpleJob, TQT_SIGNAL( dataReq(KIO::Job *, TQByteArray &) ),
-           TQT_SLOT( slotPutMessageDataReq(KIO::Job *, TQByteArray &) ) );
-  connect( simpleJob, TQT_SIGNAL( data(KIO::Job *, const TQByteArray &) ),
-           mFolder, TQT_SLOT( slotSimpleData(KIO::Job *, const TQByteArray &) ) );
-  connect( simpleJob, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
-             TQT_SLOT(slotPutMessageInfoData(KIO::Job *, const TQString &)) );
+  connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+           TQT_SLOT( slotPutMessageResult(TDEIO::Job *) ) );
+  connect( simpleJob, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
+           TQT_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) );
+  connect( simpleJob, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
+           mFolder, TQT_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) );
+  connect( simpleJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+             TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
 
 }
 
 //-----------------------------------------------------------------------------
-// TODO: port to KIO::StoredTransferJob once it's ok to require tdelibs-3.3
-void CachedImapJob::slotPutMessageDataReq(KIO::Job *job, TQByteArray &data)
+// TODO: port to TDEIO::StoredTransferJob once it's ok to require tdelibs-3.3
+void CachedImapJob::slotPutMessageDataReq(TDEIO::Job *job, TQByteArray &data)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -452,7 +452,7 @@ void CachedImapJob::slotPutMessageDataReq(KIO::Job *job, TQByteArray &data)
 }
 
 //----------------------------------------------------------------------------
-void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data )
+void CachedImapJob::slotPutMessageInfoData( TDEIO::Job *job, const TQString &data )
 {
   KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( mDestFolder->storage() );
   if ( imapFolder ) {
@@ -472,7 +472,7 @@ void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data
 
 
 //-----------------------------------------------------------------------------
-void CachedImapJob::slotPutMessageResult(KIO::Job *job)
+void CachedImapJob::slotPutMessageResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -524,7 +524,7 @@ void CachedImapJob::slotPutMessageResult(KIO::Job *job)
 }
 
 
-void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
+void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job )
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -587,11 +587,11 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
     ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
     jd.items << folder->label(); // for the err msg
     jd.current = folder->folder();
-    KIO::SimpleJob *simpleJob = KIO::mkdir(url);
-    KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+    TDEIO::SimpleJob *simpleJob = TDEIO::mkdir(url);
+    TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
     mAccount->insertJob(simpleJob, jd);
-    connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotAddNextSubfolder(KIO::Job *)) );
+    connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
   } else {
     TQByteArray packedArgs;
     TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -605,16 +605,16 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
     ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
     jd.items << folder->label(); // for the err msg
     jd.current = folder->folder();
-    KIO::SimpleJob *simpleJob = KIO::special( url.url(), packedArgs, false );
-    KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+    TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
     mAccount->insertJob(simpleJob, jd);
-    connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotAddNextSubfolder(KIO::Job *)) );
+    connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
   }
 }
 
 
-void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
+void CachedImapJob::slotDeleteNextFolder( TDEIO::Job *job )
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -645,11 +645,11 @@ void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
   url.setPath(folderPath);
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.path = url.path();
-  KIO::SimpleJob *simpleJob = KIO::file_delete(url, false);
-  KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+  TDEIO::SimpleJob *simpleJob = TDEIO::file_delete(url, false);
+  TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
   mAccount->insertJob(simpleJob, jd);
-  connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
-           TQT_SLOT( slotDeleteNextFolder(KIO::Job *) ) );
+  connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+           TQT_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) );
 }
 
 void CachedImapJob::checkUidValidity()
@@ -660,16 +660,16 @@ void CachedImapJob::checkUidValidity()
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
 
-  KIO::SimpleJob *job = KIO::get( url, false, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::get( url, false, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotCheckUidValidityResult(KIO::Job *)) );
-  connect( job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-           mFolder, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+  connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) );
+  connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+           mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
 }
 
-void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
+void CachedImapJob::slotCheckUidValidityResult(TDEIO::Job * job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -749,11 +749,11 @@ void CachedImapJob::renameFolder( const TQString &newName )
   ImapAccountBase::jobData jd( newName, mFolder->folder() );
   jd.path = mNewImapPath;
 
-  KIO::SimpleJob *simpleJob = KIO::rename( urlSrc, urlDst, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
+  TDEIO::SimpleJob *simpleJob = TDEIO::rename( urlSrc, urlDst, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
   mAccount->insertJob( simpleJob, jd );
-  connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotRenameFolderResult(KIO::Job *)) );
+  connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotRenameFolderResult(TDEIO::Job *)) );
 }
 
 static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath,
@@ -844,7 +844,7 @@ void CachedImapJob::slotSubscribtionChange2Done( const TQString&, bool )
   delete this;
 }
 
-void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
+void CachedImapJob::slotRenameFolderResult( TDEIO::Job *job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -873,7 +873,7 @@ void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
   }
 }
 
-void CachedImapJob::slotListMessagesResult( KIO::Job * job )
+void CachedImapJob::slotListMessagesResult( TDEIO::Job * job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen