Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 3b3f9ec8f31978030c17309fae48335bea5c1587)

1 files changed, 82 insertions, 82 deletions

diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index dcfcbe7f1..3b7bcc0af 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -153,10 +153,10 @@ DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent,
 
   enableButtonSeparator( true );
 
-  connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), mIndexScope, TQT_SLOT(setEnabled(bool)) );
-  connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), scopeLabel, TQT_SLOT(setEnabled(bool)) );
-  connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) );
-  connect( this, TQT_SIGNAL( okClicked () ), this, TQT_SLOT( slotDone() ) );
+  connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), mIndexScope, TQ_SLOT(setEnabled(bool)) );
+  connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), scopeLabel, TQ_SLOT(setEnabled(bool)) );
+  connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) );
+  connect( this, TQ_SIGNAL( okClicked () ), this, TQ_SLOT( slotDone() ) );
   enableButtonOK( false );
 }
 
@@ -908,8 +908,8 @@ void KMFolderCachedImap::serverSyncInternal()
       // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl;
       newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) );
       // We'll wait for the connectionResult signal from the account.
-      connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
-               this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+      connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+               this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
       break;
     } else {
       // Connected
@@ -932,8 +932,8 @@ void KMFolderCachedImap::serverSyncInternal()
       // Check the user's own rights. We do this every time in case they changed.
       mOldUserRights = mUserRights;
       newState( mProgress, i18n("Checking permissions"));
-      connect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
-               this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
+      connect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ),
+               this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) );
       mAccount->getUserRights( folder(), imapPath() ); // after connecting, due to the INBOX case
       break;
     }
@@ -955,8 +955,8 @@ void KMFolderCachedImap::serverSyncInternal()
     if ( !newName.isEmpty() && !folder()->isSystemFolder() && !isResourceFolder ) {
       newState( mProgress, i18n("Renaming folder") );
       CachedImapJob *job = new CachedImapJob( newName, CachedImapJob::tRenameFolder, this );
-      connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) );
-      connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRenameFolderFinished() ) );
+      connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) );
+      connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRenameFolderFinished() ) );
       job->start();
       break;
     }
@@ -1043,8 +1043,8 @@ void KMFolderCachedImap::serverSyncInternal()
       newState( mProgress, i18n("Deleting folders from server"));
       CachedImapJob* job = new CachedImapJob( foldersForDeletionOnServer,
                                                   CachedImapJob::tDeleteFolders, this );
-      connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) );
-      connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFolderDeletionOnServerFinished() ) );
+      connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) );
+      connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFolderDeletionOnServerFinished() ) );
       job->start();
       break;
     }
@@ -1082,8 +1082,8 @@ void KMFolderCachedImap::serverSyncInternal()
       newState( mProgress, i18n("Expunging deleted messages"));
       CachedImapJob *job = new CachedImapJob( TQString(),
                                               CachedImapJob::tExpungeFolder, this );
-      connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) );
-      connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) );
+      connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) );
+      connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) );
       job->start();
       break;
     }
@@ -1097,10 +1097,10 @@ void KMFolderCachedImap::serverSyncInternal()
         CachedImapJob *job = new CachedImapJob( mMsgsForDownload,
                                                 CachedImapJob::tGetMessage,
                                                 this );
-        connect( job, TQT_SIGNAL( progress(unsigned long, unsigned long) ),
-                 this, TQT_SLOT( slotProgress(unsigned long, unsigned long) ) );
-        connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotUpdateLastUid() ) );
-        connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) );
+        connect( job, TQ_SIGNAL( progress(unsigned long, unsigned long) ),
+                 this, TQ_SLOT( slotProgress(unsigned long, unsigned long) ) );
+        connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotUpdateLastUid() ) );
+        connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) );
         job->start();
         mMsgsForDownload.clear();
         break;
@@ -1153,8 +1153,8 @@ void KMFolderCachedImap::serverSyncInternal()
       ImapAccountBase::jobData jd( url.url(), folder() );
       jd.cancellable = true; // we can always do so later
       mAccount->insertJob(job, jd);
-       connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
-              TQT_SLOT(slotTestAnnotationResult(TDEIO::Job *)));
+       connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+              TQ_SLOT(slotTestAnnotationResult(TDEIO::Job *)));
       break;
     }
 
@@ -1197,10 +1197,10 @@ void KMFolderCachedImap::serverSyncInternal()
         jd.cancellable = true;
         mAccount->insertJob(job, jd);
 
-        connect( job, TQT_SIGNAL(annotationResult(const TQString&, const TQString&, bool)),
-                 TQT_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) );
-        connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
-                 TQT_SLOT(slotGetAnnotationResult(TDEIO::Job *)) );
+        connect( job, TQ_SIGNAL(annotationResult(const TQString&, const TQString&, bool)),
+                 TQ_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) );
+        connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+                 TQ_SLOT(slotGetAnnotationResult(TDEIO::Job *)) );
         break;
       }
     }
