Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

5 files changed, 55 insertions, 55 deletions

diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index 82b9a29c..4a34b369 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -95,8 +95,8 @@ Kopete::ChatSession* AIMMyselfContact::manager( Kopete::Contact::CanCreateFlags
         session = new AIMChatSession( this, chatMembers, account()->protocol(), exchange, room );
         session->setEngine( m_acct->engine() );
 
-        connect( session, TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ),
-                 this, TQT_SLOT( sendMessage( Kopete::Message&, Kopete::ChatSession* ) ) );
+        connect( session, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ),
+                 this, TQ_SLOT( sendMessage( Kopete::Message&, Kopete::ChatSession* ) ) );
         m_chatRoomSessions.append( session );
     }
     return session;
@@ -214,20 +214,20 @@ AIMAccount::AIMAccount(Kopete::Protocol *parent, TQString accountID, const char
     m_joinChatDialog = 0;
 	m_visibilityDialog = 0;
 	TQObject::connect( Kopete::ContactList::self(),
-	                  TQT_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ),
+	                  TQ_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ),
 	                  this,
-	                  TQT_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) );
+	                  TQ_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) );
 
-    TQObject::connect( engine(), TQT_SIGNAL( chatRoomConnected( WORD, const TQString& ) ),
-                      this, TQT_SLOT( connectedToChatRoom( WORD, const TQString& ) ) );
+    TQObject::connect( engine(), TQ_SIGNAL( chatRoomConnected( WORD, const TQString& ) ),
+                      this, TQ_SLOT( connectedToChatRoom( WORD, const TQString& ) ) );
 
-    TQObject::connect( engine(), TQT_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ),
-                      this, TQT_SLOT( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) );
+    TQObject::connect( engine(), TQ_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ),
+                      this, TQ_SLOT( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) );
 
-    TQObject::connect( engine(), TQT_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ),
-                      this, TQT_SLOT( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) );
+    TQObject::connect( engine(), TQ_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ),
+                      this, TQ_SLOT( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) );
 
-	TQObject::connect( this, TQT_SIGNAL( buddyIconChanged() ), this, TQT_SLOT( slotBuddyIconChanged() ) );
+	TQObject::connect( this, TQ_SIGNAL( buddyIconChanged() ), this, TQ_SLOT( slotBuddyIconChanged() ) );
 
 }
 
@@ -309,30 +309,30 @@ TDEActionMenu* AIMAccount::actionMenu()
 			i18n( "%2 <%1>" ).arg( accountId(), accountNick ));
 
 	mActionMenu->insert( new TDEAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this,
-	             TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") );
+	             TQ_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") );
 
 	TDEAction* mActionAway = new Kopete::AwayAction(i18n("Away"), p->statusAway.iconFor( this ), 0, this,
-	             TQT_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" );
+	             TQ_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" );
 	mActionAway->setEnabled( isConnected() );
 	mActionMenu->insert( mActionAway );
 
 	TDEAction* mActionOffline = new TDEAction( i18n("Offline"), p->statusOffline.iconFor(this), 0, this,
-	             TQT_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline");
+	             TQ_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline");
 
 	mActionMenu->insert( mActionOffline );
 	mActionMenu->popupMenu()->insertSeparator();
 
     TDEAction* m_joinChatAction = new TDEAction( i18n( "Join Chat..." ), TQString(),  0,  this,
-                                             TQT_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" );
+                                             TQ_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" );
 
 	mActionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0,
-	                                       this, TQT_SLOT( slotSetVisiblility() ), this,
+	                                       this, TQ_SLOT( slotSetVisiblility() ), this,
 	                                       "AIMAccount::mActionSetVisibility") );
 
     mActionMenu->insert( m_joinChatAction );
     
     TDEAction* m_editInfoAction = new TDEAction( i18n( "Edit User Info..." ), "identity", 0,
-                                             this, TQT_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo");
+                                             this, TQ_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo");
     
     mActionMenu->insert( m_editInfoAction );
 
@@ -415,10 +415,10 @@ void AIMAccount::slotGlobalIdentityChanged( const TQString& key, const TQVariant
 void AIMAccount::slotBuddyIconChanged()
 {
 	// need to disconnect because we could end up with many connections
-	TQObject::disconnect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) );
+	TQObject::disconnect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) );
 	if ( !engine()->isActive() )
 	{
-		TQObject::connect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) );
+		TQObject::connect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) );
 		return;
 	}
 	
