Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

13 files changed, 104 insertions, 104 deletions

diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp
index 2c952c6a..208e6421 100644
--- a/kopete/protocols/gadu/gaduaccount.cpp
+++ b/kopete/protocols/gadu/gaduaccount.cpp
@@ -183,15 +183,15 @@ void
 GaduAccount::initActions()
 {
 	p->searchAction		= new TDEAction( i18n( "&Search for Friends" ), "", 0,
-							this, TQT_SLOT( slotSearch() ), this, "actionSearch" );
+							this, TQ_SLOT( slotSearch() ), this, "actionSearch" );
 	p->listputAction		= new TDEAction( i18n( "Export Contacts to Server" ), "", 0,
-							this, TQT_SLOT( slotExportContactsList() ), this, "actionListput" );
+							this, TQ_SLOT( slotExportContactsList() ), this, "actionListput" );
 	p->listToFileAction	= new TDEAction( i18n( "Export Contacts to File..." ), "", 0,
-							this, TQT_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" );
+							this, TQ_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" );
 	p->listFromFileAction	= new TDEAction( i18n( "Import Contacts From File..." ), "", 0,
-							this, TQT_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" );
+							this, TQ_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" );
 	p->friendsModeAction	= new TDEToggleAction( i18n( "Only for Friends" ), "", 0,
-							this, TQT_SLOT( slotFriendsMode() ), this,
+							this, TQ_SLOT( slotFriendsMode() ), this,
 							"actionFriendsMode" );
 
 	static_cast<TDEToggleAction*>(p->friendsModeAction)->setChecked( p->forFriends );
@@ -200,34 +200,34 @@ GaduAccount::initActions()
 void
 GaduAccount::initConnections()
 {
-	TQObject::connect( p->session_, TQT_SIGNAL( error( const TQString&, const TQString& ) ),
-				TQT_SLOT( error( const TQString&, const TQString& ) ) );
-	TQObject::connect( p->session_, TQT_SIGNAL( messageReceived( KGaduMessage* ) ),
-				TQT_SLOT( messageReceived( KGaduMessage* ) )  );
-	TQObject::connect( p->session_, TQT_SIGNAL( contactStatusChanged( KGaduNotify* ) ),
-				TQT_SLOT( contactStatusChanged( KGaduNotify* ) ) );
-	TQObject::connect( p->session_, TQT_SIGNAL( connectionFailed( gg_failure_t )),
-				TQT_SLOT( connectionFailed( gg_failure_t ) ) );
-	TQObject::connect( p->session_, TQT_SIGNAL( connectionSucceed( ) ),
-				TQT_SLOT( connectionSucceed( ) ) );
-	TQObject::connect( p->session_, TQT_SIGNAL( disconnect( Kopete::Account::DisconnectReason ) ),
-				TQT_SLOT( slotSessionDisconnect( Kopete::Account::DisconnectReason ) ) );
-	TQObject::connect( p->session_, TQT_SIGNAL( ackReceived( unsigned int ) ),
-				TQT_SLOT( ackReceived( unsigned int ) ) );
-	TQObject::connect( p->session_, TQT_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int  ) ),
-				TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) );
-	TQObject::connect( p->session_, TQT_SIGNAL( userListExported() ),
-				TQT_SLOT( userListExportDone() ) );
-	TQObject::connect( p->session_, TQT_SIGNAL( userListRecieved( const TQString& ) ),
-				TQT_SLOT( userlist( const TQString& ) ) );
-	TQObject::connect( p->session_, TQT_SIGNAL( incomingCtcp( unsigned int ) ),
-				TQT_SLOT( slotIncomingDcc( unsigned int ) ) );
-
-	TQObject::connect( p->pingTimer_, TQT_SIGNAL( timeout() ),
-				TQT_SLOT( pingServer() ) );
-
-	TQObject::connect( p->exportTimer_, TQT_SIGNAL( timeout() ),
-				TQT_SLOT( slotUserlistSynch() ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( error( const TQString&, const TQString& ) ),
+				TQ_SLOT( error( const TQString&, const TQString& ) ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( messageReceived( KGaduMessage* ) ),
+				TQ_SLOT( messageReceived( KGaduMessage* ) )  );
+	TQObject::connect( p->session_, TQ_SIGNAL( contactStatusChanged( KGaduNotify* ) ),
+				TQ_SLOT( contactStatusChanged( KGaduNotify* ) ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( connectionFailed( gg_failure_t )),
+				TQ_SLOT( connectionFailed( gg_failure_t ) ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( connectionSucceed( ) ),
+				TQ_SLOT( connectionSucceed( ) ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( disconnect( Kopete::Account::DisconnectReason ) ),
+				TQ_SLOT( slotSessionDisconnect( Kopete::Account::DisconnectReason ) ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( ackReceived( unsigned int ) ),
+				TQ_SLOT( ackReceived( unsigned int ) ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int  ) ),
+				TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( userListExported() ),
+				TQ_SLOT( userListExportDone() ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( userListRecieved( const TQString& ) ),
+				TQ_SLOT( userlist( const TQString& ) ) );
+	TQObject::connect( p->session_, TQ_SIGNAL( incomingCtcp( unsigned int ) ),
+				TQ_SLOT( slotIncomingDcc( unsigned int ) ) );
+
+	TQObject::connect( p->pingTimer_, TQ_SIGNAL( timeout() ),
+				TQ_SLOT( pingServer() ) );
+
+	TQObject::connect( p->exportTimer_, TQ_SIGNAL( timeout() ),
+				TQ_SLOT( slotUserlistSynch() ) );
 }
 
 void
@@ -287,22 +287,22 @@ GaduAccount::actionMenu()
 	}
 	p->actionMenu_->insert( new TDEAction( i18n( "Go O&nline" ),
 				GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ),
-				0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) );
+				0, this, TQ_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) );
 
 	p->actionMenu_->insert( new TDEAction( i18n( "Set &Busy" ),
 				GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ),
-				0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) );
+				0, this, TQ_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) );
 
 	p->actionMenu_->insert( new TDEAction( i18n( "Set &Invisible" ),
 				GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ),
-				0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) );
+				0, this, TQ_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) );
 
 	p->actionMenu_->insert( new TDEAction( i18n( "Go &Offline" ),
 				GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ),
-				0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) );
+				0, this, TQ_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) );
 
 	p->actionMenu_->insert( new TDEAction( i18n( "Set &Description..." ), "application-vnd.tde.info",
-			0, this, TQT_SLOT( slotDescription() ), this, "actionGaduDescription" ) );
+			0, this, TQ_SLOT( slotDescription() ), this, "actionGaduDescription" ) );
 
 	p->actionMenu_->insert( p->friendsModeAction );
 
diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp
index 26bece4e..d42272ca 100644
--- a/kopete/protocols/gadu/gaduaddcontactpage.cpp
+++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp
@@ -48,7 +48,7 @@ GaduAddContactPage::GaduAddContactPage( GaduAccount* owner, TQWidget* parent, co
 	account_	= owner;
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	addUI_	= new GaduAddUI( this );
-	connect( addUI_->addEdit_, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUinChanged( const TQString & ) ) );
+	connect( addUI_->addEdit_, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotUinChanged( const TQString & ) ) );
 	addUI_->addEdit_->setValidChars( "1234567890" );
 	addUI_->addEdit_->setText( "" );
 	addUI_->groups->setDisabled( TRUE );
diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp
index 592c545e..d56fc124 100644
--- a/kopete/protocols/gadu/gaduaway.cpp
+++ b/kopete/protocols/gadu/gaduaway.cpp
@@ -58,7 +58,7 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name )
 	}
 
 	ui_->textEdit_->setText( account->myself()->property( "awayMessage" ).value().toString() );
-	connect( this, TQT_SIGNAL( applyClicked() ), TQT_SLOT( slotApply() ) );
+	connect( this, TQ_SIGNAL( applyClicked() ), TQ_SLOT( slotApply() ) );
 }
 
 int
diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp
index 0b4bc18b..18473c00 100644
--- a/kopete/protocols/gadu/gaducommands.cpp
+++ b/kopete/protocols/gadu/gaducommands.cpp
@@ -58,11 +58,11 @@ GaduCommand::checkSocket( int fd, int checkWhat )
 {
 	read_ = new TQSocketNotifier( fd, TQSocketNotifier::Read, this );
 	read_->setEnabled( false );
-	TQObject::connect( read_, TQT_SIGNAL( activated(int) ), TQT_SLOT( forwarder() ) );
+	TQObject::connect( read_, TQ_SIGNAL( activated(int) ), TQ_SLOT( forwarder() ) );
 
 	write_ = new TQSocketNotifier( fd, TQSocketNotifier::Write, this );
 	write_->setEnabled( false );
-	TQObject::connect( write_, TQT_SIGNAL( activated(int) ), TQT_SLOT( forwarder() ) );
+	TQObject::connect( write_, TQ_SIGNAL( activated(int) ), TQ_SLOT( forwarder() ) );
 
 	enableNotifiers( checkWhat );
 }
