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

1 files changed, 12 insertions, 12 deletions

diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index b6c3e2c1d..65f656001 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -414,7 +414,7 @@ void KMail::FolderDiaACLTab::load()
   // warning mImapAccount can be 0 if creating a subsubsubfolder with dimap...  (bug?)
   if ( mImapAccount && mImapAccount->login().find('@') == -1 )
     defaultFormat = "username"; // no @ found, so we assume it's just the username
-  KConfigGroup configGroup( kmkernel->config(), "IMAP" );
+  TDEConfigGroup configGroup( kmkernel->config(), "IMAP" );
   TQString str = configGroup.readEntry( "UserIdFormat", defaultFormat );
   mUserIdFormat = FullEmail;
   if ( str == "username" )
@@ -474,7 +474,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
       mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
     else
       // Connection error (error message box already shown by the account)
-      mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
+      mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) );
     return;
   }
 
@@ -507,18 +507,18 @@ void KMail::FolderDiaACLTab::startListing()
 {
   // List ACLs of folder - or its parent, if creating a new folder
   mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
-  connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-           this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+  connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+           this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
 }
 
-void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
+void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
 {
   if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) {
-    disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-                this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+    disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+                this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
 
     if ( job && job->error() ) {
-      if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+      if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
         mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) );
       else
         mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) );
@@ -752,18 +752,18 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
     return;
   mImapPath = folderImap->imapPath();
 
-  KIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
+  TDEIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
   ImapAccountBase::jobData jd;
   jd.total = 1; jd.done = 0; jd.parent = 0;
   mImapAccount->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 )) );
 }
 
-void KMail::FolderDiaACLTab::slotMultiSetACLResult(KIO::Job* job)
+void KMail::FolderDiaACLTab::slotMultiSetACLResult(TDEIO::Job* job)
 {
   ImapAccountBase::JobIterator it = mImapAccount->findJob( job );
   if ( it == mImapAccount->jobsEnd() ) return;