Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

6 files changed, 54 insertions, 54 deletions

diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index a033b6b0..9c801328 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -239,8 +239,8 @@ void ExchangeAccount::calcFolderURLs()
 
   TDEIO::DavJob* job = TDEIO::davPropFind( baseURL(), doc, "1", false );
   job->addMetaData( "errorPage", "false" );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotFolderResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotFolderResult( TDEIO::Job * ) ) );
 }
 
 void ExchangeAccount::slotFolderResult( TDEIO::Job *job )
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index 5658c707..c3fdd380 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -131,8 +131,8 @@ void ExchangeClient::download( KCal::Calendar *calendar, const TQDate &start,
   ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow );
   worker->download( calendar, start, end, showProgress );
   connect( worker,
-           TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ),
-           TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int,
+           TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ),
+           TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int,
                                        const TQString & ) ) );
 }
 
@@ -149,11 +149,11 @@ void ExchangeClient::download( const TQDate &start, const TQDate &end,
   ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow );
   worker->download( start, end, showProgress );
   connect( worker,
-           TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), 
-           TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int,
+           TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), 
+           TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int,
                                        const TQString & ) ) );
-  connect( worker, TQT_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ), 
-           TQT_SIGNAL( event( KCal::Event *, const KURL & ) ) );
+  connect( worker, TQ_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ), 
+           TQ_SIGNAL( event( KCal::Event *, const KURL & ) ) );
 }
 
 void ExchangeClient::upload( KCal::Event *event )
@@ -167,8 +167,8 @@ void ExchangeClient::upload( KCal::Event *event )
 
   ExchangeUpload *worker = new ExchangeUpload( event, mAccount, mTimeZoneId,
                                                mWindow );
-  connect( worker, TQT_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ),
-           TQT_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) );
+  connect( worker, TQ_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ),
+           TQ_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) );
 }
 
 void ExchangeClient::remove( KCal::Event *event )
@@ -179,8 +179,8 @@ void ExchangeClient::remove( KCal::Event *event )
   }
 
   ExchangeDelete *worker = new ExchangeDelete( event, mAccount, mWindow );
-  connect( worker, TQT_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ),
-           TQT_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) );
+  connect( worker, TQ_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ),
+           TQ_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) );
 }
 
 void ExchangeClient::slotDownloadFinished( ExchangeDownload *worker,
@@ -217,8 +217,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar,
   kdDebug() << "ExchangeClient::downloadSynchronous()" << endl;
 
   mClientState = WaitingForResult;
-  connect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), 
-           TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+  connect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), 
+           TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
 
   download( calendar, start, end, showProgress );
 
@@ -230,8 +230,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar,
   } while ( mClientState == WaitingForResult );
   TQApplication::restoreOverrideCursor();  
 
-  disconnect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), 
-              this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+  disconnect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), 
+              this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
 
   return mSyncResult;
 }
@@ -239,8 +239,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar,
 int ExchangeClient::uploadSynchronous( KCal::Event* event )
 {
   mClientState = WaitingForResult;
-  connect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), 
-           TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+  connect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ), 
+           TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
 
   upload( event );
 
@@ -250,16 +250,16 @@ int ExchangeClient::uploadSynchronous( KCal::Event* event )
     tqApp->processEvents();
   } while ( mClientState == WaitingForResult );
   TQApplication::restoreOverrideCursor();  
-  disconnect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), 
-              this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+  disconnect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ), 
+              this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
   return mSyncResult;
 }
 
 int ExchangeClient::removeSynchronous( KCal::Event* event )
 {
   mClientState = WaitingForResult;
-  connect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), 
-           TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+  connect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ), 
+           TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
 
   remove( event );
 
@@ -269,8 +269,8 @@ int ExchangeClient::removeSynchronous( KCal::Event* event )
     tqApp->processEvents();
   } while ( mClientState == WaitingForResult );
   TQApplication::restoreOverrideCursor();  
-  disconnect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), 
-              this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) );
+  disconnect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ), 
+              this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) );
   return mSyncResult;
 }
 
diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp
index 094b3b5c..d9e8c177 100644
--- a/libkpimexchange/core/exchangedelete.cpp
+++ b/libkpimexchange/core/exchangedelete.cpp
@@ -74,7 +74,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
 
   TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
   job->setWindow( mWindow );
-  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *)));
 }
 
 void ExchangeDelete::slotFindUidResult( TDEIO::Job * job )
@@ -104,7 +104,7 @@ void ExchangeDelete::startDelete( const KURL& url )
 {
   TDEIO::SimpleJob* job = TDEIO::file_delete( url, false ); // no GUI
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDeleteResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDeleteResult( TDEIO::Job * ) ) );
 }
 
 void ExchangeDelete::slotDeleteResult( TDEIO::Job* job )
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index f3210d7c..55cecd1f 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -92,10 +92,10 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start,
     mProgress = new ExchangeProgress();
     mProgress->show();
 
-    connect( this, TQT_SIGNAL( startDownload() ), mProgress,
-             TQT_SLOT( slotTransferStarted() ) );
-    connect( this, TQT_SIGNAL(finishDownload() ), mProgress,
-             TQT_SLOT( slotTransferFinished() ) );
+    connect( this, TQ_SIGNAL( startDownload() ), mProgress,
+             TQ_SLOT( slotTransferStarted() ) );
+    connect( this, TQ_SIGNAL(finishDownload() ), mProgress,
+             TQ_SLOT( slotTransferFinished() ) );
 #endif
   }
 
@@ -112,8 +112,8 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start,
                                      sql, false );
   TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotSearchResult( TDEIO::Job *) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotSearchResult( TDEIO::Job *) ) );
 }
 
 void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool showProgress )
