Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 16 insertions, 16 deletions

diff --git a/kmail/index.cpp b/kmail/index.cpp
index af4f4cb5b..c21e15d5b 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -91,13 +91,13 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 	mSlowDown( false ) {
 	kdDebug( 5006 ) << "KMMsgIndex::KMMsgIndex()" << endl;
 
-	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) );
-	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) );
-	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) );
-	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) );
+	connect( kmkernel->folderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) );
+	connect( kmkernel->folderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) );
+	connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) );
+	connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) );
 
-	connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) );
-	//connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) );
+	connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) );
+	//connect( mSyncTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( syncIndex() ) );
 
 #ifdef HAVE_INDEXLIB
 	TDEConfigGroup cfg( KMKernel::config(), "text-index" );
@@ -116,11 +116,11 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 		mIndex = indexlib::open( mIndexPath, indexlib::open_flags::fail_if_nonexistant ).release();
 	}
 	if ( !mIndex ) {
-		TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) );
+		TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) );
 		mState = s_willcreate;
 	} else {
 		if ( cfg.readBoolEntry( "creating" ) ) {
-			TQTimer::singleShot( 8000, this, TQT_SLOT( continueCreation() ) );
+			TQTimer::singleShot( 8000, this, TQ_SLOT( continueCreation() ) );
 			mState = s_creating;
 		} else {
 			mPendingMsgs = TQValueListToVector( cfg.readIntListEntry( "pending" ) );
@@ -182,7 +182,7 @@ void KMMsgIndex::setEnabled( bool e ) {
 				// nothing can be done, probably
 				return;
 			case s_disabled:
-				TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) );
+				TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) );
 				mState = s_willcreate;
 		}
 	} else {
@@ -265,7 +265,7 @@ void KMMsgIndex::clear() {
 void KMMsgIndex::maintenance() {
 #ifdef HAVE_INDEXLIB
 	if ( mState != s_idle || kapp->hasPendingEvents() ) {
-		TQTimer::singleShot( 8000, this, TQT_SLOT( maintenance() ) );
+		TQTimer::singleShot( 8000, this, TQ_SLOT( maintenance() ) );
 		return;
 	}
 	mIndex->maintenance();
@@ -404,10 +404,10 @@ bool KMMsgIndex::startQuery( KMSearch* s ) {
 
 	kdDebug( 5006 ) << "KMMsgIndex::startQuery( . ) starting query" << endl;
 	Search* search = new Search( s );
-	connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SIGNAL( finished( bool ) ) );
-	connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SLOT( indexFinished() ) );
-	connect( search, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( removeSearch( TQObject* ) ) );
-	connect( search, TQT_SIGNAL( found( TQ_UINT32 ) ), s, TQT_SIGNAL( found( TQ_UINT32 ) ) );
+	connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SIGNAL( finished( bool ) ) );
+	connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SLOT( indexFinished() ) );
+	connect( search, TQ_SIGNAL( destroyed( TQObject* ) ), TQ_SLOT( removeSearch( TQObject* ) ) );
+	connect( search, TQ_SIGNAL( found( TQ_UINT32 ) ), s, TQ_SIGNAL( found( TQ_UINT32 ) ) );
 	mSearches.push_back( search );
 	return true;
 }
@@ -517,7 +517,7 @@ void KMMsgIndex::removeMessage( TQ_UINT32 serNum ) {
 	mIndex->remove_doc( TQString::number( serNum ).latin1() );
 	++mMaintenanceCount;
 	if ( mMaintenanceCount > MaintenanceLimit && mRemovedMsgs.empty() ) {
-		TQTimer::singleShot( 100, this, TQT_SLOT( maintenance() ) );
+		TQTimer::singleShot( 100, this, TQ_SLOT( maintenance() ) );
 	}
 #endif
 }
@@ -535,7 +535,7 @@ KMMsgIndex::Search::Search( KMSearch* s ):
 	mTimer( new TQTimer( this, "mTimer" ) ),
 	mResidual( new KMSearchPattern ),
 	mState( s_starting ) {
-	connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) );
+	connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) );
 	mTimer->start( 0 );
 }