Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

11 files changed, 77 insertions, 77 deletions

diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index 91da5b43..57684a2b 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -46,7 +46,7 @@ KviAction::~KviAction()
 	if(m_pWidgetList)
 	{
 		for(TQWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next())
-			disconnect(b,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
+			disconnect(b,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 		m_pWidgetList->setAutoDelete(true);
 		delete m_pWidgetList;
 	}
@@ -70,7 +70,7 @@ bool KviAction::isKviUserActionNeverOverrideThis()
 void KviAction::registerAccelerator()
 {
 	if(!m_szKeySequence.isEmpty())
-		m_iAccelId = g_pFrame->registerAccelerator(m_szKeySequence,this,TQT_SLOT(activate()));
+		m_iAccelId = g_pFrame->registerAccelerator(m_szKeySequence,this,TQ_SLOT(activate()));
 }
 
 void KviAction::unregisterAccelerator()
@@ -130,18 +130,18 @@ TQPixmap * KviAction::bigIcon()
 
 void KviAction::setup()
 {
-	connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages()));
+	connect(g_pApp,TQ_SIGNAL(reloadImages()),this,TQ_SLOT(reloadImages()));
 	if(m_uFlags & InternalWindowMask)
 	{
-		connect(g_pFrame,TQT_SIGNAL(activeWindowChanged()),this,TQT_SLOT(activeWindowChanged()));
+		connect(g_pFrame,TQ_SIGNAL(activeWindowChanged()),this,TQ_SLOT(activeWindowChanged()));
 		if((m_uFlags & WindowOnlyIfUsersSelected) && (m_uFlags & (WindowChannel | WindowConsole | WindowQuery)))
-			connect(g_pFrame,TQT_SIGNAL(activeWindowSelectionStateChanged(bool)),this,TQT_SLOT(activeWindowSelectionStateChanged(bool)));
+			connect(g_pFrame,TQ_SIGNAL(activeWindowSelectionStateChanged(bool)),this,TQ_SLOT(activeWindowSelectionStateChanged(bool)));
 		activeWindowChanged();
 	} else {
 		if(m_uFlags & NeedsConnection)
 		{
-			connect(g_pFrame,TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(activeContextChanged()));
-			connect(g_pFrame,TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(activeContextStateChanged()));
+			connect(g_pFrame,TQ_SIGNAL(activeContextChanged()),this,TQ_SLOT(activeContextChanged()));
+			connect(g_pFrame,TQ_SIGNAL(activeContextStateChanged()),this,TQ_SLOT(activeContextStateChanged()));
 			KviIrcContext * c = g_pFrame->activeContext();
 			if(!c)setEnabled(false);
 			else {
@@ -161,7 +161,7 @@ void KviAction::setup()
 		} else {
 			if(m_uFlags & NeedsContext)
 			{
-				connect(g_pFrame,TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(activeContextChanged()));
+				connect(g_pFrame,TQ_SIGNAL(activeContextChanged()),this,TQ_SLOT(activeContextChanged()));
 				if(!g_pFrame->activeContext())setEnabled(false);
 				else setEnabled(true);
 			}
@@ -383,9 +383,9 @@ bool KviAction::addToPopupMenu(KviTalPopupMenu *pMenu)
 	if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
 	if(p)
 	{
-		id = pMenu->insertItem(*p,t,this,TQT_SLOT(activate()));
+		id = pMenu->insertItem(*p,t,this,TQ_SLOT(activate()));
 	} else {
-		id = pMenu->insertItem(t,this,TQT_SLOT(activate()));
+		id = pMenu->insertItem(t,this,TQ_SLOT(activate()));
 	}
 	if(!isEnabled())pMenu->setItemEnabled(id,false);
 	return true;
@@ -400,7 +400,7 @@ void KviAction::widgetDestroyed()
 
 void KviAction::registerWidget(TQWidget * b)
 {
-	connect(b,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
+	connect(b,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 	if(!m_pWidgetList)
 	{
 		m_pWidgetList = new KviPointerList<TQWidget>;
@@ -417,7 +417,7 @@ TQWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar)
 			p ? *p : TQPixmap(),
 			visibleName(),
 			visibleName(),
-			this,TQT_SLOT(activate()),pParentToolBar,m_szName);
+			this,TQ_SLOT(activate()),pParentToolBar,m_szName);
 	if(!isEnabled())b->setEnabled(false);
 	registerWidget(b);
 	return b;
diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp
index 4d92f5ee..c4af1e7e 100644
--- a/src/kvirc/kernel/kvi_actionmanager.cpp
+++ b/src/kvirc/kernel/kvi_actionmanager.cpp
@@ -85,7 +85,7 @@ KviActionManager::~KviActionManager()
 	KviPointerHashTableIterator<TQString,KviAction> it(*m_pActions);
 	while(KviAction * a = it.current())
 	{
-		disconnect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed()));
+		disconnect(a,TQ_SIGNAL(destroyed()),this,TQ_SLOT(actionDestroyed()));
 		++it;
 	}
 	delete m_pActions;
@@ -249,7 +249,7 @@ void KviActionManager::delayedRegisterAccelerators()
 bool KviActionManager::registerAction(KviAction * a)
 {
 	if(m_pActions->find(a->name()))return false;
-	connect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed()));
+	connect(a,TQ_SIGNAL(destroyed()),this,TQ_SLOT(actionDestroyed()));
 	m_pActions->insert(a->name(),a);
 	if(g_pFrame)a->registerAccelerator(); // otherwise it is delayed!
 	return true;
@@ -265,7 +265,7 @@ bool KviActionManager::unregisterAction(const TQString &szName)
 {
 	KviAction * a = m_pActions->find(szName);
 	if(!a)return false;
-	disconnect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed()));
+	disconnect(a,TQ_SIGNAL(destroyed()),this,TQ_SLOT(actionDestroyed()));
 	a->unregisterAccelerator();
 	return m_pActions->remove(szName);
 }
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 0cfc7b7b..bf309864 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -1056,7 +1056,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
 				delete g_pKdeDesktopBackground;
                 g_pKdeDesktopBackground = 0;
 				// this signal shouldn't be connected ,but well.. let's make sure
