Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 18 insertions, 18 deletions

diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp
index 70f1266f..8f9278da 100644
--- a/kopete/plugins/translator/translatorguiclient.cpp
+++ b/kopete/plugins/translator/translatorguiclient.cpp
@@ -37,11 +37,11 @@ TranslatorGUIClient::TranslatorGUIClient( Kopete::ChatSession *parent, const cha
 : TQObject( parent, name ), KXMLGUIClient( parent )
 {
 	setInstance( TranslatorPlugin::plugin()->instance() );
-	connect( TranslatorPlugin::plugin(), TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( deleteLater() ) );
+	connect( TranslatorPlugin::plugin(), TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( deleteLater() ) );
 
 	m_manager = parent;
 
-	new TDEAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQT_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" );
+	new TDEAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQ_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" );
 	
 	setXMLFile( "translatorchatui.rc" );
 }
@@ -73,7 +73,7 @@ void TranslatorGUIClient::slotTranslateChat()
 	}
 
 	// We search for src_dst
-	TranslatorPlugin::plugin()->translateMessage( body, src_lang, dst_lang, this, TQT_SLOT( messageTranslated( const TQVariant & ) ) );
+	TranslatorPlugin::plugin()->translateMessage( body, src_lang, dst_lang, this, TQ_SLOT( messageTranslated( const TQVariant & ) ) );
 }
 
 void TranslatorGUIClient::messageTranslated( const TQVariant &result )
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index d87830fe..dc94304d 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -64,12 +64,12 @@ TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQ
 
 	m_languages = new TranslatorLanguages;
 
-	connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ),
-		this, TQT_SLOT( slotIncomingMessage( Kopete::Message & ) ) );
-	connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToSend( Kopete::Message & ) ),
-		this, TQT_SLOT( slotOutgoingMessage( Kopete::Message & ) ) );
-	connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ),
-		this, TQT_SLOT( slotNewKMM( Kopete::ChatSession * ) ) );
+	connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToDisplay( Kopete::Message & ) ),
+		this, TQ_SLOT( slotIncomingMessage( Kopete::Message & ) ) );
+	connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToSend( Kopete::Message & ) ),
+		this, TQ_SLOT( slotOutgoingMessage( Kopete::Message & ) ) );
+	connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ),
+		this, TQ_SLOT( slotNewKMM( Kopete::ChatSession * ) ) );
 
 	TQStringList keys;
 	TQMap<TQString, TQString> m = m_languages->languagesMap();
@@ -78,8 +78,8 @@ TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQ
 
 	m_actionLanguage = new TDESelectAction( i18n( "Set &Language" ), "locale", 0, actionCollection(), "contactLanguage" );
 	m_actionLanguage->setItems( keys );
-	connect( m_actionLanguage, TQT_SIGNAL( activated() ), this, TQT_SLOT(slotSetLanguage() ) );
-	connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotSelectionChanged( bool ) ) );
+	connect( m_actionLanguage, TQ_SIGNAL( activated() ), this, TQ_SLOT(slotSetLanguage() ) );
+	connect( Kopete::ContactList::self(), TQ_SIGNAL( metaContactSelected( bool ) ), this, TQ_SLOT( slotSelectionChanged( bool ) ) );
 
 	setXMLFile( "translatorui.rc" );
 
@@ -89,7 +89,7 @@ TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQ
 	  slotNewKMM( *it );
 
 	loadSettings();
-	connect( this, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( loadSettings() ) );
+	connect( this, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( loadSettings() ) );
 }
 
 TranslatorPlugin::~TranslatorPlugin()
@@ -275,8 +275,8 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ
 	//job->addMetaData( "content-type", "application/x-www-form-urlencoded" );
 	//job->addMetaData( "referrer", "http://www.google.com" );
 
-	TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
-	TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
+	TQObject::connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
+	TQObject::connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobDone( TDEIO::Job * ) ) );
 
 	// TDEIO is async and we use a sync API, so use the processEvents hack to work around that
 	// FIXME: We need to make the libkopete API async to get rid of this processEvents.
@@ -311,8 +311,8 @@ TQString TranslatorPlugin::babelTranslateMessage( const TQString &msg, const TQS
 
 	TDEIO::TransferJob *job = TDEIO::get( geturl, false, true );
 
-	TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
-	TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
+	TQObject::connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
+	TQObject::connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobDone( TDEIO::Job * ) ) );
 
 	// TDEIO is async and we use a sync API, so use the processEvents hack to work around that
 	// FIXME: We need to make the libkopete API async to get rid of this processEvents.
@@ -389,8 +389,8 @@ void TranslatorPlugin::slotDataReceived ( TDEIO::Job *job, const TQByteArray &da
 void TranslatorPlugin::slotJobDone ( TDEIO::Job *job )
 {
 	m_completed[ job ] = true;
-	TQObject::disconnect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
-	TQObject::disconnect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
+	TQObject::disconnect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
+	TQObject::disconnect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobDone( TDEIO::Job * ) ) );
 }
 
 void TranslatorPlugin::slotSetLanguage()