@@ -147,7 +147,7 @@ RegisterCommand::requestToken()
 		return;
 	}
 
-	connect( this, TQT_SIGNAL( socketReady() ), TQT_SLOT( watcher() ) );
+	connect( this, TQ_SIGNAL( socketReady() ), TQ_SLOT( watcher() ) );
 	checkSocket( session_->fd, session_->check );
 
 	return;
@@ -183,7 +183,7 @@ RegisterCommand::execute()
 		return;
 	}
 	state = RegisterStateWaitingForNumber;
-	connect( this, TQT_SIGNAL( socketReady() ), TQT_SLOT( watcher() ) );
+	connect( this, TQ_SIGNAL( socketReady() ), TQ_SLOT( watcher() ) );
 	checkSocket( session_->fd, session_->check );
 }
 
@@ -236,7 +236,7 @@ void RegisterCommand::watcher()
 				}
 				gg_token_free( session_ );
 				session_ = NULL;
-				disconnect( this, TQT_SLOT( watcher() ) );
+				disconnect( this, TQ_SLOT( watcher() ) );
 				return;
 				break;
 		}
@@ -282,7 +282,7 @@ void RegisterCommand::watcher()
 				}
 				gg_free_register( session_ );
 				session_ = NULL;
-				disconnect( this, TQT_SLOT( watcher() ) );
+				disconnect( this, TQ_SLOT( watcher() ) );
 				deleteLater();
 				return;
 				break;
diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp
index 5ae08d1f..5e7d8a1a 100644
--- a/kopete/protocols/gadu/gaducontact.cpp
+++ b/kopete/protocols/gadu/gaducontact.cpp
@@ -145,9 +145,9 @@ GaduContact::manager( Kopete::Contact::CanCreateFlags  canCreate  )
 {
 	if ( !msgManager_ && canCreate ) {
 		msgManager_ = Kopete::ChatSessionManager::self()->create( account_->myself(), thisContact_, GaduProtocol::protocol() );
-		connect( msgManager_, TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession*) ),
-			 this, TQT_SLOT( messageSend( Kopete::Message&, Kopete::ChatSession*) ) );
-		connect( msgManager_, TQT_SIGNAL( destroyed() ),  this, TQT_SLOT( slotChatSessionDestroyed() ) );
+		connect( msgManager_, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession*) ),
+			 this, TQ_SLOT( messageSend( Kopete::Message&, Kopete::ChatSession*) ) );
+		connect( msgManager_, TQ_SIGNAL( destroyed() ),  this, TQ_SLOT( slotChatSessionDestroyed() ) );
 
 	}
 	kdDebug(14100) << "GaduContact::manager returning:  " << msgManager_ << endl;
@@ -163,8 +163,8 @@ GaduContact::slotChatSessionDestroyed()
 void
 GaduContact::initActions()
 {
-	actionSendMessage_	= KopeteStdAction::sendMessage( this, TQT_SLOT( execute() ), this, "actionMessage" );
-	actionInfo_		= KopeteStdAction::contactInfo( this, TQT_SLOT( slotUserInfo() ), this, "actionInfo" );
+	actionSendMessage_	= KopeteStdAction::sendMessage( this, TQ_SLOT( execute() ), this, "actionMessage" );
+	actionInfo_		= KopeteStdAction::contactInfo( this, TQ_SLOT( slotUserInfo() ), this, "actionInfo" );
 }
 
 void