-				disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int)));
+				disconnect(this,TQ_SIGNAL(backgroundChanged(int)),this,TQ_SLOT(kdeRootPixmapChanged(int)));
 			}
 			g_pKdeDesktopBackground = 0;
 
@@ -1074,7 +1074,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
 		    TQString name = TQString("DESKTOP%1").arg(rinfo.currentDesktop());
 
 			g_pKdeDesktopBackground = new TDESharedPixmap();
-			connect(g_pKdeDesktopBackground,TQT_SIGNAL(done(bool)),this,TQT_SLOT(kdeRootPixmapDownloadComplete(bool)));
+			connect(g_pKdeDesktopBackground,TQ_SIGNAL(done(bool)),this,TQ_SLOT(kdeRootPixmapDownloadComplete(bool)));
 
 		    if(!(g_pKdeDesktopBackground->isAvailable(name)))
 			{
@@ -1091,7 +1091,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
 				client->send("kdesktop","KBackgroundIface","setExport(int)",data);
 				m_bUpdatePseudoTransparencyPending = true;
 				// Now wait a while and try again....
-				TQTimer::singleShot(500,this,TQT_SLOT(updatePseudoTransparency()));
+				TQTimer::singleShot(500,this,TQ_SLOT(updatePseudoTransparency()));
 				return;
 			}
 
@@ -1116,7 +1116,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
 			g_pKdeDesktopBackground = 0;
 		}
 		// forget the backgroundChanged signal (will do nothing if it is not connected)
-		disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int)));
+		disconnect(this,TQ_SIGNAL(backgroundChanged(int)),this,TQ_SLOT(kdeRootPixmapChanged(int)));
 #endif //COMPILE_TDE_SUPPORT
 		if(g_pShadedParentGlobalDesktopBackground)
 		{
@@ -1134,7 +1134,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
 	{
 		if(m_bUpdatePseudoTransparencyPending)return;
 		m_bUpdatePseudoTransparencyPending = true;
-		TQTimer::singleShot(0,this,TQT_SLOT(updatePseudoTransparency()));
+		TQTimer::singleShot(0,this,TQ_SLOT(updatePseudoTransparency()));
 	}
 
 #ifdef COMPILE_TDE_SUPPORT
@@ -1263,9 +1263,9 @@ void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess)
 			// create shaded copies...
 			createGlobalBackgrounds(g_pKdeDesktopBackground);
 			// make sure that this signal is not connected twice