@@ -126,8 +126,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh
     mProgress = new ExchangeProgress();
     mProgress->show();
 
-    connect( this, TQT_SIGNAL(startDownload()), mProgress, TQT_SLOT(slotTransferStarted()) );
-    connect( this, TQT_SIGNAL(finishDownload()), mProgress, TQT_SLOT(slotTransferFinished()) );
+    connect( this, TQ_SIGNAL(startDownload()), mProgress, TQ_SLOT(slotTransferStarted()) );
+    connect( this, TQ_SIGNAL(finishDownload()), mProgress, TQ_SLOT(slotTransferFinished()) );
   }
 
   TQString sql = dateSelectQuery( start, end.addDays( 1 ) );
@@ -137,8 +137,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh
   TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false );
   TDEIO::Scheduler::scheduleJob(job);
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) );
 }
 
 // Original query TODO: make query configurable
@@ -301,8 +301,8 @@ void ExchangeDownload::handleRecurrence( TQString uid )
                                      query, false );
   TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) );
 }
 
 void ExchangeDownload::readAppointment( const KURL& url )
@@ -349,8 +349,8 @@ void ExchangeDownload::readAppointment( const KURL& url )
   TDEIO::Scheduler::scheduleJob( job );
   job->setWindow( mWindow );
   job->addMetaData( "errorPage", "false" );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
 }
 
 void ExchangeDownload::slotPropFindResult( TDEIO::Job *job )
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index df52fdab..aadfb7c8 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -94,7 +94,7 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const
       kdDebug() << "bind() returned false" << endl;
     mSocket->setBlocking( false );
     mNotifier = new TQSocketNotifier( mSocket->socket(), TQSocketNotifier::Read );
-    connect( mNotifier, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated(int)));
+    connect( mNotifier, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated(int)));
 
     //mSocket.setSocketFlags( KExtendedSocket::inetSocket | KExtendedSocket::passiveSocket | KExtendedSocket::datagramSocket | KExtendedSocket::bufferedSocket );
     //mSocket.setHost( "jupiter.tbm.tudelft.nl" );    // Does this work?
@@ -110,12 +110,12 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const
 
   if ( mPollMode == Poll ) {
     mPollTimer = new TQTimer( this, "mPollTimer" );
-    connect( mPollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollTimer()) );
+    connect( mPollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollTimer()) );
     mPollTimer->start( 60000 ); // 1 minute timer
   }
 
   mRenewTimer = new TQTimer( this, "mRenewTimer" );
-  connect( mRenewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRenewTimer()) );
+  connect( mRenewTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRenewTimer()) );
   mRenewTimer->start( mSubscriptionLifetime * 900 ); // 10% early so as to be in time
 }
 
@@ -133,7 +133,7 @@ ExchangeMonitor::~ExchangeMonitor()
     job->addMetaData( "customHTTPHeader", headers );
     // Can't do, this is a destructor!
     // job->addMetaData( "PropagateHttpHeader", "true" );
-    // connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
+    // connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
   }
   kdDebug() << "Finished ExchangeMonitor destructor" << endl;
 
@@ -161,7 +161,7 @@ void ExchangeMonitor::addWatch( const KURL &url, int mode, int depth )
   TDEIO::DavJob *job = new TDEIO::DavJob( myURL, (int) TDEIO::DAV_SUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", headers );
   job->addMetaData( "PropagateHttpHeader", "true" );
-  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotSubscribeResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotSubscribeResult(TDEIO::Job *)));
 }
 
 void ExchangeMonitor::removeWatch( const KURL &url ) 
@@ -182,7 +182,7 @@ void ExchangeMonitor::removeWatch( ID id )
   TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_UNSUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-id: " + TQString::number( id ));
   job->addMetaData( "PropagateHttpHeader", "true" );
-  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *)));
 }
 
 void ExchangeMonitor::slotSubscribeResult( TDEIO::Job * job )
@@ -323,7 +323,7 @@ void ExchangeMonitor::poll( const IDList& IDs ) {
   // confirm it
   TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_POLL, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-ID: " + makeIDString( IDs ) );
-  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotPollResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotPollResult(TDEIO::Job *)));
 }
 
 void ExchangeMonitor::slotPollResult( TDEIO::Job * job )
@@ -368,7 +368,7 @@ void ExchangeMonitor::slotRenewTimer()
 
   TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_SUBSCRIBE, TQString(), false );
   job->addMetaData( "customHTTPHeader", "Subscription-id: " + makeIDString( mSubscriptionMap.keys() ) );
-  connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotRenewResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotRenewResult(TDEIO::Job *)));
 }
 
 void ExchangeMonitor::slotRenewResult( TDEIO::Job* job )
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index 226202c5..8e49e0aa 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -88,8 +88,8 @@ void ExchangeUpload::findUid( TQString const &uid )
   TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql",
                                      query, false );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotFindUidResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotFindUidResult( TDEIO::Job * ) ) );
 }
 
 void ExchangeUpload::slotFindUidResult( TDEIO::Job * job )
@@ -147,8 +147,8 @@ void ExchangeUpload::tryExist()
   TDEIO::DavJob *job = TDEIO::davPropFind( url, doc, "0", false );
   job->setWindow( mWindow );
   job->addMetaData( "errorPage", "false" );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) );
 }
 
 void ExchangeUpload::slotPropFindResult( TDEIO::Job *job )
@@ -332,8 +332,8 @@ void ExchangeUpload::startUpload( const KURL &url )
 
   TDEIO::DavJob *job = TDEIO::davPropPatch( url, doc, false );
   job->setWindow( mWindow );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotPatchResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotPatchResult( TDEIO::Job * ) ) );
 }
 
 void ExchangeUpload::slotPatchResult( TDEIO::Job *job )