Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 23 insertions, 23 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;