-			disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int)));
+			disconnect(this,TQ_SIGNAL(backgroundChanged(int)),this,TQ_SLOT(kdeRootPixmapChanged(int)));
 			// connect it
-			connect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int)));
+			connect(this,TQ_SIGNAL(backgroundChanged(int)),this,TQ_SLOT(kdeRootPixmapChanged(int)));
 		}
 		delete g_pKdeDesktopBackground;
 		g_pKdeDesktopBackground = 0;
@@ -1308,7 +1308,7 @@ void KviApp::triggerUpdateGui()
 {
 	if(m_bUpdateGuiPending)return;
 	m_bUpdateGuiPending = true;
-	TQTimer::singleShot(0,this,TQT_SLOT(updateGui()));
+	TQTimer::singleShot(0,this,TQ_SLOT(updateGui()));
 }
 
 void KviApp::updateGui()
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 9650e6d3..e37fb3a8 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -108,7 +108,7 @@ void register_core_actions(KviActionManager * m)
 		__smallicon, \
 		__flags, \
 		__accel); \
-	TQObject::connect(a,TQT_SIGNAL(activated()),__object,__slot); \
+	TQObject::connect(a,TQ_SIGNAL(activated()),__object,__slot); \
 	m->registerAction(a)
 	
 	SCRIPT_ACTION(
@@ -381,7 +381,7 @@ void register_core_actions(KviActionManager * m)
 	SLOT_ACTION(
 		KVI_COREACTION_CASCADEWINDOWS,
 		g_pFrame->mdiManager(),
-		TQT_SLOT(cascadeMaximized()),
+		TQ_SLOT(cascadeMaximized()),
 		__tr2qs("Cascade windows"),
 		__tr2qs("Arranges the MDI windows in a maximized-cascade fashion"),
 		KviActionManager::categoryGUI(),
@@ -393,7 +393,7 @@ void register_core_actions(KviActionManager * m)
 	SLOT_ACTION(
 		KVI_COREACTION_TILEWINDOWS,
 		g_pFrame->mdiManager(),
-		TQT_SLOT(tile()),
+		TQ_SLOT(tile()),
 		__tr2qs("Tile windows"),
 		__tr2qs("Tiles the MDI windows with the currently selected tile method"),
 		KviActionManager::categoryGUI(),
@@ -405,7 +405,7 @@ void register_core_actions(KviActionManager * m)
 	SLOT_ACTION(
 		KVI_COREACTION_MINIMIZEALLWINDOWS,
 		g_pFrame->mdiManager(),
-		TQT_SLOT(minimizeAll()),
+		TQ_SLOT(minimizeAll()),
 		__tr2qs("Minimize all windows"),
 		__tr2qs("Minimized all the currently visible MDI windows"),
 		KviActionManager::categoryGUI(),
@@ -417,7 +417,7 @@ void register_core_actions(KviActionManager * m)
 	SLOT_ACTION(
 		KVI_COREACTION_NEWIRCCONTEXT,
 		g_pFrame,
-		TQT_SLOT(newConsole()),
+		TQ_SLOT(newConsole()),
 		__tr2qs("New IRC Context"),
 		__tr2qs("Creates a new IRC context console"),
 		KviActionManager::categoryIrc(),
@@ -429,7 +429,7 @@ void register_core_actions(KviActionManager * m)
 	SLOT_ACTION(
 		KVI_COREACTION_QUITKVIRC,
 		g_pApp,
-		TQT_SLOT(quit()),
+		TQ_SLOT(quit()),
 		__tr2qs("Quit KVIrc"),
 		__tr2qs("Quits KVIrc closing all the current connections"),
 		KviActionManager::categoryGeneric(),
@@ -457,11 +457,11 @@ KviIrcContextDisplayAction::KviIrcContextDisplayAction(TQObject * pParent)
 void KviIrcContextDisplayAction::setup()
 {
 	KviAction::setup();
-	connect(g_pFrame,TQT_SIGNAL(activeConnectionServerInfoChanged()),this,TQT_SLOT(activeContextStateChanged()));
-	connect(g_pFrame,TQT_SIGNAL(activeConnectionNickNameChanged()),this,TQT_SLOT(activeContextStateChanged()));
-	connect(g_pFrame,TQT_SIGNAL(activeConnectionUserModeChanged()),this,TQT_SLOT(activeContextStateChanged()));
-	connect(g_pFrame,TQT_SIGNAL(activeConnectionAwayStateChanged()),this,TQT_SLOT(activeContextStateChanged()));
-	connect(g_pFrame,TQT_SIGNAL(activeConnectionLagChanged()),this,TQT_SLOT(activeContextStateChanged()));
+	connect(g_pFrame,TQ_SIGNAL(activeConnectionServerInfoChanged()),this,TQ_SLOT(activeContextStateChanged()));
+	connect(g_pFrame,TQ_SIGNAL(activeConnectionNickNameChanged()),this,TQ_SLOT(activeContextStateChanged()));
+	connect(g_pFrame,TQ_SIGNAL(activeConnectionUserModeChanged()),this,TQ_SLOT(activeContextStateChanged()));
+	connect(g_pFrame,TQ_SIGNAL(activeConnectionAwayStateChanged()),this,TQ_SLOT(activeContextStateChanged()));
+	connect(g_pFrame,TQ_SIGNAL(activeConnectionLagChanged()),this,TQ_SLOT(activeContextStateChanged()));
 }
 
 bool KviIrcContextDisplayAction::addToPopupMenu(KviTalPopupMenu *p)
@@ -642,30 +642,30 @@ bool KviConnectAction::addToPopupMenu(KviTalPopupMenu *p)
 			case KviIrcContext::Idle:
 				t = m_szConnectString;
 				if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
-				p->insertItem(t,this,TQT_SLOT(activate()));
+				p->insertItem(t,this,TQ_SLOT(activate()));
 			break;
 			case KviIrcContext::Connecting:
 			case KviIrcContext::LoggingIn:
 				t = m_szAbortConnectionString;
 				if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
-				p->insertItem(t,this,TQT_SLOT(activate()));
+				p->insertItem(t,this,TQ_SLOT(activate()));
 			break;
 			case KviIrcContext::Connected:
 				t = m_szDisconnectString;
 				if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
-				p->insertItem(t,this,TQT_SLOT(activate()));
+				p->insertItem(t,this,TQ_SLOT(activate()));
 			break;
 			default:
 				t = m_szConnectString;
 				if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
-				id = p->insertItem(t,this,TQT_SLOT(activate()));
+				id = p->insertItem(t,this,TQ_SLOT(activate()));
 				p->setItemEnabled(id,false);
 			break;
 		}
 	} else {
 		t = m_szConnectString;
 		if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
-		id = p->insertItem(t,this,TQT_SLOT(activate()));
+		id = p->insertItem(t,this,TQ_SLOT(activate()));
 		p->setItemEnabled(id,false);
 	}
 	return true;
@@ -678,7 +678,7 @@ TQWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t)
 			*(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)),
 			m_szConnectString,
 			m_szConnectString,
-			this,TQT_SLOT(activate()),t,name());
+			this,TQ_SLOT(activate()),t,name());
 	registerWidget(b);
 	activeContextStateChanged();
 	return b;