@@ -1238,10 +1238,10 @@ void KMFolderCachedImap::serverSyncInternal()
         jd.cancellable = true; // we can always do so later
         mAccount->insertJob(job, jd);
 
-        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(TDEIO::Job *)),
-                TQT_SLOT(slotSetAnnotationResult(TDEIO::Job *)));
+        connect(job, TQ_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ),
+                TQ_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) ));
+        connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+                TQ_SLOT(slotSetAnnotationResult(TDEIO::Job *)));
         break;
       }
     }
@@ -1264,10 +1264,10 @@ void KMFolderCachedImap::serverSyncInternal()
         ImapAccountBase::jobData jd( url.url(), folder() );
         mAccount->insertJob(job, jd);
 
-        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 )) );
+        connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+                TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
+        connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )),
+                TQ_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*, TDEIO::Job*, const KMail::ACLList& )),
-               this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
+      connect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+               this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
       break;
     }
   case SYNC_STATE_FIND_SUBFOLDERS:
@@ -1309,10 +1309,10 @@ void KMFolderCachedImap::serverSyncInternal()
       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(TDEIO::Job *)),
-          TQT_SLOT(slotQuotaResult(TDEIO::Job *)) );
+      connect( job, TQ_SIGNAL( storageQuotaResult( const QuotaInfo& ) ),
+          TQ_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) );
+      connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+          TQ_SLOT(slotQuotaResult(TDEIO::Job *)) );
       break;
     }
   case SYNC_STATE_CLOSE:
@@ -1365,10 +1365,10 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync )
     mCurrentSubfolder = mSubfoldersForSync.front();
     mSubfoldersForSync.pop_front();
     if ( mCurrentSubfolder ) {
-      connect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ),
-               this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) );
-      connect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ),
-               this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) );
+      connect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ),
+               this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) );
+      connect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ),
+               this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) );
 
       //kdDebug(5006) << "Sync'ing subfolder " << mCurrentSubfolder->imapPath() << endl;
       assert( !mCurrentSubfolder->imapPath().isEmpty() );
@@ -1416,10 +1416,10 @@ void KMFolderCachedImap::buildSubFolderList()
 
 void KMFolderCachedImap::disconnectSubFolderSignals()
 {
-  disconnect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ),
-              this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) );
-  disconnect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ),
-              this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) );
+  disconnect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ),
+              this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) );
+  disconnect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ),
+              this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) );
   mCurrentSubfolder = 0;
 }
 
@@ -1428,8 +1428,8 @@ void KMFolderCachedImap::disconnectSubFolderSignals()
 */
 void KMFolderCachedImap::slotConnectionResult( int errorCode, const TQString& errorMsg )
 {
-  disconnect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
-              this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+  disconnect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+              this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
   if ( !errorCode ) {
     // Success
     mSyncState = SYNC_STATE_GET_USERRIGHTS;
@@ -1463,15 +1463,15 @@ void KMFolderCachedImap::uploadNewMessages()
     if ( mUserRightsState != KMail::ACLJobs::Ok || ( mUserRights & ( KMail::ACLJobs::Insert ) ) ) {
       newState( mProgress, i18n("Uploading messages to server"));
       CachedImapJob *job = new CachedImapJob( newMsgs, CachedImapJob::tPutMessage, this );
-      connect( job, TQT_SIGNAL( progress( unsigned long, unsigned long) ),
-               this, TQT_SLOT( slotPutProgress(unsigned long, unsigned long) ) );
-      connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) );
+      connect( job, TQ_SIGNAL( progress( unsigned long, unsigned long) ),
+               this, TQ_SLOT( slotPutProgress(unsigned long, unsigned long) ) );
+      connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) );
       job->start();
       return;
     } else {
       KMCommand *command = rescueUnsyncedMessages();
-      connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
-               this, TQT_SLOT( serverSyncInternal() ) );
+      connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+               this, TQ_SLOT( serverSyncInternal() ) );
     }
   } else { // nothing to upload
     if ( mUserRights != mOldUserRights && (mOldUserRights & KMail::ACLJobs::Insert)
@@ -1537,8 +1537,8 @@ void KMFolderCachedImap::uploadFlags()
     // FIXME END DUPLICATED FROM KMFOLDERIMAP
 
     if ( mStatusFlagsJobs ) {
-      connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
-               this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
+      connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
+               this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
       return;
     }
   }
@@ -1588,8 +1588,8 @@ void KMFolderCachedImap::uploadSeenFlags()
     }
 
     if ( mStatusFlagsJobs ) {
-      connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
-               this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
+      connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
+               this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
       return;
     }
   }
