Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 37 insertions, 37 deletions

diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 738d62857..ec892d002 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -82,19 +82,19 @@ ActionScheduler::ActionScheduler(KMFilterMgr::FilterSet set,
   lastCommand = 0;
   lastJob = 0;
   finishTimer = new TQTimer( this, "finishTimer" );
-  connect( finishTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(finish()));
+  connect( finishTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(finish()));
   fetchMessageTimer = new TQTimer( this, "fetchMessageTimer" );
-  connect( fetchMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchMessage()));
+  connect( fetchMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchMessage()));
   tempCloseFoldersTimer = new TQTimer( this, "tempCloseFoldersTimer" );
-  connect( tempCloseFoldersTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(tempCloseFolders()));
+  connect( tempCloseFoldersTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(tempCloseFolders()));
   processMessageTimer = new TQTimer( this, "processMessageTimer" );
-  connect( processMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processMessage()));
+  connect( processMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processMessage()));
   filterMessageTimer = new TQTimer( this, "filterMessageTimer" );
-  connect( filterMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(filterMessage()));
+  connect( filterMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(filterMessage()));
   timeOutTimer = new TQTimer( this, "timeOutTimer" );
-  connect( timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeOut()));
+  connect( timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeOut()));
   fetchTimeOutTimer = new TQTimer( this, "fetchTimeOutTimer" );
-  connect( fetchTimeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchTimeOut()));
+  connect( fetchTimeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchTimeOut()));
 
   TQValueList<KMFilter*>::Iterator it = filters.begin();
   for (; it != filters.end(); ++it)
@@ -122,10 +122,10 @@ ActionScheduler::~ActionScheduler()
 {
   schedulerList->remove( this );
   tempCloseFolders();
-  disconnect( mSrcFolder, TQT_SIGNAL(closed()),
-              this, TQT_SLOT(folderClosedOrExpunged()) );
-  disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
-              this, TQT_SLOT(folderClosedOrExpunged()) );
+  disconnect( mSrcFolder, TQ_SIGNAL(closed()),
+              this, TQ_SLOT(folderClosedOrExpunged()) );
+  disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)),
+              this, TQ_SLOT(folderClosedOrExpunged()) );
   mSrcFolder->close("actionschedsrc");
 
   if (mDeleteSrcFolder)
@@ -157,12 +157,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
 {
   srcFolder->open("actionschedsrc");
   if (mSrcFolder) {
-    disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
-		this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
-    disconnect( mSrcFolder, TQT_SIGNAL(closed()),
-                this, TQT_SLOT(folderClosedOrExpunged()) );
-    disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
-                this, TQT_SLOT(folderClosedOrExpunged()) );
+    disconnect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+		this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
+    disconnect( mSrcFolder, TQ_SIGNAL(closed()),
+                this, TQ_SLOT(folderClosedOrExpunged()) );
+    disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)),
+                this, TQ_SLOT(folderClosedOrExpunged()) );
     mSrcFolder->close("actionschedsrc");
   }
   mSrcFolder = srcFolder;
@@ -170,12 +170,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
   for (i = 0; i < mSrcFolder->count(); ++i)
     enqueue( mSrcFolder->getMsgBase( i )->getMsgSerNum() );
   if (mSrcFolder) {
-    connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
-	     this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
-    connect( mSrcFolder, TQT_SIGNAL(closed()),
-             this, TQT_SLOT(folderClosedOrExpunged()) );
-    connect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
-             this, TQT_SLOT(folderClosedOrExpunged()) );
+    connect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+	     this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
+    connect( mSrcFolder, TQ_SIGNAL(closed()),
+             this, TQ_SLOT(folderClosedOrExpunged()) );
+    connect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)),
+             this, TQ_SLOT(folderClosedOrExpunged()) );
   }
 }
 
@@ -422,8 +422,8 @@ void ActionScheduler::fetchMessage()
     fetchTimeOutTime = TQTime::currentTime();
     fetchTimeOutTimer->start( 60 * 1000, true );
     FolderJob *job = msg->parent()->createJob( msg );
-    connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
-	     TQT_SLOT(messageFetched( KMMessage* )) );
+    connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )),
+	     TQ_SLOT(messageFetched( KMMessage* )) );
     lastJob = job;
     job->start();
   } else {
@@ -563,8 +563,8 @@ void ActionScheduler::processMessage()
   }
   if (msg) {
     FolderJob *job = msg->parent()->createJob( msg );
-    connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
-	     TQT_SLOT(messageRetrieved( KMMessage* )) );
+    connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )),
+	     TQ_SLOT(messageRetrieved( KMMessage* )) );
     job->start();
   } else {
     mExecuting = false;
@@ -689,8 +689,8 @@ void ActionScheduler::moveMessage()
 
   timeOutTime = TQTime::currentTime();
   KMCommand *cmd = new KMMoveCommand( folder, msg );
-  connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ),
-	   this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) );
+  connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ),
+	   this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) );
   cmd->start();
   // sometimes the move command doesn't complete so time out after a minute
   // and move onto the next message
@@ -727,16 +727,16 @@ void ActionScheduler::moveMessageFinished( KMCommand *command )
   if (mResult == ResultOk) {
     mExecutingLock = false;
     if (cmd)
-	connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ),
-		 this, TQT_SLOT( processMessage() ) );
+	connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ),
+		 this, TQ_SLOT( processMessage() ) );
     else
 	processMessageTimer->start( 0, true );
   } else {
     // Note: An alternative to consider is just calling
     //       finishTimer->start and returning
     if (cmd)
-	connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ),
-		 this, TQT_SLOT( finish() ) );
+	connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ),
+		 this, TQ_SLOT( finish() ) );
     else
 	finishTimer->start( 0, true );
   }
@@ -758,8 +758,8 @@ void ActionScheduler::timeOut()
   // Note: This is a good place for a debug statement
   assert( lastCommand );
   // sometimes imap jobs seem to just stall so give up and move on
-  disconnect( lastCommand, TQT_SIGNAL( completed( KMCommand * ) ),
-	      this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) );
+  disconnect( lastCommand, TQ_SIGNAL( completed( KMCommand * ) ),
+	      this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) );
   lastCommand = 0;
   mExecutingLock = false;
   mExecuting = false;
@@ -773,8 +773,8 @@ void ActionScheduler::fetchTimeOut()
   // Note: This is a good place for a debug statement
   assert( lastJob );
   // sometimes imap jobs seem to just stall so give up and move on
-  disconnect( lastJob, TQT_SIGNAL(messageRetrieved( KMMessage* )),
-	      this, TQT_SLOT(messageFetched( KMMessage* )) );
+  disconnect( lastJob, TQ_SIGNAL(messageRetrieved( KMMessage* )),
+	      this, TQ_SLOT(messageFetched( KMMessage* )) );
   lastJob->kill();
   lastJob = 0;
   fetchMessageTimer->start( 0, true );