@@ -723,8 +723,8 @@ void KviSubmenuAction::setup()
 	if(!m_pPopup)
 	{
 		m_pPopup = new KviTalPopupMenu();
-		connect(m_pPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(popupAboutToShow()));
-		connect(m_pPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(popupActivated(int)));
+		connect(m_pPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(popupAboutToShow()));
+		connect(m_pPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(popupActivated(int)));
 	}
 }
 
@@ -751,7 +751,7 @@ TQWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t)
 			*(bigIcon()),
 			visibleName(),
 			visibleName(),
-			this,TQT_SLOT(activate()),t,name());
+			this,TQ_SLOT(activate()),t,name());
 	b->setPopup(m_pPopup);
 	
 	b->setShowSubmenuIndicator(true);
@@ -1049,7 +1049,7 @@ void KviGoAwayAction::setup()
 	KviKvsAction::setup();
 	m_szAwayString = __tr2qs("Enter Away Mode");
 	m_szBackString = __tr2qs("Leave Away Mode");
-	connect(g_pFrame,TQT_SIGNAL(activeConnectionAwayStateChanged()),this,TQT_SLOT(activeContextStateChanged()));
+	connect(g_pFrame,TQ_SIGNAL(activeConnectionAwayStateChanged()),this,TQ_SLOT(activeContextStateChanged()));
 }
 
 bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p)
