Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 26 insertions, 26 deletions

diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index 1f7682b54..ecf2b5e78 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -155,19 +155,19 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
           true,
           account->useSSL() || account->useTLS() );
       jd.progressItem->setTotalItems( jd.total );
-      connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
-          account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
+      connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
+          account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
       TDEIO::SimpleJob *job = TDEIO::put( url, 0, false, false, false );
       TDEIO::Scheduler::assignJobToSlave( account->slave(), job );
       account->insertJob( job, jd );
-      connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
-          TQT_SLOT(slotPutMessageResult(TDEIO::Job *)) );
-      connect( job, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
-          TQT_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) );
-      connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
-          TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
-      connect( job, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
-          TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
+      connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+          TQ_SLOT(slotPutMessageResult(TDEIO::Job *)) );
+      connect( job, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
+          TQ_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) );
+      connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+          TQ_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
+      connect( job, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+          TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
     }
   }
   else if ( jt == tCopyMessage || jt == tMoveMessage )
@@ -196,18 +196,18 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
                           true,
                           account->useSSL() || account->useTLS() );
     jd.progressItem->setTotalItems( jd.total );
-    connect ( jd.progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
-              account, TQT_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) );
+    connect ( jd.progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
+              account, TQ_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) );
     TDEIO::SimpleJob *simpleJob = TDEIO::special( url, packedArgs, false );
     TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
     mJob = simpleJob;
     account->insertJob( mJob, jd );
-    connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
-             TQT_SLOT(slotCopyMessageResult(TDEIO::Job *)) );
+    connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)),
+             TQ_SLOT(slotCopyMessageResult(TDEIO::Job *)) );
     if ( jt == tMoveMessage )
     {
-      connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
-               TQT_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) );
+      connect( mJob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+               TQ_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) );
     }
   }
   else {
@@ -317,8 +317,8 @@ void ImapJob::slotGetNextMessage()
                           TQStyleSheet::escape( msg->subject() ),
                           true,
                           account->useSSL() || account->useTLS() );
-  connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
-            account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
+  connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
+            account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
   jd.progressItem->setTotalItems( jd.total );
 
   TDEIO::SimpleJob *simpleJob = TDEIO::get( url, false, false );
@@ -327,18 +327,18 @@ void ImapJob::slotGetNextMessage()
   account->insertJob( mJob, jd );
   if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 )
   {
-    connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
-             this, TQT_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) );
+    connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)),
+             this, TQ_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) );
   } else {
-    connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
-             this, TQT_SLOT(slotGetMessageResult(TDEIO::Job *)) );
+    connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)),
+             this, TQ_SLOT(slotGetMessageResult(TDEIO::Job *)) );
   }
-  connect( mJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-           msgParent, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) );
+  connect( mJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+           msgParent, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) );
   if ( jd.total > 1 )
   {
-    connect(mJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
-        this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
+    connect(mJob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+        this, TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
   }
 }