Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

6 files changed, 20 insertions, 20 deletions

diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
index b9f85d0..06c0c4e 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
@@ -45,9 +45,9 @@ KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,TQString &szQu
 	m_eType = eType;
 	m_pCallback = pCallback;
 	m_pMagic = pMagic;
-	connect(m_pDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(lookupTerminated(KviDns *)));
+	connect(m_pDns,TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(lookupTerminated(KviDns *)));
 	if(!m_pDns->lookup(szQuery,eType))
-		TQTimer::singleShot(10,this,TQT_SLOT(dnsStartFailed()));
+		TQTimer::singleShot(10,this,TQ_SLOT(dnsStartFailed()));
 }
 
 KviKvsAsyncDnsOperation::~KviKvsAsyncDnsOperation()
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index 701a265..2b973b5 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -1086,7 +1086,7 @@ namespace KviKvsCoreSimpleCommands
 
 		if(KVSCSC_pSwitches->find('q',"quit"))
 		{
-			TQTimer::singleShot(0,g_pApp,TQT_SLOT(quit()));
+			TQTimer::singleShot(0,g_pApp,TQ_SLOT(quit()));
 		} else {
 			KVSCSC_REQUIRE_CONNECTION
 			KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->find('f',"force"),szReason,KVSCSC_pSwitches->find('u',"unexpected"));
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
index 49a528c..2f5c28b 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
@@ -103,7 +103,7 @@ void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject)
 		m_pDnsObjects->setAutoDelete(true);
 	}
 	m_pDnsObjects->replace(pObject->dns(),pObject);
-	connect(pObject->dns(),TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(dnsLookupTerminated(KviDns *)));
+	connect(pObject->dns(),TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(dnsLookupTerminated(KviDns *)));
 }
 
 void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns)
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 3bfca49..5efa91e 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -694,7 +694,7 @@ KviKvsObject::~KviKvsObject()
 
 	if(m_pObject)
 	{
-		disconnect(m_pObject,TQT_SIGNAL(destroyed()),this,TQT_SLOT(objectDestroyed()));
+		disconnect(m_pObject,TQ_SIGNAL(destroyed()),this,TQ_SLOT(objectDestroyed()));
 		if(m_bObjectOwner)delete m_pObject;
 	}
 
@@ -730,7 +730,7 @@ void KviKvsObject::registerChild(KviKvsObject *pChild)
 	m_pChildList->append(pChild);
 }
 
-// SIGNAL/TQT_SLOT stuff
+// TQ_SIGNAL/TQ_SLOT stuff
 
 bool KviKvsObject::connectSignal(const TQString &sigName,KviKvsObject * pTarget,const TQString &slotName)
 {
@@ -1517,7 +1517,7 @@ bool KviKvsObject::die()
 {
 	if(m_bInDelayedDeath)return false;
 	m_bInDelayedDeath = true;
-	TQTimer::singleShot(0,this,TQT_SLOT(delayedDie()));
+	TQTimer::singleShot(0,this,TQ_SLOT(delayedDie()));
 	return true;
 }
 
@@ -1540,7 +1540,7 @@ void KviKvsObject::setObject(TQObject * o,bool bIsOwned)
 	m_bObjectOwner = bIsOwned;
 	m_pObject = o;
 	o->installEventFilter(this);
-	connect(m_pObject,TQT_SIGNAL(destroyed()),this,TQT_SLOT(objectDestroyed()));
+	connect(m_pObject,TQ_SIGNAL(destroyed()),this,TQ_SLOT(objectDestroyed()));
 }
 
 void KviKvsObject::objectDestroyed()
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index b531904..5f0293d 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -285,7 +285,7 @@ KviKvsPopupMenuItemLabel::~KviKvsPopupMenuItemLabel()
 {
 	if(m_pLabel)
 	{
-		TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed()));
+		TQObject::disconnect(m_pLabel,TQ_SIGNAL(destroyed()),m_pSignalRelay,TQ_SLOT(labelDestroyed()));
 		delete m_pLabel;
 	}
 	delete m_pSignalRelay;
