Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 18 insertions, 18 deletions

diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index b0b1d9def..7b0b55584 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -92,10 +92,10 @@ void SearchJob::searchCompleteFolder()
   if ( mFolder->imapPath() != TQString( "/" ) )
   {
     TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
-    connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
-      TQT_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-      TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+      TQ_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+      TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) );
   }
   else
   { // for the "/ folder" of an imap account, searching blocks the tdeioslave
@@ -199,8 +199,8 @@ void SearchJob::slotSearchData( TDEIO::Job* job, const TQString& data )
     } else
     {
       // get the folder to make sure we have all messages
-      connect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
-          this, TQT_SLOT( slotSearchFolder()) );
+      connect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+          this, TQ_SLOT( slotSearchFolder()) );
       mFolder->getFolder();
     }
   }
@@ -221,8 +221,8 @@ bool SearchJob::canMapAllUIDs()
 //-----------------------------------------------------------------------------
 void SearchJob::slotSearchFolder()
 {  
-  disconnect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
-            this, TQT_SLOT( slotSearchFolder()) );
+  disconnect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ),
+            this, TQ_SLOT( slotSearchFolder()) );
 
   if ( mLocalSearchPattern->isEmpty() ) {
     // pure imap search - now get the serial number for the UIDs
@@ -271,8 +271,8 @@ void SearchJob::slotSearchFolder()
         true,
         mAccount->useSSL() || mAccount->useTLS() );
     mProgress->setTotalItems( numMsgs );
-    connect ( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
-        this, TQT_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) );
+    connect ( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
+        this, TQ_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) );
 
     for ( unsigned int i = 0; i < numMsgs ; ++i ) {
       KMMessage * msg = mFolder->getMsg( i );
@@ -280,8 +280,8 @@ void SearchJob::slotSearchFolder()
         ImapJob *job = new ImapJob( msg );
         job->setParentFolder( mFolder );
         job->setParentProgressItem( mProgress );
-        connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)),
-            this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) );
+        connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+            this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) );
         job->start();
       } else {
         slotSearchMessageArrived( msg );
@@ -387,10 +387,10 @@ void SearchJob::searchSingleMessage()
     stream << (int) 'E' << url;
     TDEIO::SimpleJob *job = TDEIO::special( url, packedArgs, false );
     TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), job);
-    connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
-        TQT_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) );
-    connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
-        TQT_SLOT(slotSearchResult(TDEIO::Job *)) );
+    connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+        TQ_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) );
+    connect( job, TQ_SIGNAL(result(TDEIO::Job *)),
+        TQ_SLOT(slotSearchResult(TDEIO::Job *)) );
   }
 }
 
@@ -420,8 +420,8 @@ void SearchJob::slotSearchDataSingleMessage( TDEIO::Job* job, const TQString& da
   if ( needsDownload() ) {
     ImapJob *job = new ImapJob( msg );
     job->setParentFolder( mFolder );
-    connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)),
-        this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) );
+    connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)),
+        this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) );
     job->start();
   } else {
     slotSearchMessageArrived( msg );