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

1 files changed, 38 insertions, 38 deletions

diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index e7009a237..4ce92cb1d 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -250,8 +250,8 @@ void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent )
 
 void KMFolderCachedImap::readConfig()
 {
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver( config, "Folder-" + folder()->idString() );
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver( config, "Folder-" + folder()->idString() );
   if( mImapPath.isEmpty() ) mImapPath = config->readEntry( "ImapPath" );
   if( TQString( name() ).upper() == "INBOX" && mImapPath == "/INBOX/" )
   {
@@ -329,7 +329,7 @@ void KMFolderCachedImap::writeConfig()
   if ( mFolderRemoved )
     return;
 
-  KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
+  TDEConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
   configGroup.writeEntry( "ImapPath", mImapPath );
   configGroup.writeEntry( "NoContent", mNoContent );
   configGroup.writeEntry( "ReadOnly", mReadOnly );
@@ -369,7 +369,7 @@ void KMFolderCachedImap::writeConfig()
 
 void KMFolderCachedImap::writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig()
 {
-  KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
+  TDEConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
   if ( !folder()->noContent() )
   {
     configGroup.writeEntry( "AnnotationFolderTypeChanged", mAnnotationFolderTypeChanged );
@@ -1148,13 +1148,13 @@ void KMFolderCachedImap::serverSyncInternal()
       annotations.append( attr );
 
       kdDebug(5006) << "Setting test attribute to "<< url << endl;
-      KIO::Job* job = AnnotationJobs::multiSetAnnotation( mAccount->slave(),
+      TDEIO::Job* job = AnnotationJobs::multiSetAnnotation( mAccount->slave(),
           url, annotations );
       ImapAccountBase::jobData jd( url.url(), folder() );
       jd.cancellable = true; // we can always do so later
       mAccount->insertJob(job, jd);
-       connect(job, TQT_SIGNAL(result(KIO::Job *)),
-              TQT_SLOT(slotTestAnnotationResult(KIO::Job *)));
+       connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+              TQT_SLOT(slotTestAnnotationResult(TDEIO::Job *)));
       break;
     }
 
@@ -1199,8 +1199,8 @@ void KMFolderCachedImap::serverSyncInternal()
 
         connect( job, TQT_SIGNAL(annotationResult(const TQString&, const TQString&, bool)),
                  TQT_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) );
-        connect( job, TQT_SIGNAL(result(KIO::Job *)),
-                 TQT_SLOT(slotGetAnnotationResult(KIO::Job *)) );
+        connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+                 TQT_SLOT(slotGetAnnotationResult(TDEIO::Job *)) );
         break;
       }
     }
@@ -1232,7 +1232,7 @@ void KMFolderCachedImap::serverSyncInternal()
         kdDebug(5006) << k_funcinfo << "Setting sharedseen annotation for " << label() << " to " << val << endl;
       }
       if ( !annotations.isEmpty() ) {
-        KIO::Job* job =
+        TDEIO::Job* job =
           AnnotationJobs::multiSetAnnotation( mAccount->slave(), url, annotations );
         ImapAccountBase::jobData jd( url.url(), folder() );
         jd.cancellable = true; // we can always do so later
@@ -1240,8 +1240,8 @@ void KMFolderCachedImap::serverSyncInternal()
 
         connect(job, TQT_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ),
                 TQT_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) ));
-        connect(job, TQT_SIGNAL(result(KIO::Job *)),
-                TQT_SLOT(slotSetAnnotationResult(KIO::Job *)));
+        connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+                TQT_SLOT(slotSetAnnotationResult(TDEIO::Job *)));
         break;
       }
     }
@@ -1260,12 +1260,12 @@ void KMFolderCachedImap::serverSyncInternal()
         newState( mProgress, i18n("Setting permissions"));
         KURL url = mAccount->getUrl();
         url.setPath( imapPath() );
-        KIO::Job* job = KMail::ACLJobs::multiSetACL( mAccount->slave(), url, mACLList );
+        TDEIO::Job* job = KMail::ACLJobs::multiSetACL( mAccount->slave(), url, mACLList );
         ImapAccountBase::jobData jd( url.url(), folder() );
         mAccount->insertJob(job, jd);
 
-        connect(job, TQT_SIGNAL(result(KIO::Job *)),
-                TQT_SLOT(slotMultiSetACLResult(KIO::Job *)));
+        connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+                TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
         connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )),
                 TQT_SLOT(slotACLChanged( const TQString&, int )) );
         break;
@@ -1278,8 +1278,8 @@ void KMFolderCachedImap::serverSyncInternal()
     if( !mQuotaOnly && !noContent() && mAccount->hasACLSupport() ) {
       newState( mProgress, i18n( "Retrieving permissions" ) );
       mAccount->getACL( folder(), mImapPath );
-      connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-               this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+      connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+               this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
       break;
     }
   case SYNC_STATE_FIND_SUBFOLDERS:
@@ -1306,13 +1306,13 @@ void KMFolderCachedImap::serverSyncInternal()
       newState( mProgress, i18n("Getting quota information"));
       KURL url = mAccount->getUrl();
       url.setPath( imapPath() );