@@ -195,13 +195,13 @@ GaduContact::customContextMenuActions()
 	TQPtrList<TDEAction> *fakeCollection = new TQPtrList<TDEAction>();
 	//show profile
 	TDEAction* actionShowProfile = new TDEAction( i18n("Show Profile") , "application-vnd.tde.info", 0,
-						this, TQT_SLOT( slotShowPublicProfile() ),
+						this, TQ_SLOT( slotShowPublicProfile() ),
 						this, "actionShowPublicProfile" );
 
 	fakeCollection->append( actionShowProfile );
 
 	TDEAction* actionEditContact = new TDEAction( i18n("Edit...") , "edit", 0,
-						this, TQT_SLOT( slotEditContact() ),
+						this, TQ_SLOT( slotEditContact() ),
 						this, "actionEditContact" );
 
 	fakeCollection->append( actionEditContact );
diff --git a/kopete/protocols/gadu/gadudcc.cpp b/kopete/protocols/gadu/gadudcc.cpp
index bd861032..f198377a 100644
--- a/kopete/protocols/gadu/gadudcc.cpp
+++ b/kopete/protocols/gadu/gadudcc.cpp
@@ -134,7 +134,7 @@ GaduDCC::registerAccount( GaduAccount* account )
 		dccServer = new GaduDCCServer();
 	}
 
-	connect( dccServer, TQT_SIGNAL( incoming( gg_dcc*, bool& ) ), TQT_SLOT( slotIncoming( gg_dcc*, bool& ) ) );
+	connect( dccServer, TQ_SIGNAL( incoming( gg_dcc*, bool& ) ), TQ_SLOT( slotIncoming( gg_dcc*, bool& ) ) );
 
 	initmutex.unlock();
 
diff --git a/kopete/protocols/gadu/gadudccserver.cpp b/kopete/protocols/gadu/gadudccserver.cpp
index 8994c8b0..0e00245b 100644
--- a/kopete/protocols/gadu/gadudccserver.cpp
+++ b/kopete/protocols/gadu/gadudccserver.cpp
@@ -121,8 +121,8 @@ GaduDCCServer::createNotifiers( bool connect )
 	write_->setEnabled( false );
 
 	if ( connect ) {
-		TQObject::connect( read_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) );
-		TQObject::connect( write_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) );
+		TQObject::connect( read_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) );
+		TQObject::connect( write_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) );
 	}
 }
 
diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp
index d7ce3ae3..6367e5cb 100644
--- a/kopete/protocols/gadu/gadudcctransaction.cpp
+++ b/kopete/protocols/gadu/gadudcctransaction.cpp
@@ -143,10 +143,10 @@ GaduDCCTransaction::setupIncoming( gg_dcc* dccS )
 
 	peer = dccS->uin;
 	
-	connect ( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString & ) ),
-			  this, TQT_SLOT( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) );
-	connect ( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ),
-			  this, TQT_SLOT( slotTransferRefused( const Kopete::FileTransferInfo & ) ) );
+	connect ( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString & ) ),
+			  this, TQ_SLOT( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) );
+	connect ( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused( const Kopete::FileTransferInfo & ) ),
+			  this, TQ_SLOT( slotTransferRefused( const Kopete::FileTransferInfo & ) ) );
 
 	incoming = true;
 	createNotifiers( true );
@@ -195,8 +195,8 @@ GaduDCCTransaction::createNotifiers( bool connect )
 	write_->setEnabled( false );
 
 	if ( connect ) {
-		TQObject::connect( read_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) );
-		TQObject::connect( write_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) );
+		TQObject::connect( read_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) );
+		TQObject::connect( write_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) );
 	}
 }
 
@@ -279,7 +279,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c
 		dccSock_->file_fd = localFile_.handle();
 	}
 
-	connect ( transfer, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotTransferResult() ) );
+	connect ( transfer, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotTransferResult() ) );
 
 	// reenable notifiers
 	enableNotifiers( dccSock_->check );
diff --git a/kopete/protocols/gadu/gadueditaccount.cpp b/kopete/protocols/gadu/gadueditaccount.cpp
index 30411c4b..ff4a5aca 100644
--- a/kopete/protocols/gadu/gadueditaccount.cpp
+++ b/kopete/protocols/gadu/gadueditaccount.cpp
@@ -81,14 +81,14 @@ GaduEditAccount::GaduEditAccount( GaduProtocol* proto, Kopete::Account* ident, T
 		useTls_->setCurrentItem( isSsl ? ( account_->useTls() ) : 2 );
 		ignoreCheck_->setChecked( account_->ignoreAnons() );
 
-		connect( account(), TQT_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ),
-					TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) );
+		connect( account(), TQ_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ),
+					TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) );
 		connectLabel->setText( i18n( "personal information being fetched from server",
 					"<p align=\"center\">Fetching from server</p>" ) );
 		seqNr = account_->getPersonalInformation();
 	}
 