@@ -1066,22 +1066,22 @@ bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p)
 			{
 				t = m_szBackString;
 				if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
-				p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),t,this,TQT_SLOT(activate()));
+				p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),t,this,TQ_SLOT(activate()));
 			} else {
 				t = m_szAwayString;
 				if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
-				p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQT_SLOT(activate()));
+				p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQ_SLOT(activate()));
 			}
 		} else {
 			t = m_szAwayString;
 			if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
-			id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQT_SLOT(activate()));
+			id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQ_SLOT(activate()));
 			p->setItemEnabled(id,false);
 		}
 	} else {
 		t = m_szAwayString;
 		if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence;
-		id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQT_SLOT(activate()));
+		id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQ_SLOT(activate()));
 		p->setItemEnabled(id,false);
 	}
 	return true;
@@ -1094,7 +1094,7 @@ TQWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t)
 			*(g_pIconManager->getBigIcon("kvi_bigicon_nokeyboard.png")),
 			m_szAwayString,
 			m_szAwayString,
-			this,TQT_SLOT(activate()),t,name());
+			this,TQ_SLOT(activate()),t,name());
 	registerWidget(b);
 	activeContextStateChanged();
 	return b;
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index 3bc1c362..6d9f328a 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -549,7 +549,7 @@ void KviIconManager::showIconWidget()
 	if(!m_pIconWidget)
 	{
 		m_pIconWidget = new KviIconWidget();
-		connect(m_pIconWidget,TQT_SIGNAL(closed()),this,TQT_SLOT(iconWidgetClosed()));
+		connect(m_pIconWidget,TQ_SIGNAL(closed()),this,TQ_SLOT(iconWidgetClosed()));
 	}
 	m_pIconWidget->show();
 	m_pIconWidget->raise();
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index ea100f08..22b3b2d7 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -109,7 +109,7 @@ KviIrcConnection::~KviIrcConnection()
 	m_bIdentdAttached = false;
 	if(m_pLocalhostDns)
 	{
-		TQObject::disconnect(m_pLocalhostDns,TQT_SIGNAL(lookupDone(KviDns *)),0,0);
+		TQObject::disconnect(m_pLocalhostDns,TQ_SIGNAL(lookupDone(KviDns *)),0,0);
 		if(m_pLocalhostDns->isRunning())
 		{
 			g_pGarbageCollector->collect(m_pLocalhostDns);
@@ -600,7 +600,7 @@ void KviIrcConnection::delayedStartNotifyList()
 
 	if(m_pNotifyListTimer)delete m_pNotifyListTimer;
 	m_pNotifyListTimer = new TQTimer();
-	connect(m_pNotifyListTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(restartNotifyList()));
+	connect(m_pNotifyListTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(restartNotifyList()));
 	m_pNotifyListTimer->start(15000,true);
 
 	// This delay is large enough to fire after the MOTD has been sent,
@@ -805,7 +805,7 @@ void KviIrcConnection::userInfoReceived(const TQString &szUserName,const TQStrin
 			// look it up too
 			if(m_pLocalhostDns)delete m_pLocalhostDns; // it could be only another local host lookup
 			m_pLocalhostDns = new KviDns();
-			connect(m_pLocalhostDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(hostNameLookupTerminated(KviDns *)));
+			connect(m_pLocalhostDns,TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(hostNameLookupTerminated(KviDns *)));
 
 			if(!m_pLocalhostDns->lookup(szHostName,KviDns::Any))
 			{
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index c25c45aa..117fcc12 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -127,7 +127,7 @@ void KviIrcConnectionTargetResolver::start(KviIrcConnectionTarget * t)
 		m_pStartTimer = 0;
 	}
 	m_pStartTimer = new TQTimer(this);
-	connect(m_pStartTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(asyncStartResolve()));
+	connect(m_pStartTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(asyncStartResolve()));
 
 	m_pTarget = t;
 
@@ -228,7 +228,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 			}
 	
 			m_pProxyDns = new KviDns();
-			connect(m_pProxyDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(proxyLookupTerminated(KviDns *)));
+			connect(m_pProxyDns,TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(proxyLookupTerminated(KviDns *)));
 	
 			if(!m_pProxyDns->lookup(m_pTarget->proxy()->m_szHostname.ptr(),
 				m_pTarget->proxy()->isIpV6() ? KviDns::IpV6 : KviDns::IpV4))
@@ -345,8 +345,8 @@ void KviIrcConnectionTargetResolver::lookupServerHostname()
 				m_pServerDns = 0;
 			}
 			m_pServerDns = new KviDns();
-			connect(m_pServerDns,TQT_SIGNAL(lookupDone(KviDns *)),this,
-				TQT_SLOT(serverLookupTerminated(KviDns *)));
+			connect(m_pServerDns,TQ_SIGNAL(lookupDone(KviDns *)),this,
+				TQ_SLOT(serverLookupTerminated(KviDns *)));
 			if(!m_pServerDns->lookup(m_pTarget->server()->m_szHostname,
 				m_pTarget->server()->isIpV6() ? KviDns::IpV6 : KviDns::IpV4))
 			{
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index 183b46ca..2195a109 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -808,7 +808,7 @@ void KviIrcContext::beginAsynchronousConnect(unsigned int uDelayInMSecs)
 {
 	if(m_pReconnectTimer)delete m_pReconnectTimer;
 	m_pReconnectTimer = new TQTimer(this);
-	connect(m_pReconnectTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(asynchronousConnect()));
+	connect(m_pReconnectTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(asynchronousConnect()));
 	m_pReconnectTimer->start(uDelayInMSecs);
 }
 
diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp
index 4f845060..3d9e0451 100644
--- a/src/kvirc/kernel/kvi_irclink.cpp
+++ b/src/kvirc/kernel/kvi_irclink.cpp
@@ -133,7 +133,7 @@ void KviIrcLink::createSocket(const TQString &szLinkFilterName)
 
 	if(m_pLinkFilter)
 	{
-		connect(m_pLinkFilter,TQT_SIGNAL(destroyed()),this,TQT_SLOT(linkFilterDestroyed()));
+		connect(m_pLinkFilter,TQ_SIGNAL(destroyed()),this,TQ_SLOT(linkFilterDestroyed()));
 		m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
 			__tr2qs("Using filtered IRC protocol: Link filter is \"%Q\""),&szLinkFilterName);
 		return;
@@ -167,7 +167,7 @@ void KviIrcLink::start()
 	m_eState = Connecting;
 	if(m_pResolver)delete m_pResolver; // this should never happen
 	m_pResolver = new KviIrcConnectionTargetResolver(m_pConnection);
-	connect(m_pResolver,TQT_SIGNAL(terminated()),this,TQT_SLOT(resolverTerminated()));
+	connect(m_pResolver,TQ_SIGNAL(terminated()),this,TQ_SLOT(resolverTerminated()));
 	m_pResolver->start(m_pTarget);
 }
 
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index f82e749f..3c87453e 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -104,7 +104,7 @@ KviIrcSocket::KviIrcSocket(KviIrcLink * pLink)
 	m_bInProcessData = false;
 
 	m_pFlushTimer    = new TQTimer(); // queue flush timer
-	connect(m_pFlushTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(flushSendQueue()));
+	connect(m_pFlushTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(flushSendQueue()));
 }
 
 KviIrcSocket::~KviIrcSocket()