@@ -520,8 +520,8 @@ void AIMAccount::slotJoinChat()
     if ( !m_joinChatDialog )
     {
         m_joinChatDialog = new AIMJoinChatUI( this, false, Kopete::UI::Global::mainWidget() );
-	    TQObject::connect( m_joinChatDialog, TQT_SIGNAL( closing( int ) ),
-	                      this, TQT_SLOT( joinChatDialogClosed( int ) ) );
+	    TQObject::connect( m_joinChatDialog, TQ_SIGNAL( closing( int ) ),
+	                      this, TQ_SLOT( joinChatDialogClosed( int ) ) );
         TQValueList<int> list = engine()->chatExchangeList();
         m_joinChatDialog->setExchangeList( list );
         m_joinChatDialog->show();
@@ -794,8 +794,8 @@ void AIMAccount::slotSetVisiblility()
 	if ( !m_visibilityDialog )
 	{
 		m_visibilityDialog = new OscarVisibilityDialog( engine(), Kopete::UI::Global::mainWidget() );
-		TQObject::connect( m_visibilityDialog, TQT_SIGNAL( closing() ),
-		                  this, TQT_SLOT( slotVisibilityDialogClosed() ) );
+		TQObject::connect( m_visibilityDialog, TQ_SIGNAL( closing() ),
+		                  this, TQ_SLOT( slotVisibilityDialogClosed() ) );
 		
 		//add all contacts;
 		OscarVisibilityDialog::ContactMap contactMap;
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index 12eb4bd2..0d42c8ce 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -58,21 +58,21 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::
 	// Set the last autoresponse time to the current time yesterday
 	m_lastAutoresponseTime = TQDateTime::currentDateTime().addDays(-1);
 
-	TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ),
-	                  this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) );
-	TQObject::connect( mAccount->engine(), TQT_SIGNAL( userIsOffline( const TQString& ) ),
-	                  this, TQT_SLOT( userOffline( const TQString& ) ) );
-	TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ),
-	                  this, TQT_SLOT( updateAwayMessage( const TQString&, const TQString& ) ) );
-	TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ),
-	                  this, TQT_SLOT( updateProfile( const TQString&, const TQString& ) ) );
-	TQObject::connect( mAccount->engine(), TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ),
-	                  this, TQT_SLOT( gotWarning( const TQString&, TQ_UINT16, TQ_UINT16 ) ) );
-	TQObject::connect( mAccount->engine(), TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ),
-	                  this, TQT_SLOT( haveIcon( const TQString&, TQByteArray ) ) );
-	TQObject::connect( mAccount->engine(), TQT_SIGNAL( iconServerConnected() ),
-	                  this, TQT_SLOT( requestBuddyIcon() ) );
-	TQObject::connect( this, TQT_SIGNAL( featuresUpdated() ), this, TQT_SLOT( updateFeatures() ) );
+	TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ),
+	                  this, TQ_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) );
+	TQObject::connect( mAccount->engine(), TQ_SIGNAL( userIsOffline( const TQString& ) ),
+	                  this, TQ_SLOT( userOffline( const TQString& ) ) );
+	TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ),
+	                  this, TQ_SLOT( updateAwayMessage( const TQString&, const TQString& ) ) );
+	TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedProfile( const TQString&, const TQString& ) ),
+	                  this, TQ_SLOT( updateProfile( const TQString&, const TQString& ) ) );
+	TQObject::connect( mAccount->engine(), TQ_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ),
+	                  this, TQ_SLOT( gotWarning( const TQString&, TQ_UINT16, TQ_UINT16 ) ) );
+	TQObject::connect( mAccount->engine(), TQ_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ),
+	                  this, TQ_SLOT( haveIcon( const TQString&, TQByteArray ) ) );
+	TQObject::connect( mAccount->engine(), TQ_SIGNAL( iconServerConnected() ),
+	                  this, TQ_SLOT( requestBuddyIcon() ) );
+	TQObject::connect( this, TQ_SIGNAL( featuresUpdated() ), this, TQ_SLOT( updateFeatures() ) );
 }
 
 AIMContact::~AIMContact()
@@ -90,12 +90,12 @@ TQPtrList<TDEAction> *AIMContact::customContextMenuActions()
 	TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
 	if ( !m_warnUserAction )
 	{
-		m_warnUserAction = new TDEAction( i18n( "&Warn User" ), 0, this, TQT_SLOT( warnUser() ), this, "warnAction" );
+		m_warnUserAction = new TDEAction( i18n( "&Warn User" ), 0, this, TQ_SLOT( warnUser() ), this, "warnAction" );
 	}
 	m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0,
-	                                      this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo");
+	                                      this, TQ_SLOT(slotVisibleTo()), this, "actionVisibleTo");
 	m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0,
-	                                        this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo");
+	                                        this, TQ_SLOT(slotInvisibleTo()), this, "actionInvisibleTo");
 	
 	bool on = account()->isConnected();
 