-	connect( registerNew, TQT_SIGNAL( clicked( ) ), TQT_SLOT( registerNewAccount( ) ) );
+	connect( registerNew, TQ_SIGNAL( clicked( ) ), TQ_SLOT( registerNewAccount( ) ) );
 
 	TQWidget::setTabOrder( loginEdit_, passwordWidget_->mRemembered );
 	TQWidget::setTabOrder( passwordWidget_->mRemembered, passwordWidget_->mPassword );
@@ -157,7 +157,7 @@ GaduEditAccount::slotSearchResult( const SearchResult& result, unsigned int seq
 
 	enableUserInfo( true );
 	
-	disconnect( TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) );
+	disconnect( TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) );
 }
 
 void
@@ -179,7 +179,7 @@ GaduEditAccount::registerNewAccount()
 {
 	registerNew->setDisabled( true );
 	regDialog = new GaduRegisterAccount( NULL , "Register account dialog" );
-	connect( regDialog, TQT_SIGNAL( registeredNumber( unsigned int, TQString  ) ), TQT_SLOT( newUin( unsigned int, TQString  ) ) );
+	connect( regDialog, TQ_SIGNAL( registeredNumber( unsigned int, TQString  ) ), TQ_SLOT( newUin( unsigned int, TQString  ) ) );
 	if ( regDialog->exec() != TQDialog::Accepted ) {
 		loginEdit_->setText( "" );
 		return;
diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp
index ea102227..c067397a 100644
--- a/kopete/protocols/gadu/gadueditcontact.cpp
+++ b/kopete/protocols/gadu/gadueditcontact.cpp
@@ -117,8 +117,8 @@ GaduEditContact::init()
 	// fill values from cl into proper fields on widget
 
 	show();
-	connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotApply() ) );
-	connect( ui_->groups, TQT_SIGNAL( clicked( TQListViewItem * ) ), TQT_SLOT( listClicked( TQListViewItem * ) ) );
+	connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotApply() ) );
+	connect( ui_->groups, TQ_SIGNAL( clicked( TQListViewItem * ) ), TQ_SLOT( listClicked( TQListViewItem * ) ) );
 }
 
 void
diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp
index 00ba18ed..6072c63f 100644
--- a/kopete/protocols/gadu/gadupubdir.cpp
+++ b/kopete/protocols/gadu/gadupubdir.cpp
@@ -146,24 +146,24 @@ GaduPublicDir::slotListSelected(  )
 void
 GaduPublicDir::initConnections()
 {
-	connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SLOT( slotSearch() ) );
-	connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotNewSearch() ) );
-	connect( this, TQT_SIGNAL( user3Clicked() ), TQT_SLOT( slotAddContact() ) );
-
-	connect( mAccount, TQT_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ),
-				TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) );
-
-	connect( mMainWidget->nameS,		TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( mMainWidget->surname,		TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( mMainWidget->nick,		TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( mMainWidget->UIN,		TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( mMainWidget->cityS,		TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( mMainWidget->gender,		TQT_SIGNAL( activated( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( mMainWidget->ageFrom,		TQT_SIGNAL( valueChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( mMainWidget->ageTo,		TQT_SIGNAL( valueChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( mMainWidget->radioByData,	TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( inputChanged( bool ) ) );
-
-	connect( mMainWidget->listFound,	TQT_SIGNAL( selectionChanged () ), TQT_SLOT( slotListSelected() ) );
+	connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SLOT( slotSearch() ) );
+	connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotNewSearch() ) );
+	connect( this, TQ_SIGNAL( user3Clicked() ), TQ_SLOT( slotAddContact() ) );
+
+	connect( mAccount, TQ_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ),
+				TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) );
+
+	connect( mMainWidget->nameS,		TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( mMainWidget->surname,		TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( mMainWidget->nick,		TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( mMainWidget->UIN,		TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( mMainWidget->cityS,		TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( mMainWidget->gender,		TQ_SIGNAL( activated( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( mMainWidget->ageFrom,		TQ_SIGNAL( valueChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( mMainWidget->ageTo,		TQ_SIGNAL( valueChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( mMainWidget->radioByData,	TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( inputChanged( bool ) ) );
+
+	connect( mMainWidget->listFound,	TQ_SIGNAL( selectionChanged () ), TQ_SLOT( slotListSelected() ) );
 
 }
 
diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp
index 497f58b0..fb1506c2 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.cpp
+++ b/kopete/protocols/gadu/gaduregisteraccount.cpp
@@ -50,18 +50,18 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name )
 	emailRegexp = new TQRegExp(  "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" );
 	hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", TDEIcon::Small );
 
-	connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( doRegister() ) );
-	connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotClose() ) );
+	connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( doRegister() ) );
+	connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotClose() ) );
 
-	connect( ui->valueEmailAddress, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( ui->valuePassword, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( ui->valuePasswordVerify, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( inputChanged( const TQString & ) ) );
-	connect( ui->valueVerificationSequence, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( inputChanged( const TQString & ) ) );
+	connect( ui->valueEmailAddress, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( ui->valuePassword, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( ui->valuePasswordVerify, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( inputChanged( const TQString & ) ) );
+	connect( ui->valueVerificationSequence, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( inputChanged( const TQString & ) ) );
 
-	connect( cRegister, TQT_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQT_SLOT( displayToken( TQPixmap, TQString ) ) );
-	connect( cRegister, TQT_SIGNAL( done(  const TQString&,  const TQString& ) ), TQT_SLOT( registrationDone(  const TQString&,  const TQString& ) ) );
-	connect( cRegister, TQT_SIGNAL( error(  const TQString&,  const TQString& ) ), TQT_SLOT( registrationError(  const TQString&,  const TQString& ) ) );
-	connect( cRegister, TQT_SIGNAL( operationStatus( const TQString ) ), TQT_SLOT( updateStatus( const TQString ) ) );
+	connect( cRegister, TQ_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQ_SLOT( displayToken( TQPixmap, TQString ) ) );
+	connect( cRegister, TQ_SIGNAL( done(  const TQString&,  const TQString& ) ), TQ_SLOT( registrationDone(  const TQString&,  const TQString& ) ) );
+	connect( cRegister, TQ_SIGNAL( error(  const TQString&,  const TQString& ) ), TQ_SLOT( registrationError(  const TQString&,  const TQString& ) ) );
+	connect( cRegister, TQ_SIGNAL( operationStatus( const TQString ) ), TQ_SLOT( updateStatus( const TQString ) ) );
 
 	updateStatus( i18n( "Retrieving token" ) );
 	cRegister->requestToken();
@@ -166,10 +166,10 @@ GaduRegisterAccount::registrationError(  const TQString& title,  const TQString&
 	updateStatus( i18n( "Registration failed: %1" ).arg( what ) );
 	KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title );
 
-	disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) );
-	disconnect( this, TQT_SLOT( registrationDone(  const TQString&,  const TQString& ) ) );
-	disconnect( this, TQT_SLOT( registrationError(  const TQString&,  const TQString& ) ) );
-	disconnect( this, TQT_SLOT( updateStatus( const TQString ) ) );
+	disconnect( this, TQ_SLOT( displayToken( TQPixmap, TQString ) ) );
+	disconnect( this, TQ_SLOT( registrationDone(  const TQString&,  const TQString& ) ) );
+	disconnect( this, TQ_SLOT( registrationError(  const TQString&,  const TQString& ) ) );
+	disconnect( this, TQ_SLOT( updateStatus( const TQString ) ) );
 
 	ui->valueVerificationSequence->setDisabled( true );
 	ui->valueVerificationSequence->setText( "" );
diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp
index f1660ffd..ec123fe7 100644
--- a/kopete/protocols/gadu/gadusession.cpp
+++ b/kopete/protocols/gadu/gadusession.cpp
@@ -120,8 +120,8 @@ GaduSession::createNotifiers( bool connect )
 	write_->setEnabled( false );
 
 	if ( connect ) {
-		TQObject::connect( read_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( checkDescriptor() ) );
-		TQObject::connect( write_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( checkDescriptor() ) );
+		TQObject::connect( read_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( checkDescriptor() ) );
+		TQObject::connect( write_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( checkDescriptor() ) );
 	}
 }