@@ -375,13 +375,13 @@ int KviIrcSocket::startConnection(KviIrcServer *srv,KviProxy * prx,const char *
 
 	// and setup the WRITE notifier...
 	m_pWsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write);
-	TQObject::connect(m_pWsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(writeNotifierFired(int)));
+	TQObject::connect(m_pWsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(writeNotifierFired(int)));
 	m_pWsn->setEnabled(true);
 
 	// set the timer
 	if(KVI_OPTION_UINT(KviOption_uintIrcSocketTimeout) < 5)KVI_OPTION_UINT(KviOption_uintIrcSocketTimeout) = 5;
 	m_pTimeoutTimer = new TQTimer();
-	TQObject::connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectionTimedOut()));
+	TQObject::connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectionTimedOut()));
 	m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintIrcSocketTimeout) * 1000,true);
 
 	// and wait for connect
@@ -458,7 +458,7 @@ void KviIrcSocket::connectedToProxy()
 
 	m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read);
 		
-	TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readProxyData(int)));
+	TQObject::connect(m_pRsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readProxyData(int)));
 
 	switch(m_pProxy->protocol())
 	{
@@ -741,7 +741,7 @@ void KviIrcSocket::proxyLoginV5()
 	// The VER field is set to X'05' for this version of the protocol.  The
 	// NMETHODS field contains the number of method identifier octets that
 	// appear in the METHODS field.
-	// The values currently defined for TQT_METHOD are:
+	// The values currently defined for METHOD are:
 	//
 	//      o  X'00' NO AUTHENTICATION REQUIRED
 	//      o  X'01' GSSAPI
@@ -966,18 +966,18 @@ void KviIrcSocket::proxyHandleV5AuthReply(unsigned char reply)
 void KviIrcSocket::proxyHandleV5MethodReply(unsigned char reply)
 {
 	//   The server selects from one of the methods given in METHODS, and
-	//   sends a TQT_METHOD selection message:
+	//   sends a METHOD selection message:
 	//
 	//                            +----+--------+
-	//                            |VER | TQT_METHOD |
+	//                            |VER | METHOD |
 	//                            +----+--------+
 	//                            | 1  |   1    |
 	//                            +----+--------+
 	//
-	//   If the selected TQT_METHOD is X'FF', none of the methods listed by the
+	//   If the selected METHOD is X'FF', none of the methods listed by the
 	//   client are acceptable, and the client MUST close the connection.
 	//
-	// The values currently defined for TQT_METHOD are:
+	// The values currently defined for METHOD are:
 	//
 	//      o  X'00' NO AUTHENTICATION REQUIRED
 	//      o  X'01' GSSAPI
@@ -1179,7 +1179,7 @@ void KviIrcSocket::proxyHandleHttpFinalReply(const char * buffer,int bufLen)
 	}
 
 	m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read);
