Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

7 files changed, 28 insertions, 28 deletions

diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp
index 085b9cd5..fc532ffd 100644
--- a/kopete/protocols/sms/services/kopete_unix_serial.cpp
+++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp
@@ -305,7 +305,7 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed,
 			  s.find("CABLE: GSM") != string::npos)
 		  {
 				_readNotifier = new TQSocketNotifier(_fd, TQSocketNotifier::Read);
-					connect( _readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated()));
+					connect( _readNotifier, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated()));
 				return;					// found OK, return
 		  }
 		}
diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index 1a8a510a..c3902d4f 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -80,9 +80,9 @@ void SMSClient::send(const Kopete::Message& msg)
 	*p << provider + ":" + nr;
 	*p << message;
 
-	TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess*)));
-	TQObject::connect(p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
-	TQObject::connect(p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+	TQObject::connect(p, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotSendFinished(TDEProcess*)));
+	TQObject::connect(p, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
+	TQObject::connect(p, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int)));
 
 	p->start(TDEProcess::Block, TDEProcess::AllOutput);
 }
diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp
index 73eb71db..0d22fd4f 100644
--- a/kopete/protocols/sms/services/smssend.cpp
+++ b/kopete/protocols/sms/services/smssend.cpp
@@ -67,8 +67,8 @@ void SMSSend::send(const Kopete::Message& msg)
 
 	m_provider = new SMSSendProvider(provider, prefix, m_account, this);
 
-	TQObject::connect( m_provider, TQT_SIGNAL(messageSent(const Kopete::Message &)), this, TQT_SIGNAL(messageSent(const Kopete::Message &)));
-	TQObject::connect( m_provider, TQT_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), this, TQT_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)));
+	TQObject::connect( m_provider, TQ_SIGNAL(messageSent(const Kopete::Message &)), this, TQ_SIGNAL(messageSent(const Kopete::Message &)));
+	TQObject::connect( m_provider, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), this, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)));
 
 	m_provider->send(msg);
 }
@@ -108,13 +108,13 @@ void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* layout)
 		}
 	}
 
-	TQObject::connect (prefWidget->program, TQT_SIGNAL(textChanged(const TQString &)),
-		this, TQT_SLOT(loadProviders(const TQString&)));
+	TQObject::connect (prefWidget->program, TQ_SIGNAL(textChanged(const TQString &)),
+		this, TQ_SLOT(loadProviders(const TQString&)));
 
 	prefWidget->program->setURL(prefix);
 
-	TQObject::connect(prefWidget->provider, TQT_SIGNAL(activated(const TQString &)),
-		this, TQT_SLOT(setOptions(const TQString &)));
+	TQObject::connect(prefWidget->provider, TQ_SIGNAL(activated(const TQString &)),
+		this, TQ_SLOT(setOptions(const TQString &)));
 
 	prefWidget->show();
 }
diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp
index 3ca0b419..24ea8bdc 100644
--- a/kopete/protocols/sms/services/smssendprovider.cpp
+++ b/kopete/protocols/sms/services/smssendprovider.cpp
@@ -244,9 +244,9 @@ void SMSSendProvider::send(const Kopete::Message& msg)
 	*p << TQString("%1/bin/smssend").arg(prefix) << provider << values;
 
 	output = "";
-	connect( p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess *)));
-	connect( p, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)));
-//	connect( p, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)));
+	connect( p, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotSendFinished(TDEProcess *)));
+	connect( p, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int)));
+//	connect( p, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int)));
 
 	p->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
 }
diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp
index 2e596025..eddf3508 100644
--- a/kopete/protocols/sms/smsaccount.cpp
+++ b/kopete/protocols/sms/smsaccount.cpp
@@ -46,12 +46,12 @@ SMSAccount::SMSAccount( SMSProtocol *parent, const TQString &accountID, const ch
 	
 	if( theService )
 	{
-		TQObject::connect (theService, TQT_SIGNAL(messageSent(const Kopete::Message &)), 
-					this, TQT_SLOT(slotSendingSuccess(const Kopete::Message &)));
-		TQObject::connect (theService, TQT_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), 
-					this, TQT_SLOT(slotSendingFailure(const Kopete::Message &, const TQString &)));
-		TQObject::connect (theService, TQT_SIGNAL(connected()), this, TQT_SLOT(slotConnected()));
-		TQObject::connect (theService, TQT_SIGNAL(disconnected()), this, TQT_SLOT(slotDisconnected()));
+		TQObject::connect (theService, TQ_SIGNAL(messageSent(const Kopete::Message &)), 
+					this, TQ_SLOT(slotSendingSuccess(const Kopete::Message &)));
+		TQObject::connect (theService, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), 
+					this, TQ_SLOT(slotSendingFailure(const Kopete::Message &, const TQString &)));
+		TQObject::connect (theService, TQ_SIGNAL(connected()), this, TQ_SLOT(slotConnected()));
+		TQObject::connect (theService, TQ_SIGNAL(disconnected()), this, TQ_SLOT(slotDisconnected()));
 	}
 	
 }
diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp
index 2a1afa09..d67bd9be 100644
--- a/kopete/protocols/sms/smscontact.cpp
+++ b/kopete/protocols/sms/smscontact.cpp
@@ -79,9 +79,9 @@ Kopete::ChatSession* SMSContact::manager( Kopete::Contact::CanCreateFlags canCre
 		TQPtrList<Kopete::Contact> contacts;
 		contacts.append(this);
 		m_msgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), contacts, protocol());
-		connect(m_msgManager, TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)),
-			account(), TQT_SLOT(slotSendMessage(Kopete::Message&)));
-		connect(m_msgManager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed()));
+		connect(m_msgManager, TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)),
+			account(), TQ_SLOT(slotSendMessage(Kopete::Message&)));
+		connect(m_msgManager, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotChatSessionDestroyed()));
 		return m_msgManager;
 	}
 }
@@ -123,7 +123,7 @@ TQPtrList<TDEAction>* SMSContact::customContextMenuActions()
 {
 	TQPtrList<TDEAction> *m_actionCollection = new TQPtrList<TDEAction>();
 	if( !m_actionPrefs )
-		m_actionPrefs = new TDEAction(i18n("&Contact Settings"), 0, this, TQT_SLOT(userPrefs()), this, "userPrefs");
+		m_actionPrefs = new TDEAction(i18n("&Contact Settings"), 0, this, TQ_SLOT(userPrefs()), this, "userPrefs");
 
 	m_actionCollection->append( m_actionPrefs );
 
diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp
index 11771f9e..5994534d 100644
--- a/kopete/protocols/sms/smseditaccountwidget.cpp
+++ b/kopete/protocols/sms/smseditaccountwidget.cpp
@@ -63,10 +63,10 @@ SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Accoun
 
 	preferencesDialog->serviceName->insertStringList(ServiceLoader::services());
 
-	connect (preferencesDialog->serviceName, TQT_SIGNAL(activated(const TQString &)),
-		this, TQT_SLOT(setServicePreferences(const TQString &)));
-	connect (preferencesDialog->descButton, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(showDescription()));
+	connect (preferencesDialog->serviceName, TQ_SIGNAL(activated(const TQString &)),
+		this, TQ_SLOT(setServicePreferences(const TQString &)));
+	connect (preferencesDialog->descButton, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(showDescription()));
 
 
 	for (int i=0; i < preferencesDialog->serviceName->count(); i++)
@@ -118,7 +118,7 @@ void SMSEditAccountWidget::setServicePreferences(const TQString& serviceName)
 	if (service == 0L)
 		return;
 
-	connect (this, TQT_SIGNAL(saved()), service, TQT_SLOT(savePreferences()));
+	connect (this, TQ_SIGNAL(saved()), service, TQ_SLOT(savePreferences()));
 
 	delete middleFrameLayout;
 	middleFrameLayout = new TQGridLayout(preferencesDialog->middleFrame, 1, 2, 0, 6, "middleFrameLayout");