@@ -162,7 +162,7 @@ void AIMContact::slotUserInfo()
 		m_infoDialog = new AIMUserInfoDialog( this, static_cast<AIMAccount*>( account() ), false, Kopete::UI::Global::mainWidget(), 0 );
 		if( !m_infoDialog )
 			return;
-		connect( m_infoDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeUserInfoDialog() ) );
+		connect( m_infoDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeUserInfoDialog() ) );
 		m_infoDialog->show();
 		if ( mAccount->isConnected() )
 		{
@@ -240,7 +240,7 @@ void AIMContact::userInfoUpdated( const TQString& contact, const UserDetails& de
 
 		int time = ( TDEApplication::random() % 10 ) * 1000;
 		kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating buddy icon in " << time/1000 << " seconds" << endl;
-		TQTimer::singleShot( time, this, TQT_SLOT( requestBuddyIcon() ) );
+		TQTimer::singleShot( time, this, TQ_SLOT( requestBuddyIcon() ) );
 	}
 
 	OscarContact::userInfoUpdated( contact, details );
diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp
index 667a926d..36a79613 100644
--- a/kopete/protocols/oscar/aim/aimjoinchat.cpp
+++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp
@@ -41,8 +41,8 @@ AIMJoinChatUI::AIMJoinChatUI( AIMAccount* account,  bool modal,
 
     setMainWidget( m_joinUI  );
 
-    TQObject::connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( joinChat() ) );
-    TQObject::connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( closeClicked() ) );
+    TQObject::connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( joinChat() ) );
+    TQObject::connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( closeClicked() ) );
 }
 
 AIMJoinChatUI::~AIMJoinChatUI()
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp
index 46d6db03..561eef41 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.cpp
+++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp
@@ -50,10 +50,10 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool
 	mMainWidget = new AIMUserInfoWidget(this, "aimuserinfowidget");
 	setMainWidget(mMainWidget);
 
-	TQObject::connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotSaveClicked()));
-	TQObject::connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotUpdateClicked()));
-	TQObject::connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCloseClicked()));
-	TQObject::connect(c, TQT_SIGNAL(updatedProfile()), this, TQT_SLOT(slotUpdateProfile()));
+	TQObject::connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSaveClicked()));
+	TQObject::connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotUpdateClicked()));
+	TQObject::connect(this, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCloseClicked()));
+	TQObject::connect(c, TQ_SIGNAL(updatedProfile()), this, TQ_SLOT(slotUpdateProfile()));
 
 	mMainWidget->txtScreenName->setText( c->contactId() );
 
@@ -100,11 +100,11 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool
 		userInfoView->setTextFormat(AutoText);
 		userInfoView->setNotifyClick(true);
 		TQObject::connect(
-			userInfoView, TQT_SIGNAL(urlClick(const TQString&)),
-			this, TQT_SLOT(slotUrlClicked(const TQString&)));
+			userInfoView, TQ_SIGNAL(urlClick(const TQString&)),
+			this, TQ_SLOT(slotUrlClicked(const TQString&)));
 		TQObject::connect(
-			userInfoView, TQT_SIGNAL(mailClick(const TQString&, const TQString&)),
-			this, TQT_SLOT(slotMailClicked(const TQString&, const TQString&)));
+			userInfoView, TQ_SIGNAL(mailClick(const TQString&, const TQString&)),
+			this, TQ_SLOT(slotMailClicked(const TQString&, const TQString&)));
 		showButton(Cancel, false);
 		setButtonText(Ok, i18n("&Close"));
 		setEscapeButton(Ok);
@@ -115,7 +115,7 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool
 			// Update the user view to indicate that we're requesting the user's profile
 			userInfoView->setText(i18n("Requesting User Profile, please wait..."));
 		}
-		TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateProfile()));
+		TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateProfile()));
 	}
 }
 
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
index 8ea32a3b..7a8a499e 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
@@ -80,7 +80,7 @@ AIMEditAccountWidget::AIMEditAccountWidget( AIMProtocol *protocol,
 		// Global Identity
 		mGui->mGlobalIdentity->setChecked( account->configGroup()->readBoolEntry("ExcludeGlobalIdentity", false) );
     }
-	TQObject::connect( mGui->buttonRegister, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenRegister() ) );
+	TQObject::connect( mGui->buttonRegister, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenRegister() ) );
 
 	/* Set tab order to password custom widget correctly */
 	TQWidget::setTabOrder( mGui->edtAccountId, mGui->mPasswordWidget->mRemembered );