@@ -306,7 +306,7 @@ void KviKvsPopupMenuItemLabel::clear()
 {
 	if(m_pLabel)
 	{
-		TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed()));
+		TQObject::disconnect(m_pLabel,TQ_SIGNAL(destroyed()),m_pSignalRelay,TQ_SLOT(labelDestroyed()));
 		delete m_pLabel;
 		m_pLabel = 0;
 	}
@@ -319,11 +319,11 @@ void KviKvsPopupMenuItemLabel::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLe
 	TQPixmap * pPix = evaluateIcon(pData);
 	if(m_pLabel)
 	{
-		TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed()));
+		TQObject::disconnect(m_pLabel,TQ_SIGNAL(destroyed()),m_pSignalRelay,TQ_SLOT(labelDestroyed()));
 		delete m_pLabel;
 	}
 	m_pLabel = new TQLabel(szText,pMenu);
-	TQObject::connect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed()));
+	TQObject::connect(m_pLabel,TQ_SIGNAL(destroyed()),m_pSignalRelay,TQ_SLOT(labelDestroyed()));
 	pMenu->insertItem(m_pLabel);
 	m_pLabel->setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised);
 	if(pPix)m_pLabel->setPixmap(*pPix);
@@ -538,8 +538,8 @@ KviKvsPopupMenu::KviKvsPopupMenu(const TQString &szName)
 	m_pTopLevelData = 0;
 	m_pTempTopLevelData = 0;
 	m_bSetupDone = false;
-	connect(this,TQT_SIGNAL(activated(int)),this,TQT_SLOT(itemClicked(int)));
-	connect(this,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupMenuContents()));
+	connect(this,TQ_SIGNAL(activated(int)),this,TQ_SLOT(itemClicked(int)));
+	connect(this,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupMenuContents()));
 }
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
index ab4a7c1..aa09d88 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
@@ -96,19 +96,19 @@ bool KviKvsProcessAsyncOperation::start()
 	
 	if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT)
 	{
-		connect(m_pProcess,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(readStdout()));
+		connect(m_pProcess,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(readStdout()));
 		c |= KviProcess::Stdout;
 	}
 	
 	if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR)
 	{
-		connect(m_pProcess,TQT_SIGNAL(readyReadStderr()),this,TQT_SLOT(readStderr()));
+		connect(m_pProcess,TQ_SIGNAL(readyReadStderr()),this,TQ_SLOT(readStderr()));
 		c |= KviProcess::Stderr;
 	}
 
 	m_pProcess->setCommunication(c);
 	
-	connect(m_pProcess,TQT_SIGNAL(processExited()),this,TQT_SLOT(processExited()));
+	connect(m_pProcess,TQ_SIGNAL(processExited()),this,TQ_SLOT(processExited()));
 	
 	if(!m_pProcess->start())
 	{
@@ -129,14 +129,14 @@ bool KviKvsProcessAsyncOperation::start()
 	if(m_pData->iMaxRunTime > 0)
 	{
 		m_pRunTimeTimer = new TQTimer(this);
-		connect(m_pRunTimeTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(maxRunTimeExpired()));
+		connect(m_pRunTimeTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(maxRunTimeExpired()));
 		m_pRunTimeTimer->start(m_pData->iMaxRunTime);
 	}
 	
 	if(m_pData->iPingTimeout > 0)
 	{
 		m_pPingTimer = new TQTimer(this);
-		connect(m_pPingTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(ping()));
+		connect(m_pPingTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(ping()));
 		m_pPingTimer->start(m_pData->iPingTimeout);
 	}
 	
@@ -155,7 +155,7 @@ void KviKvsProcessAsyncOperation::triggerSelfDelete()
 {
 	if(m_bDeletePending)return;
 	m_bDeletePending = true;
-	TQTimer::singleShot(m_pData->iMaxRunTime,this,TQT_SLOT(selfDelete()));
+	TQTimer::singleShot(m_pData->iMaxRunTime,this,TQ_SLOT(selfDelete()));
 }
 
 void KviKvsProcessAsyncOperation::selfDelete()