-	TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readHttpProxyErrorData(int)));
+	TQObject::connect(m_pRsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readHttpProxyErrorData(int)));
 	m_pRsn->setEnabled(true);
 	
 	setState(ProxyHttpError);
@@ -1269,12 +1269,12 @@ void KviIrcSocket::doSSLHandshake(int)
 		break;
 		case KviSSL::WantRead:
 			m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read);
-			TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int)));
+			TQObject::connect(m_pRsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int)));
 			m_pRsn->setEnabled(true);
 		break;
 		case KviSSL::WantWrite:
 			m_pWsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write);
-			TQObject::connect(m_pWsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int)));
+			TQObject::connect(m_pWsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int)));
 			m_pWsn->setEnabled(true);
 		break;
 		case KviSSL::RemoteEndClosedConnection:
@@ -1297,7 +1297,7 @@ void KviIrcSocket::doSSLHandshake(int)
 			} else {
 				// can recover ? (EAGAIN , EINTR ?)
 				m_pWsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write);
-				TQObject::connect(m_pWsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int)));
+				TQObject::connect(m_pWsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int)));
 				m_pWsn->setEnabled(true);
 				return;
 			}
@@ -1341,7 +1341,7 @@ void KviIrcSocket::linkUp()
 	}
 
 	m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read);
-	TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readData(int)));
+	TQObject::connect(m_pRsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readData(int)));
 	m_pRsn->setEnabled(true);
 	
 	// yahoo!
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index 2903a95d..aef09c47 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -330,11 +330,11 @@ KviIsOnNotifyListManager::KviIsOnNotifyListManager(KviIrcConnection * pConnectio
 	m_pUserhostList = new KviPointerList<TQString>;
 	m_pUserhostList->setAutoDelete(true);
 	m_pDelayedNotifyTimer = new TQTimer();
-	connect(m_pDelayedNotifyTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(newNotifySession()));
+	connect(m_pDelayedNotifyTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(newNotifySession()));
 	m_pDelayedIsOnTimer = new TQTimer();
-	connect(m_pDelayedIsOnTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(newIsOnSession()));
+	connect(m_pDelayedIsOnTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(newIsOnSession()));
 	m_pDelayedUserhostTimer = new TQTimer();
-	connect(m_pDelayedUserhostTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(newUserhostSession()));
+	connect(m_pDelayedUserhostTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(newUserhostSession()));
 	m_bRunning = false;
 }