-      KIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url );
+      TDEIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url );
       ImapAccountBase::jobData jd( url.url(), folder() );
       mAccount->insertJob(job, jd);
       connect( job, TQT_SIGNAL( storageQuotaResult( const QuotaInfo& ) ),
           TQT_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) );
-      connect( job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotQuotaResult(KIO::Job *)) );
+      connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotQuotaResult(TDEIO::Job *)) );
       break;
     }
   case SYNC_STATE_CLOSE:
@@ -1437,7 +1437,7 @@ void KMFolderCachedImap::slotConnectionResult( int errorCode, const TQString& er
     serverSyncInternal();
   } else {
     // Error (error message already shown by the account)
-    newState( mProgress, KIO::buildErrorString( errorCode, errorMsg ));
+    newState( mProgress, TDEIO::buildErrorString( errorCode, errorMsg ));
     emit folderComplete(this, false);
   }
 }
@@ -1819,7 +1819,7 @@ void KMFolderCachedImap::slotGetLastMessagesResult(KMail::FolderJob *job)
 }
 
 // Connected to the listMessages job in CachedImapJob
-void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
+void KMFolderCachedImap::slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -2347,8 +2347,8 @@ void KMFolderCachedImap::listDirectory2()
     ImapAccountBase::jobData jd( TQString(), folder() );
     jd.cancellable = true;
     mAccount->insertJob(job, jd);
-    connect( job, TQT_SIGNAL(result(KIO::Job *)),
-        TQT_SLOT(slotMultiUrlGetAnnotationResult(KIO::Job *)) );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+        TQT_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) );
 
   } else {
     createFoldersNewOnServerAndFinishListing( foldersNewOnServer );
@@ -2449,7 +2449,7 @@ void KMFolderCachedImap::slotSubFolderCloseToQuotaChanged()
   }
 }
 
-void KMFolderCachedImap::slotSimpleData(KIO::Job * job, const TQByteArray & data)
+void KMFolderCachedImap::slotSimpleData(TDEIO::Job * job, const TQByteArray & data)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if (it == mAccount->jobsEnd()) return;
@@ -2513,11 +2513,11 @@ KMFolderCachedImap::setReadOnly( bool readOnly )
 }
 
 void
-KMFolderCachedImap::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
+KMFolderCachedImap::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
 {
   if ( folder->storage() == this ) {
-    disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-                this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+    disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+                this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
     mACLListState = job->error() ? KMail::ACLJobs::FetchFailed : KMail::ACLJobs::Ok;
     mACLList = aclList;
     serverSyncInternal();
@@ -2551,7 +2551,7 @@ KMFolderCachedImap::setACLList( const ACLList& arr )
 }
 
 void
-KMFolderCachedImap::slotMultiSetACLResult(KIO::Job *job)
+KMFolderCachedImap::slotMultiSetACLResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
@@ -2795,7 +2795,7 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr
   }
 }
 
-void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
+void KMFolderCachedImap::slotGetAnnotationResult( TDEIO::Job* job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2805,7 +2805,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
 
   AnnotationJobs::GetAnnotationJob* annjob = static_cast<AnnotationJobs::GetAnnotationJob *>( job );
   if ( annjob->error() ) {
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
@@ -2821,7 +2821,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
   serverSyncInternal();
 }
 
-void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
+void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( TDEIO::Job* job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2833,7 +2833,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
   AnnotationJobs::MultiUrlGetAnnotationJob* annjob
     = static_cast<AnnotationJobs::MultiUrlGetAnnotationJob *>( job );
   if ( annjob->error() ) {
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
@@ -2873,7 +2873,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
   createFoldersNewOnServerAndFinishListing( folders );
 }
 
-void KMFolderCachedImap::slotQuotaResult( KIO::Job* job )
+void KMFolderCachedImap::slotQuotaResult( TDEIO::Job* job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2884,7 +2884,7 @@ void KMFolderCachedImap::slotQuotaResult( KIO::Job* job )
   QuotaJobs::GetStorageQuotaJob* quotajob = static_cast<QuotaJobs::GetStorageQuotaJob *>( job );
   QuotaInfo empty;
   if ( quotajob->error() ) {
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
       // that's when the imap server doesn't support quota
       mAccount->setHasNoQuotaSupport();
       setQuotaInfo( empty );
@@ -2916,7 +2916,7 @@ KMFolderCachedImap::slotAnnotationChanged( const TQString& entry, const TQString
   }
 }
 
-void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job)
+void KMFolderCachedImap::slotTestAnnotationResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2936,7 +2936,7 @@ void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job)
 }
 
 void
-KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
+KMFolderCachedImap::slotSetAnnotationResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
@@ -2945,7 +2945,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
   bool cont = true;
   if ( job->error() ) {
     // Don't show error if the server doesn't support ANNOTATEMORE and this folder only contains mail
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
       if (mAccount->slave()) mAccount->removeJob(job);
     } else {
       cont = mAccount->handleJobError( job, i18n( "Error while setting annotation: " ) + '\n' );