@@ -1607,8 +1607,8 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString&
   if ( folder->storage() == this ) {
     --mStatusFlagsJobs;
     if ( mStatusFlagsJobs == 0 || !cont ) // done or aborting
-      disconnect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
-                  this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
+      disconnect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ),
+                  this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) );
     if ( mStatusFlagsJobs == 0 && cont ) {
       mProgress += 5;
       serverSyncInternal();
@@ -1646,8 +1646,8 @@ void KMFolderCachedImap::createNewFolders()
   if( !newFolders.isEmpty() ) {
     newState( mProgress, i18n("Creating subfolders on server"));
     CachedImapJob *job = new CachedImapJob( newFolders, CachedImapJob::tAddSubfolders, this );
-    connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) );
-    connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) );
+    connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) );
+    connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) );
     job->start();
   } else {
     serverSyncInternal();
@@ -1721,8 +1721,8 @@ bool KMFolderCachedImap::deleteMessages()
     uidsForDeletionOnServer.clear();
     kdDebug(5006) << "Deleting " << sets.count() << " sets of messages from server folder " << imapPath() << endl;
     CachedImapJob *job = new CachedImapJob( sets, CachedImapJob::tDeleteMessage, this );
-    connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ),
-             this, TQT_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) );
+    connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ),
+             this, TQ_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) );
     job->start();
     return true;
   } else {
@@ -1757,9 +1757,9 @@ void KMFolderCachedImap::checkUidValidity() {
   else {
     newState( mProgress, i18n("Checking folder validity"));
     CachedImapJob *job = new CachedImapJob( FolderJob::tCheckUidValidity, this );
-    connect( job, TQT_SIGNAL(permanentFlags(int)), TQT_SLOT(slotPermanentFlags(int)) );
-    connect( job, TQT_SIGNAL( result( KMail::FolderJob* ) ),
-             this, TQT_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) );
+    connect( job, TQ_SIGNAL(permanentFlags(int)), TQ_SLOT(slotPermanentFlags(int)) );
+    connect( job, TQ_SIGNAL( result( KMail::FolderJob* ) ),
+             this, TQ_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) );
     job->start();
   }
 }
@@ -1808,8 +1808,8 @@ void KMFolderCachedImap::listMessages() {
   mFoundAnIMAPDigest = false;
 
   CachedImapJob* job = new CachedImapJob( FolderJob::tListMessages, this );
-  connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ),
-           this, TQT_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) );
+  connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ),
+           this, TQ_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) );
   job->start();
 }
 
@@ -2038,9 +2038,9 @@ void KMFolderCachedImap::listNamespaces()
       }
       KMail::ListJob* job = new KMail::ListJob( mAccount, type, this, mAccount->addPathToNamespace( *it ) );
       job->setHonorLocalSubscription( true );
-      connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+      connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
               const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
-          this, TQT_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&,
+          this, TQ_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&,
               const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
       job->start();
     }
@@ -2060,9 +2060,9 @@ void KMFolderCachedImap::listNamespaces()
       mAccount->addPathToNamespace( ns ) );
   job->setNamespace( ns );
   job->setHonorLocalSubscription( true );
-  connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+  connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
           const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
-      this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&,
+      this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&,
           const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
   job->start();
 }
@@ -2148,9 +2148,9 @@ bool KMFolderCachedImap::listDirectory()
     type = ImapAccountBase::ListSubscribed;
   KMail::ListJob* job = new KMail::ListJob( mAccount, type, this );
   job->setHonorLocalSubscription( true );
-  connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
+  connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&,
           const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)),
-      this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&,
+      this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&,
           const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)));
   job->start();
 
@@ -2347,8 +2347,8 @@ void KMFolderCachedImap::listDirectory2()
     ImapAccountBase::jobData jd( TQString(), folder() );
     jd.cancellable = true;
     mAccount->insertJob(job, jd);
-    connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
-        TQT_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) );
+    connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+        TQ_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) );
 
   } else {
     createFoldersNewOnServerAndFinishListing( foldersNewOnServer );
@@ -2493,8 +2493,8 @@ void
 KMFolderCachedImap::slotReceivedUserRights( KMFolder* folder )
 {
   if ( folder->storage() == this ) {
-    disconnect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
-                this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
+    disconnect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ),
+                this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) );
     if ( mUserRightsState == KMail::ACLJobs::Ok ) {
       setReadOnly( ( mUserRights & KMail::ACLJobs::Insert ) == 0 );
     }
@@ -2516,8 +2516,8 @@ void
 KMFolderCachedImap::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
 {
   if ( folder->storage() == this ) {
-    disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
-                this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
+    disconnect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+                this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
     mACLListState = job->error() ? KMail::ACLJobs::FetchFailed : KMail::ACLJobs::Ok;
     mACLList = aclList;
     serverSyncInternal();
@@ -3166,8 +3166,8 @@ void KMFolderCachedImap::rescueUnsyncedMessagesAndDeleteFolder( KMFolder *folder
   if ( storage ) {
     KMCommand *command = storage->rescueUnsyncedMessages();
     if ( command ) {
-      connect( command, TQT_SIGNAL(completed(KMCommand*)),
-               TQT_SLOT(slotRescueDone(KMCommand*)) );
+      connect( command, TQ_SIGNAL(completed(KMCommand*)),
+               TQ_SLOT(slotRescueDone(KMCommand*)) );
       ++mRescueCommandCount;
     } else {
       // nothing to rescue, close folder