Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

6 files changed, 23 insertions, 23 deletions

diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 497f13fe..138f2957 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -36,10 +36,10 @@
 WinPopupLib::WinPopupLib(const TQString &smbClient,int groupFreq)
 	: smbClientBin(smbClient), groupCheckFreq(groupFreq)
 {
-	connect(&updateGroupDataTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateGroupData()));
+	connect(&updateGroupDataTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateGroupData()));
 
 	updateGroupDataTimer.start(1, true);
-	TQTimer::singleShot(1, this, TQT_SLOT(slotStartDirLister()));
+	TQTimer::singleShot(1, this, TQ_SLOT(slotStartDirLister()));
 }
 
 WinPopupLib::~WinPopupLib()
@@ -51,8 +51,8 @@ void WinPopupLib::slotStartDirLister()
 	if (checkMessageDir()) {
 		dirLister = new KDirLister();
 		dirLister->setAutoUpdate(true);
-		connect(dirLister, TQT_SIGNAL(newItems(const KFileItemList &)), this, TQT_SLOT(slotNewMessages(const KFileItemList &)));
-		connect(dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotListCompleted()));
+		connect(dirLister, TQ_SIGNAL(newItems(const KFileItemList &)), this, TQ_SLOT(slotNewMessages(const KFileItemList &)));
+		connect(dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotListCompleted()));
 		dirLister->openURL(KURL::fromPathOrURL(WP_POPUP_DIR));
 	}
 }
@@ -162,8 +162,8 @@ void WinPopupLib::startReadProcess(const TQString &Host)
 	KProcIO *reader = new KProcIO;
 	*reader << smbClientBin << "-N" << "-E" << "-g" << "-L" << Host << "-";
 
-	connect(reader, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotReadProcessReady(KProcIO *)));
-	connect(reader, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotReadProcessExited(TDEProcess *)));
+	connect(reader, TQ_SIGNAL(readReady(KProcIO *)), this, TQ_SLOT(slotReadProcessReady(KProcIO *)));
+	connect(reader, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotReadProcessExited(TDEProcess *)));
 
 	if (!reader->start(TDEProcess::NotifyOnExit, true)) {
 		// still to come
@@ -250,7 +250,7 @@ void WinPopupLib::slotReadProcessExited(TDEProcess *r)
 void WinPopupLib::slotListCompleted()
 {
 	/// only to check received messages during start up, then we use newItems. GF
-	disconnect(dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotListCompleted()));
+	disconnect(dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotListCompleted()));
 	readMessages(dirLister->items());
 }
 
@@ -331,7 +331,7 @@ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination)
 	*sender << smbClientBin << "-M" << Destination;
 	*sender << "-N" << "-";
 
-	connect(sender, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendProcessExited(TDEProcess *)));
+	connect(sender, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotSendProcessExited(TDEProcess *)));
 
 	if (sender->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin)) {
 		sender->writeStdin(Body.local8Bit(), Body.local8Bit().length());
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index 75788a2b..695147a2 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -165,12 +165,12 @@ TDEActionMenu* WPAccount::actionMenu()
 	if (mProtocol)
 	{
 		TDEAction *goOnline = new TDEAction("Online", TQIconSet(mProtocol->WPOnline.iconFor(this)), 0,
-										 this, TQT_SLOT(connect()), theActionMenu, "actionGoAvailable");
+										 this, TQ_SLOT(connect()), theActionMenu, "actionGoAvailable");
 		goOnline->setEnabled(isConnected() && isAway());
 		theActionMenu->insert(goOnline);
 
 		TDEAction *goAway = new TDEAction("Away", TQIconSet(mProtocol->WPAway.iconFor(this)), 0,
-									  this, TQT_SLOT(goAway()), theActionMenu, "actionGoAway");
+									  this, TQ_SLOT(goAway()), theActionMenu, "actionGoAway");
 		goAway->setEnabled(isConnected() && !isAway());
 		theActionMenu->insert(goAway);
 
@@ -178,7 +178,7 @@ TDEActionMenu* WPAccount::actionMenu()
 
 		theActionMenu->popupMenu()->insertSeparator();
 		theActionMenu->insert(new TDEAction(i18n("Properties"),  0,
-							  this, TQT_SLOT(editAccount()), theActionMenu, "actionAccountProperties"));
+							  this, TQ_SLOT(editAccount()), theActionMenu, "actionAccountProperties"));
 
 	}
 
diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp
index 133d9b54..1d08ba8f 100644
--- a/kopete/protocols/winpopup/wpaddcontact.cpp
+++ b/kopete/protocols/winpopup/wpaddcontact.cpp
@@ -42,8 +42,8 @@ WPAddContact::WPAddContact(TQWidget *parent, WPAccount *newAccount, const char *
 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	theDialog = new WPAddContactBase(this);
-	connect(theDialog->mHostGroup, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSelected(const TQString &)));
-	connect(theDialog->mRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdateGroups()));
+	connect(theDialog->mHostGroup, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSelected(const TQString &)));
+	connect(theDialog->mRefresh, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpdateGroups()));
 	theDialog->show();
 
 	theAccount = newAccount;
diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp
index b8718de6..29517745 100644
--- a/kopete/protocols/winpopup/wpcontact.cpp
+++ b/kopete/protocols/winpopup/wpcontact.cpp
@@ -51,7 +51,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons
 	// Initialise and start the periodical checking for contact's status
 	setOnlineStatus(static_cast<WPProtocol *>(protocol())->WPOffline);
 
-	connect(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus()));
+	connect(&checkStatus, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCheckStatus()));
 	checkStatus.start(1000, false);
 }
 
@@ -77,9 +77,9 @@ Kopete::ChatSession* WPContact::manager( Kopete::Contact::CanCreateFlags /*canCr
 
 		m_manager = Kopete::ChatSessionManager::self()->create( account()->myself(), singleContact, protocol() );
 
-		connect(m_manager, TQT_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), this, TQT_SLOT(slotSendMessage(Kopete::Message &)));
-		connect(m_manager, TQT_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), m_manager, TQT_SLOT(appendMessage(Kopete::Message &)));
-		connect(m_manager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed()));
+		connect(m_manager, TQ_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), this, TQ_SLOT(slotSendMessage(Kopete::Message &)));
+		connect(m_manager, TQ_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), m_manager, TQ_SLOT(appendMessage(Kopete::Message &)));
+		connect(m_manager, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotChatSessionDestroyed()));
 	}
 
 	return m_manager;
@@ -111,7 +111,7 @@ void WPContact::slotUserInfo()
 	if (!m_infoDialog) {
 		m_infoDialog = new WPUserInfo( this, static_cast<WPAccount*>( account() ) );
 		if (!m_infoDialog) return;
-		connect( m_infoDialog, TQT_SIGNAL( closing() ), this, TQT_SLOT( slotCloseUserInfoDialog() ) );
+		connect( m_infoDialog, TQ_SIGNAL( closing() ), this, TQ_SLOT( slotCloseUserInfoDialog() ) );
 		m_infoDialog->show();
 	} else {
 		m_infoDialog->raise();
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index 3b2cba49..a418d7e7 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -67,8 +67,8 @@ WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList &
 	readConfig();
 
 	popupClient = new WinPopupLib(smbClientBin, groupCheckFreq);
-	TQObject::connect(popupClient, TQT_SIGNAL(signalNewMessage(const TQString &, const TQDateTime &, const TQString &)),
-		this, TQT_SLOT(slotReceivedMessage(const TQString &, const TQDateTime &, const TQString &)));
+	TQObject::connect(popupClient, TQ_SIGNAL(signalNewMessage(const TQString &, const TQDateTime &, const TQString &)),
+		this, TQ_SLOT(slotReceivedMessage(const TQString &, const TQDateTime &, const TQString &)));
 }
 
 // Destructor
diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp
index 2809763d..32fc6837 100644
--- a/kopete/protocols/winpopup/wpuserinfo.cpp
+++ b/kopete/protocols/winpopup/wpuserinfo.cpp
@@ -50,7 +50,7 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa
 	m_mainWidget->sOS->setText(i18n("Looking"));
 	m_mainWidget->sServer->setText(i18n("Looking"));
 
-	connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCloseClicked() ) );
+	connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotCloseClicked() ) );
 
 	startDetailsProcess(m_contact->contactId());
 }
@@ -65,8 +65,8 @@ void WPUserInfo::startDetailsProcess(const TQString &host)
 	KProcIO *details = new KProcIO;
 	*details << theSMBClientPath << "-N" << "-E" << "-g" << "-L" << host << "-";
 
-	connect(details, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotDetailsProcessReady(KProcIO *)));
-	connect(details, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotDetailsProcessExited(TDEProcess *)));
+	connect(details, TQ_SIGNAL(readReady(KProcIO *)), this, TQ_SLOT(slotDetailsProcessReady(KProcIO *)));
+	connect(details, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotDetailsProcessExited(TDEProcess *)));
 
 	if (!details->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) {
 		slotDetailsProcessExited(details);