Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

27 files changed, 205 insertions, 205 deletions

diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index badaf18b..fd5dbd1c 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -59,13 +59,13 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 	//b->setMinimumWidth(m_pCancel->sizeHint().width());
 	g->addWidget(b,1,1);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 
 	m_pCancel = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	KviTalToolTip::add(m_pCancel,__tr2qs_ctx("Close this dialog, discarding all changes.","options"));
 	g->addWidget(m_pCancel,1,2);
-	connect(m_pCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(m_pCancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	m_pCancel->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 
 
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index f446277d..4dd17505 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -192,19 +192,19 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 	m_pListView->header()->hide();
 	m_pListView->setRootIsDecorated(true);
 	m_pListView->setSorting(-1);
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
 
 	KviTalHBox * hbox = new KviTalHBox(vbox);
 	vbox->setSpacing(2);
 	vbox->setMargin(0);
 
 	m_pSearchLineEdit = new TQLineEdit(hbox);
-	connect(m_pSearchLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(searchClicked()));
+	connect(m_pSearchLineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(searchClicked()));
 	m_pSearchButton = new KviStyledToolButton(hbox);
 	m_pSearchButton->setUsesBigPixmap(false);
 	m_pSearchButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)));
-	connect(m_pSearchButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchClicked()));
-	connect(m_pSearchLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(searchLineEditTextChanged(const TQString &)));
+	connect(m_pSearchButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(searchClicked()));
+	connect(m_pSearchLineEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(searchLineEditTextChanged(const TQString &)));
 
 #ifdef COMPILE_INFO_TIPS
 	TQString szTip = __tr2qs_ctx("<p>This is the search tool for this options dialog.</p>" \
@@ -240,14 +240,14 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","options"),this,"btnok");
 	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options"));
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	//b->setMinimumWidth(whatIsThisWidth);
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g1->addWidget(b,1,2);	
 
 	b = new TQPushButton(__tr2qs_ctx("&Apply","options"),this,"btnapply");
 	KviTalToolTip::add(b,__tr2qs_ctx("Commit all changes immediately.","options"));
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g1->addWidget(b,1,3);
 
@@ -255,7 +255,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, discarding all changes.","options"));
 	b->setDefault(true);
 	//b->setMinimumWidth(whatIsThisWidth);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g1->addWidget(b,1,4);
 
@@ -280,7 +280,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 	}
 
 	KviAccel *a = new KviAccel( this );
-        a->connectItem( a->insertItem(TQt::Key_Escape), this,TQT_SLOT(close()) );
+        a->connectItem( a->insertItem(TQt::Key_Escape), this,TQ_SLOT(close()) );
 	
 }
 
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index d08b7a2a..0e326d9f 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -3462,7 +3462,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 			{
 				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
 				{
-					disconnect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
+					disconnect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 					delete e->pWidget->parent();
 					e->pWidget =  0;
 				} else {
@@ -3502,7 +3502,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	{
 		e->pWidget = e->createProc(par);
 		g_iOptionWidgetInstances++;
-		connect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
+		connect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 	}
 	if(e->pWidget->parent() != par)
 	{
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 2ba98233..ea27a764 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -228,7 +228,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	{
 		if(g_pSplashScreen->isVisible()) // another bug: this ALWAYS RETURNS TRUE, even if the splash was hidden by a mouse click...
 		{
-			TQObject::connect(g_pSplashScreen,TQT_SIGNAL(destroyed()),wc,TQT_SLOT(show()));
+			TQObject::connect(g_pSplashScreen,TQ_SIGNAL(destroyed()),wc,TQ_SLOT(show()));
 			return true;
 		}
 	}
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index ac4926b5..5c0cbb78 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -310,7 +310,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 			{
 				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
 				{
-					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
+					disconnect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 					delete e->pWidget->parent();
 					e->pWidget =  0;
 				} else {
@@ -350,7 +350,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	{
 		e->pWidget = e->createProc(par);
 		g_iOptionWidgetInstances++;
-		connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
+		connect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed()));
 	}
 	if(e->pWidget->parent() != par)
 	{
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index 026dcdd9..972cdc68 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -38,9 +38,9 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent)
 
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options"));
 	m_b1 = addBoolSelector(g,__tr2qs_ctx("Private messages","options"),KviOption_boolUseAntiSpamOnPrivmsg);
-	connect(m_b1,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(reenableStuff(bool)));
+	connect(m_b1,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(reenableStuff(bool)));
 	m_b2 = addBoolSelector(g,__tr2qs_ctx("Private notices","options"),KviOption_boolUseAntiSpamOnNotice);
-	connect(m_b2,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(reenableStuff(bool)));
+	connect(m_b2,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(reenableStuff(bool)));
 
 	m_b3 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Silent anti-spam (no warnings)","options"),KviOption_boolSilentAntiSpam);
 	m_sl = addStringListSelector(0,2,0,2,__tr2qs_ctx("Words considered spam:","options"),KviOption_stringlistSpamWords);
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index 7b578bda..aaa8d319 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -48,18 +48,18 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent
 	addBoolSelector(g,__tr2qs_ctx("Do not scale avatar if it is less than required size","options"),KviOption_boolDoNotStretchAvatars);
 	
 	KviUIntSelector *u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintAvatarScaleWidth,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintAvatarScaleHeight,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	//2nd
 	g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Scaling on load (and in user tooltips)","options"));
 	b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images on image load","options"),KviOption_boolScaleAvatarsOnLoad);
 	
 	u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintScaleAvatarsOnLoadWidth,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintScaleAvatarsOnLoadHeight,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	// 2st Box
 	KviTalGroupBox *gs = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Request CTCP","options"));
@@ -78,7 +78,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent
 			"will be automatically requested.<br>" \
 			"A reasonable value might be 102400 bytes (100 K).</center>","options"));
 #endif
-	connect(bs,TQT_SIGNAL(toggled(bool)),us,TQT_SLOT(setEnabled(bool)));
+	connect(bs,TQ_SIGNAL(toggled(bool)),us,TQ_SLOT(setEnabled(bool)));
 
 	bs = addBoolSelector(gs,__tr2qs_ctx("Automatically accept incoming avatars","options"),KviOption_boolAutoAcceptIncomingAvatars);
 #ifdef COMPILE_INFO_TIPS
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index 2b6610ae..f8d7cb37 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -42,11 +42,11 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * parent)
 
 	KviTalGroupBox *g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Away Nickname","options"));
 	m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway);	
-	connect(m_pEnableAwayNick,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCustomAwayText(bool)));
+	connect(m_pEnableAwayNick,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableCustomAwayText(bool)));
 	
 	m_pEnableCustomAwayNick = addBoolSelector(g,__tr2qs_ctx("Use automatic nickname ([5 letters]AWAY)","options"),KviOption_boolAutoGeneratedAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway));
-	connect(m_pEnableAwayNick,TQT_SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,TQT_SLOT(setEnabled(bool)));
-	connect(m_pEnableCustomAwayNick,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCustomAwayText(bool)));
+	connect(m_pEnableAwayNick,TQ_SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,TQ_SLOT(setEnabled(bool)));
+	connect(m_pEnableCustomAwayNick,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableCustomAwayText(bool)));
 	
 	// m_p <-- stands for pointer
 	// m_sz <-- stands for a string :)
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 577529ac..f65a52dd 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -89,13 +89,13 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent)
 	KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Maximum attempts (0: unlimited):","options"),
 			KviOption_uintMaxAutoReconnectAttempts,0,100,5,
 			KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	u = addUIntSelector(gbox,__tr2qs_ctx("Delay between attempts:","options"),
 			KviOption_uintAutoReconnectDelay,0,86400,5,
 			KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect));
 	u->setSuffix(__tr2qs_ctx(" sec","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 sec</b><br>Maximum value: <b>86400 sec</b></center>","options"));
 #endif
@@ -126,20 +126,20 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * parent)
 		&(KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)),true);
 	KviFileSelector * f = addFileSelector(gbox,__tr2qs_ctx("Certificate location:","options"),
 		&(KVI_OPTION_STRING(KviOption_stringSSLCertificatePath)),KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate));
-	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),f,TQ_SLOT(setEnabled(bool)));
 	KviPasswordSelector * p = new KviPasswordSelector(gbox,__tr2qs_ctx("Certificate password:","options"),
 		&(KVI_OPTION_STRING(KviOption_stringSSLCertificatePass)),KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate));
-	connect(b,TQT_SIGNAL(toggled(bool)),p,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),p,TQ_SLOT(setEnabled(bool)));
 
 	gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Private Key","options"));
 	b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL private key","options"),
 		&(KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)),true);
 	f = addFileSelector(gbox,__tr2qs_ctx("Private key location:","options"),
 		&(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPath)),KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey));
-	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),f,TQ_SLOT(setEnabled(bool)));
 	p = addPasswordSelector(gbox,__tr2qs_ctx("Private key password:","options"),
 		&(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass)),KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey));
-	connect(b,TQT_SIGNAL(toggled(bool)),p,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),p,TQ_SLOT(setEnabled(bool)));
 	addRowSpacer(0,2,0,2);
 #else
 	createLayout(1,1);
@@ -174,17 +174,17 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * parent)
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>10000 usec</b><br>Maximum value: <b>10000000 usec</b></center>","options"));
 #endif
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	g = addGroupBox(0,3,0,3,2,TQt::Horizontal,__tr2qs_ctx("Network Interfaces","options"));
 	
 	b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress);
 	KviStringSelector * s = addStringSelector(g,"",KviOption_stringIpV4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 #ifdef COMPILE_IPV6_SUPPORT
 	b = addBoolSelector(g,__tr2qs_ctx("Bind IPv6 connections to:","options"),KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress);
 	s = addStringSelector(g,"",KviOption_stringIpV6ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 #endif //!COMPILE_IPV6_SUPPORT
 
 	addRowSpacer(0,4,0,4);
@@ -208,10 +208,10 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent)
 	createLayout(6,1);
 
 	m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable ident service (bad practice on UNIX!)","options"),KviOption_boolUseIdentService);
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableIpv4InIpv6(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableIpv4InIpv6(bool)));
 
 	KviTalGroupBox * gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Output verbosity","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),gbox,TQ_SLOT(setEnabled(bool)));
 
 	addLabel(gbox,__tr2qs_ctx("Output identd messages to:","options"));
 
@@ -235,30 +235,30 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent)
 	gbox = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 	
 	KviBoolSelector *b = addBoolSelector(gbox,__tr2qs_ctx("Enable ident service only while connecting to server","options"),KviOption_boolUseIdentServiceOnlyOnConnect);
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setEnabled(bool)));
 
 	KviStringSelector * s = addStringSelector(gbox,__tr2qs_ctx("Ident username:","options"),
 		KviOption_stringIdentdUser,KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 	
 	KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Service port:","options"),
 		KviOption_uintIdentdPort,0,65535,113,KVI_OPTION_BOOL(KviOption_boolUseIdentService));
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),gbox,TQ_SLOT(setEnabled(bool)));
 
 	gbox = addGroupBox(0,3,0,3,1,TQt::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 	m_pEnableIpv6 = addBoolSelector(gbox,__tr2qs_ctx("Enable service for IPv6","options"),
 		KviOption_boolIdentdEnableIpV6,
 		KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 #ifdef COMPILE_IPV6_SUPPORT
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),m_pEnableIpv6,TQT_SLOT(setEnabled(bool)));
-	connect(m_pEnableIpv6,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableIpv4InIpv6(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),m_pEnableIpv6,TQ_SLOT(setEnabled(bool)));
+	connect(m_pEnableIpv6,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableIpv4InIpv6(bool)));
 #else
 	m_pEnableIpv6->setEnabled(false);
 #endif
 	m_pIpv4InIpv6 = addBoolSelector(gbox,__tr2qs_ctx("IP stack treats IPv4 as part of IPv6 namespace","options"),
 		KviOption_boolIdentdIpV6ContainsIpV4,
 		KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolIdentdEnableIpV6));
-	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),gbox,TQ_SLOT(setEnabled(bool)));
 
 	addLabel(0,4,0,4,
 #ifdef COMPILE_ON_WINDOWS
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index 99a47f47..56cdf0c1 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -85,13 +85,13 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidge
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 requests</b><br>Maximum value: <b>10000 requests</b></center>","options"));
 #endif
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	u = addUIntSelector(1,1,1,1,__tr2qs_ctx("within:","options"),KviOption_uintCtcpFloodCheckInterval,1,3600,6,KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection));
 	u->setSuffix(__tr2qs_ctx(" sec","options"));
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>1 sec</b><br>Maximum value: <b>3600 sec</b></center>","options"));
 #endif
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	KviTalGroupBox * g = addGroupBox(0,2,1,2,2,TQt::Horizontal,__tr2qs_ctx("Ignored Requests","options"));
 	addBoolSelector(g,__tr2qs_ctx("PING","options"),KviOption_boolIgnoreCtcpPing);
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 6e1e447f..263c4f11 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -89,7 +89,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 		"If you set it to <b>0.0.0.0</b>, KVIrc will try to use the first available IPv4 interface</center>","options"));
 #endif
 
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 
  	b = addBoolSelector(g,__tr2qs_ctx("Use user-defined port range","options"),KviOption_boolUserDefinedPortRange);
 
@@ -100,10 +100,10 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 	KviTalHBox * hb = new KviTalHBox(g);
 	hb->setSpacing(4);
 	KviUIntSelector * u = addUIntSelector(hb,__tr2qs_ctx("Lowest port:","options"),KviOption_uintDccMinPort,1,65535,5000,KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	u = addUIntSelector(hb,__tr2qs_ctx("Highest port:","options"),KviOption_uintDccMaxPort,1,65535,30000,KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	b = addBoolSelector(g,__tr2qs_ctx("Send a fixed address in requests","options"),KviOption_boolDccSendFakeAddressByDefault);
 
@@ -113,7 +113,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 #endif
 
 	s = addStringSelector(g,__tr2qs_ctx("Send address/interface:","options"),KviOption_stringDefaultDccFakeAddress,KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(s,__tr2qs_ctx("<center>This is the fixed address that will be sent with all DCC requests if you enable the option above.</center>","options"));
@@ -122,7 +122,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 	KviBoolSelector * b2;
 	b2 = addBoolSelector(g,__tr2qs_ctx("Guess address from IRC server if unroutable","options"),
 									KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable,!KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault));
-	connect(b,TQT_SIGNAL(toggled(bool)),b2,TQT_SLOT(setNotEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),b2,TQ_SLOT(setNotEnabled(bool)));
 
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b2,__tr2qs_ctx("<center>You can enable this option if you are behind a router that forwards all or a range of ports.<br>" \
@@ -139,7 +139,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
 				"It's an ugly hack - use it only if nothing else works.</center>","options"));
 #endif
 									
-	connect(b2,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool)));
+	connect(b2,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setEnabled(bool)));
 
 	b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Notify failed DCC handshakes to the remote end","options"),
 									KviOption_boolNotifyFailedDccHandshakes);
@@ -219,8 +219,8 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * parent
 
 	KviBoolSelector * b1 = addBoolSelector(0,3,0,3,__tr2qs_ctx("Always open transfer window as minimized","options"),KviOption_boolCreateMinimizedDccSend);
 
-	connect(b1,TQT_SIGNAL(toggled(bool)),b3,TQT_SLOT(setNotEnabled(bool)));
-	connect(b2,TQT_SIGNAL(toggled(bool)),b4,TQT_SLOT(setEnabled(bool)));
+	connect(b1,TQ_SIGNAL(toggled(bool)),b3,TQ_SLOT(setNotEnabled(bool)));
+	connect(b2,TQ_SIGNAL(toggled(bool)),b4,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,4,0,4);
 }
@@ -265,13 +265,13 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * pare
 	b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to","options"),KviOption_boolLimitDccSendSpeed);
 	KviUIntSelector * u = addUIntSelector(hb,"",KviOption_uintMaxDccSendSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	
 	hb = new KviTalHBox(g);
 	b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to","options"),KviOption_boolLimitDccRecvSpeed);
 	u = addUIntSelector(hb,"",KviOption_uintMaxDccRecvSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 
 	u = addUIntSelector(g,__tr2qs_ctx("Maximum number of DCC transfers","options"),KviOption_uintMaxDccSendTransfers,0,1000,10);
@@ -302,7 +302,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * pare
 #endif // COMPILE_INFO_TIPS
 
 	u = addUIntSelector(hb,"",KviOption_uintDccSendIdleStepInMSec,1,65536,30,KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep));
-	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 	u->setSuffix(__tr2qs_ctx(" msec","options"));
 	
 #ifdef COMPILE_INFO_TIPS
@@ -352,7 +352,7 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * parent)
 
 	KviBoolSelector * b1 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Always open as minimized","options"),KviOption_boolCreateMinimizedDccChat);
 
-	connect(b1,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setNotEnabled(bool)));
+	connect(b1,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setNotEnabled(bool)));
 
 	addRowSpacer(0,2,0,2);
 }
@@ -371,7 +371,7 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(TQWidget *p):KviOptionsWidget
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccVoice);
 
 	b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice));
-	connect(b1,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setNotEnabled(bool)));
+	connect(b1,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setNotEnabled(bool)));
 
 	addBoolSelector(0,2,0,2,__tr2qs_ctx("Force half-duplex mode on sound device","options"), KviOption_boolDccVoiceForceHalfDuplex);
 	addBoolSelector(0,3,0,3,__tr2qs_ctx("Volume slider controls PCM, not Master","options"), KviOption_boolDccVoiceVolumeSliderControlsPCM);
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index 52e5a64f..2016fa80 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -51,9 +51,9 @@ KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * parent)
 
 	connect(
 		addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable word highlighting","options"),KviOption_boolUseWordHighlighting),
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addStringListSelector(0,1,0,1,__tr2qs_ctx("Words to highlight:","options"),KviOption_stringlistHighlightWords,KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	addStringSelector(0,2,0,2,__tr2qs_ctx("Word splitters:","options"),KviOption_stringWordSplitters);
 	// This can be used even without Word highlighting
 	b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Highlight messages containing my nickname","options"),KviOption_boolAlwaysHighlightNick);
@@ -101,8 +101,8 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent)
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b5, __tr2qs_ctx("<center>If this option is enabled, the taskbar will also alert for messages which are shown in queries.</center>","options"));
 #endif
-	connect(b3,TQT_SIGNAL(toggled(bool)),b4,TQT_SLOT(setEnabled(bool)));
-	connect(b3,TQT_SIGNAL(toggled(bool)),b5,TQT_SLOT(setEnabled(bool)));
+	connect(b3,TQ_SIGNAL(toggled(bool)),b4,TQ_SLOT(setEnabled(bool)));
+	connect(b3,TQ_SIGNAL(toggled(bool)),b5,TQ_SLOT(setEnabled(bool)));
 
 	KviBoolSelector * b6 = addBoolSelector(g,__tr2qs_ctx("Use custom alert level","options"),KviOption_boolHighlightOnlyAtCostumHighlightLevel);
 #ifdef COMPILE_INFO_TIPS
@@ -113,7 +113,7 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent)
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b6, __tr2qs_ctx("<center>This option sets the minimum alert level for the taskbar.</center>","options"));
 #endif
-	connect(b6,TQT_SIGNAL(toggled(bool)),b7,TQT_SLOT(setEnabled(bool)));
+	connect(b6,TQ_SIGNAL(toggled(bool)),b7,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,1,0,1);
 }
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index e2e81b8c..0c3db84f 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -91,11 +91,11 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(TQWidget * par,const TQStri
 
 	TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Cancel","options"),h);
 	//g->addWidget(pb,4,2);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 
 	pb = new TQPushButton(__tr2qs_ctx("Ok","options"),h);
 	pb->setDefault(true);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept()));
 	
 	g->setColStretch(0,1);
 	
@@ -138,11 +138,11 @@ KviAvatarDownloadDialog::KviAvatarDownloadDialog(TQWidget * par,const TQString &
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("Abort","options"),this);
 	g->addWidget(b,1,1);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 
 	m_pRequest = new KviHttpRequest();
 	
-	TQTimer::singleShot(0,this,TQT_SLOT(startDownload()));
+	TQTimer::singleShot(0,this,TQ_SLOT(startDownload()));
 
 	g->setRowStretch(0,1);
 	g->setColStretch(0,1);
@@ -157,8 +157,8 @@ KviAvatarDownloadDialog::~KviAvatarDownloadDialog()
 
 void KviAvatarDownloadDialog::startDownload()
 {
-	connect(m_pRequest,TQT_SIGNAL(terminated(bool)),this,TQT_SLOT(downloadTerminated(bool)));
-	connect(m_pRequest,TQT_SIGNAL(status(const char *)),this,TQT_SLOT(downloadMessage(const char *)));
+	connect(m_pRequest,TQ_SIGNAL(terminated(bool)),this,TQ_SLOT(downloadTerminated(bool)));
+	connect(m_pRequest,TQ_SIGNAL(status(const char *)),this,TQ_SLOT(downloadMessage(const char *)));
 
 	TQString tmp = m_szUrl;
 	g_pIconManager->urlToCachedFileName(tmp);
@@ -235,18 +235,18 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(TQWidget * par,const TQString
 	g->addMultiCellWidget(m_pLineEdit,1,1,0,1);
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&Browse...","options"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFileClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseFileClicked()));
 	g->addWidget(b,1,2);
 	KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2);
 	b = new TQPushButton(__tr2qs_ctx("&OK","options"),h);
 	b->setMinimumWidth(80);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	//g->addWidget(b,2,1);
 
 	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),h);
 	b->setMinimumWidth(80);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	//g->addWidget(b,2,2);
 	
 	g->setRowStretch(0,1);
@@ -329,7 +329,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare
 	sel->setValidator(v);
 	
 	TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Alternatives...","options"),hb);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(setNickAlternatives()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(setNickAlternatives()));
 
 	sel = addStringSelector(gbox,__tr2qs_ctx("Username:","options"),KviOption_stringUsername);
 	sel->setMinimumLabelWidth(120);
@@ -519,7 +519,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
 	addWidgetToLayout(m_pAvatarPreview,0,1,0,1);
 	m_pAvatarPreview->setPixmap(m_pLocalAvatar);
 	m_pAvatarPreview->setEnabled(bHaveAvatar);
-	connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pAvatarPreview,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck,TQ_SIGNAL(toggled(bool)),m_pAvatarPreview,TQ_SLOT(setEnabled(bool)));
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pAvatarPreview,szTip);
 #endif
@@ -532,13 +532,13 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
 	m_pAvatarNameEdit->setReadOnly(true);
 	m_pAvatarNameEdit->setEnabled(bHaveAvatar);
 	m_pAvatarNameEdit->setText(KVI_OPTION_STRING(KviOption_stringMyAvatar));
-	connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pAvatarNameEdit,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck,TQ_SIGNAL(toggled(bool)),m_pAvatarNameEdit,TQ_SLOT(setEnabled(bool)));
 
 	m_pChooseAvatarButton = new TQPushButton(__tr2qs_ctx("Choose...","options"),hb);
 	m_pChooseAvatarButton->setEnabled(bHaveAvatar);
-	connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pChooseAvatarButton,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck,TQ_SIGNAL(toggled(bool)),m_pChooseAvatarButton,TQ_SLOT(setEnabled(bool)));
 
-	connect(m_pChooseAvatarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseAvatar()));
+	connect(m_pChooseAvatarButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseAvatar()));
 
 	layout()->setRowStretch(1,2);
 }
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index 3dd923e3..06a70035 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -39,7 +39,7 @@ KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * parent)
 	m_pIgnorePrivmsg = addBoolSelector(g,__tr2qs_ctx("Private/channel messages","options"),KviOption_boolEnableIgnoreOnPrivMsg);
 	m_pIgnoreNotice  = addBoolSelector(g,__tr2qs_ctx("Private/channel notices","options"),KviOption_boolEnableIgnoreOnNotice);
 
-	connect(m_pIgnorePrivmsg,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableVerbose(bool)));
+	connect(m_pIgnorePrivmsg,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableVerbose(bool)));
 
 	m_pVerboseIgnore = addBoolSelector(0,1,0,1,__tr2qs_ctx("Use verbose ignore (show messages in console)","options"),
 				KviOption_boolVerboseIgnore,
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index b745c0cd..424786b6 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -41,7 +41,7 @@ KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * parent)
 	KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication,
 							KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont));
 
-	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),f,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,3,1,3);
 }
@@ -82,22 +82,22 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
 
 	KviUIntSelector * u = addUIntSelector(0,1,1,1,__tr2qs_ctx("Child window opacity:","options"),KviOption_uintGlobalTransparencyChildFadeFactor,
 							0,100,35,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Parent window opacity:","options"),KviOption_uintGlobalTransparencyParentFadeFactor,
 							0,100,10,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool)));
 
 	KviColorSelector * c = addColorSelector(0,3,1,3,__tr2qs_ctx("Blend color:","options"),KviOption_colorGlobalTransparencyFade,
 						KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),c,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),c,TQ_SLOT(setEnabled(bool)));
 
 //	addRowSpacer(0,13,0,13);
 #ifdef COMPILE_TDE_SUPPORT
 	m_pObtainBackgroundFromKdeBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use TDE desktop for transparency","options"),KviOption_boolObtainGlobalBackgroundFromKde,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,TQT_SLOT(setEnabled(bool)));
-	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,TQ_SLOT(setEnabled(bool)));
+	connect(m_pObtainBackgroundFromKdeBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
 
 	m_pUpdateKdeBackgroundOnChangeBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Keep in sync with TDE background changes","options"),KviOption_boolUpdateKdeBackgroundOnChange,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
@@ -105,15 +105,15 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
 	layout()->setRowStretch(6,1);
-	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
+	connect(m_pObtainBackgroundFromKdeBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
 
 #else //!COMPILE_TDE_SUPPORT
 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
 	layout()->setRowStretch(4,1);
 #endif //!COMPILE_TDE_SUPPORT
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
 #else
 	createLayout(1,1);
 	addRowSpacer(0,0,0,0);
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 3c21a659..addfa7a4 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -53,7 +53,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent)
 			"the pings (if any) will be sent really less often. " \
 			"5000 is a reasonable value.</center>","options"));
 #endif
-    connect(pUse,TQT_SIGNAL(toggled(bool)),pInterval,TQT_SLOT(setEnabled(bool)));
+    connect(pUse,TQ_SIGNAL(toggled(bool)),pInterval,TQ_SLOT(setEnabled(bool)));
 
     KviUIntSelector * pAlarm = addUIntSelector(g, __tr2qs_ctx("Trigger event if lag exceeds:","options"), KviOption_uintLagAlarmTime,5000,1000000,30000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
     pAlarm->setSuffix(__tr2qs_ctx(" msec","options"));
@@ -63,15 +63,15 @@ KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent)
 			"the threshold OnLagAlarmTimeUp will be triggered and when the lag falls " \
 			"back below the threshold then OnLagAlarmTimeDown will be triggered</center>","options"));
 #endif
-    connect(pUse,TQT_SIGNAL(toggled(bool)),pAlarm,TQT_SLOT(setEnabled(bool)));
+    connect(pUse,TQ_SIGNAL(toggled(bool)),pAlarm,TQ_SLOT(setEnabled(bool)));
 
     KviBoolSelector * pShow = addBoolSelector(g, __tr2qs_ctx("Show lag in IRC context display","options"), KviOption_boolShowLagOnContextDisplay, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
 #ifdef COMPILE_INFO_TIPS
     mergeTip(pShow,__tr2qs_ctx("<center>This makes the IRC context display applet show the current lag after the user's nickname (in seconds)</center>","options"));
 #endif
 
-    connect(pUse,TQT_SIGNAL(toggled(bool)),pShow,TQT_SLOT(setEnabled(bool)));
-    connect(pUse,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool)));
+    connect(pUse,TQ_SIGNAL(toggled(bool)),pShow,TQ_SLOT(setEnabled(bool)));
+    connect(pUse,TQ_SIGNAL(toggled(bool)),g,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,2,0,2);
 
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index c4fb6943..5b1ec8a2 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -75,7 +75,7 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
 
 
 
-	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentItemChanged(KviTalListViewItem *)));
 
 	layout()->addMultiCellWidget(m_pListView,0,0,0,2);
 
@@ -132,11 +132,11 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
 	layout()->addMultiCellWidget(f,9,9,0,2);
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(newMediaType()));
 	layout()->addWidget(b,10,1);
 
 	m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this);
-	connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType()));
+	connect(m_pDelete,TQ_SIGNAL(clicked()),this,TQ_SLOT(delMediaType()));
 	layout()->addWidget(m_pDelete,10,2);
 	
 
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index b7a7a5e0..ea9dfafb 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -89,7 +89,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent)
 
 	b1 = addBoolSelector(g,__tr2qs_ctx("\"Smart\" nickname colors","options"),KviOption_boolColorNicks);
 	b2 = addBoolSelector(g,__tr2qs_ctx("Use same colors as in the userlist","options"),KviOption_boolUseUserListColorsAsNickColors,!KVI_OPTION_BOOL(KviOption_boolColorNicks));
-	connect(b1,TQT_SIGNAL(toggled(bool)),b2,TQT_SLOT(setNotEnabled(bool)));
+	connect(b1,TQ_SIGNAL(toggled(bool)),b2,TQ_SLOT(setNotEnabled(bool)));
 	addBoolSelector(g,__tr2qs_ctx("Show nicknames in bold","options"),KviOption_boolBoldedNicks);
 	addBoolSelector(g,__tr2qs_ctx("Show user and host","options"),KviOption_boolShowUserAndHostInPrivmsgView);
 	addBoolSelector(g,__tr2qs_ctx("Show channel mode prefix","options"),KviOption_boolShowChannelUserFlagInPrivmsgView);
@@ -99,23 +99,23 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent)
 
 	l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		l,
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 
 	KviTalVBox * vb = new KviTalVBox(g);
 	vb->setSpacing(5);
 
 	connect(
 		b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addStringSelector(vb,__tr2qs_ctx("Prefix:","options"),KviOption_stringExtendedPrivmsgPrefix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(
 		b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addStringSelector(vb,__tr2qs_ctx("Postfix:","options"),KviOption_stringExtendedPrivmsgPostfix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	addRowSpacer(0,3,0,3);
 }
 
@@ -130,24 +130,24 @@ KviTimestampOptionsWidget::KviTimestampOptionsWidget(TQWidget * pParent)
 	createLayout(5,1);
 	m_pUseTimestampSelector = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp);
 	
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableTimestampSelector(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableTimestampSelector(bool)));
 	KviBoolSelector* b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Use UTC time for timestamp","options"),KviOption_boolIrcViewTimestampUTC,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
 	
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setEnabled(bool)));
 	
 	KviTalHBox *hb = new KviTalHBox(this);
 	addWidgetToLayout(hb,0,2,0,2);
 	
 	m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
-	connect(m_pSpecialTimestampColorSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableTimestampSelector(bool)));
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQT_SLOT(setEnabled(bool)));
+	connect(m_pSpecialTimestampColorSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableTimestampSelector(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQ_SLOT(setEnabled(bool)));
 	
 	m_pTimestampColorSelector = addMircTextColorSelector(hb,"",KviOption_uintTimeStampForeground,KviOption_uintTimeStampBackground,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp) && KVI_OPTION_BOOL(KviOption_boolUseSpecialColorForTimestamp));
 
 	KviStringSelector * st=addStringSelector(0,3,0,3,__tr2qs_ctx("Timestamp format:","options"),KviOption_stringIrcViewTimestampFormat);
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),st,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),st,TQ_SLOT(setEnabled(bool)));
 
-	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQT_SLOT(setEnabled(bool)));
+	connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQ_SLOT(setEnabled(bool)));
 	addRowSpacer(0,4,0,4);
 }
 
@@ -418,11 +418,11 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
 	}
 
 	m_pIconButton = new KviStyledToolButton(box);
-	connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked()));
+	connect(m_pIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(iconButtonClicked()));
 
 	m_pIconPopup = new KviTalPopupMenu(this);
 	KviIconWidget * iw = new KviIconWidget(m_pIconPopup);
-	connect(iw,TQT_SIGNAL(selected(int)),this,TQT_SLOT(newIconSelected(int)));
+	connect(iw,TQ_SIGNAL(selected(int)),this,TQ_SLOT(newIconSelected(int)));
 	m_pIconPopup->insertItem(iw);
 
 
@@ -431,9 +431,9 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
 	KviTalHBox * h = new KviTalHBox(this);
 	addWidgetToLayout(h,0,1,3,1);
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("Load From...","options"),h);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(load()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(load()));
 	b = new TQPushButton(__tr2qs_ctx("Save As...","options"),h);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(save()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(save()));
 
 
 	KviMessageListViewItem * it;
@@ -446,9 +446,9 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
 	layout()->setRowStretch(0,1);
 	layout()->setColStretch(0,1);
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemChanged(KviTalListViewItem *)));
-	connect(m_pForeListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *)));
-	connect(m_pBackListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(itemChanged(KviTalListViewItem *)));
+	connect(m_pForeListBox,TQ_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQ_SLOT(colorChanged(KviTalListBoxItem *)));
+	connect(m_pBackListBox,TQ_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQ_SLOT(colorChanged(KviTalListBoxItem *)));
 
 	itemChanged(0);
 }
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 612627f9..83f0a4a6 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -136,13 +136,13 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
 
 	TQPushButton * p = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	p->setMinimumWidth(100);
-	connect(p,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(p,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	gl->addWidget(p,iNextLine,2);
 
 	m_pOkButton = new TQPushButton(__tr2qs_ctx("OK","options"),this);
 	m_pOkButton->setMinimumWidth(100);
 	m_pOkButton->setDefault(true);
-	connect(m_pOkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(okPressed()));
+	connect(m_pOkButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(okPressed()));
 	gl->addWidget(m_pOkButton,iNextLine,3);
 
 	gl->setColStretch(1,1);
@@ -257,7 +257,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options"));
-	connect(m_pNickServListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableDisableNickServControls()));
+	connect(m_pNickServListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableDisableNickServControls()));
 
 	gl->addMultiCellWidget(m_pNickServListView,1,1,0,2);
 #ifdef COMPILE_INFO_TIPS
@@ -274,18 +274,18 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
 #endif
 
 	m_pAddRuleButton = new TQPushButton(__tr2qs_ctx("Add Rule","options"),this);
-	connect(m_pAddRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addNickServRule()));
+	connect(m_pAddRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addNickServRule()));
 	gl->addWidget(m_pAddRuleButton,2,0);
 
 	m_pEditRuleButton = new TQPushButton(__tr2qs_ctx("Edit Rule","options"),this);
-	connect(m_pEditRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editNickServRule()));
+	connect(m_pEditRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editNickServRule()));
 	gl->addWidget(m_pEditRuleButton,2,1);
 
 	m_pDelRuleButton = new TQPushButton(__tr2qs_ctx("Delete Rule","options"),this);
-	connect(m_pDelRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delNickServRule()));
+	connect(m_pDelRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delNickServRule()));
 	gl->addWidget(m_pDelRuleButton,2,2);
 
-	connect(m_pNickServCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableNickServControls()));
+	connect(m_pNickServCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableNickServControls()));
 
 	if(rs && rs->rules())
 	{
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index 423be23a..e1b4711a 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -38,60 +38,60 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * parent)
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList);
 	KviTalGroupBox *g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Configuration","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),g,TQ_SLOT(setEnabled(bool)));
 
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Show notifications in active window","options"),
 				KviOption_boolNotifyListChangesToActiveWindow,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Flash window when users are going online","options"),
 				KviOption_boolFlashWindowOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Popup notifier when users are going online","options"),
 				KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 
 	g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Advanced configuration","options"));
-	connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),g,TQ_SLOT(setEnabled(bool)));
 
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Check USERHOST for online users","options"),
 				KviOption_boolNotifyListSendUserhostForOnlineUsers,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Use \"smart\" notify list manager","options"),
 				KviOption_boolUseIntelligentNotifyListManager,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Use the WATCH method if available","options"),
 				KviOption_boolUseWatchListIfAvailable,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addUIntSelector(g,__tr2qs_ctx("Check interval (in seconds)","options"),
 				KviOption_uintNotifyListCheckTimeInSecs,
 				5,3600,180,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addUIntSelector(g,__tr2qs_ctx("ISON delay (in seconds)","options"),
 				KviOption_uintNotifyListIsOnDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 	connect(b,
-		TQT_SIGNAL(toggled(bool)),
+		TQ_SIGNAL(toggled(bool)),
 		addUIntSelector(g,__tr2qs_ctx("USERHOST delay (in seconds)","options"),
 				KviOption_uintNotifyListUserhostDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		TQT_SLOT(setEnabled(bool)));
+		TQ_SLOT(setEnabled(bool)));
 
 	addLabel(0,3,0,3,__tr2qs_ctx("<p><b>Note:</b><br>The notify list is managed using the \"Registered Users\" settings.</p>","options"));
 	addRowSpacer(0,4,0,4);
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 02c29e4f..b36a0fb3 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -67,10 +67,10 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
 	m_pListView->setAllColumnsShowFocus(true);
 	m_pListView->setSelectionMode(KviTalListView::Single);
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),
-		this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),
+		this,TQ_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
 
 #ifdef COMPILE_INFO_TIPS
   TQString tiptxt = __tr2qs_ctx("<center>This is the list of available proxy servers.<br>" \
@@ -85,7 +85,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
   TQToolButton * tb = new KviStyledToolButton(vbox);
   tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)));
   tb->setAutoRaise(true);
-  connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(newProxy()));
+  connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(newProxy()));
 #ifdef COMPILE_INFO_TIPS
   mergeTip(tb,__tr2qs_ctx("New Proxy","options"));
 #endif
@@ -94,7 +94,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
   tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)));
   //tb->setEnabled(false);
   tb->setAutoRaise(true);
-  connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeCurrent()));
+  connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeCurrent()));
 #ifdef COMPILE_INFO_TIPS
   mergeTip(tb,__tr2qs_ctx("Remove Proxy","options"));
 #endif
@@ -138,7 +138,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
 	m_pProtocolBox->insertStringList(l);
 
 	m_pIpV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
-	connect(m_pIpV6Check,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(ipV6CheckToggled(bool)));
+	connect(m_pIpV6Check,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(ipV6CheckToggled(bool)));
 #ifndef COMPILE_IPV6_SUPPORT
 	m_pIpV6Check->setEnabled(false);
 #endif
@@ -333,8 +333,8 @@ void KviProxyOptionsWidget::commit()
 void KviProxyOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const TQPoint &pnt,int col)
 {
 	m_pContextPopup->clear();
-	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,TQT_SLOT(newProxy()));
-	m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,TQT_SLOT(removeCurrent())),it);
+	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,TQ_SLOT(newProxy()));
+	m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,TQ_SLOT(removeCurrent())),it);
 	m_pContextPopup->popup(TQCursor::pos());
 }
 
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index adca6260..336d899b 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -277,7 +277,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork *
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options"));
-	connect(m_pNickServListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableDisableNickServControls()));
+	connect(m_pNickServListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableDisableNickServControls()));
 	
 	gl->addMultiCellWidget(m_pNickServListView,1,1,0,2);
 #ifdef COMPILE_INFO_TIPS
@@ -291,19 +291,19 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork *
 #endif
 	
 	m_pAddRuleButton = new TQPushButton(__tr2qs_ctx("Add Rule","options"),tab);
-	connect(m_pAddRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addNickServRule()));
+	connect(m_pAddRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addNickServRule()));
 	gl->addWidget(m_pAddRuleButton,2,0);
 	
 	
 	m_pEditRuleButton = new TQPushButton(__tr2qs_ctx("Edit Rule","options"),tab);
-	connect(m_pEditRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editNickServRule()));
+	connect(m_pEditRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editNickServRule()));
 	gl->addWidget(m_pEditRuleButton,2,1);
 	
 	m_pDelRuleButton = new TQPushButton(__tr2qs_ctx("Delete Rule","options"),tab);
-	connect(m_pDelRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delNickServRule()));
+	connect(m_pDelRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delNickServRule()));
 	gl->addWidget(m_pDelRuleButton,2,2);
 	
-	connect(m_pNickServCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableNickServControls()));
+	connect(m_pNickServCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableNickServControls()));
 	
 	if(rs && rs->rules())
 	{
@@ -324,12 +324,12 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork *
 	b->setMinimumWidth(80);
 	g->addWidget(b,3,2);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept()));
 
 	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	g->addWidget(b,3,3);
 	b->setMinimumWidth(80);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 
 
 	g->setRowStretch(2,1);
@@ -525,7 +525,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
 	bool bHasUmode = !(s->initUMode().isEmpty());
 	KviStr szDefUMode = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
 	m_pUseDefaultInitUMode->setChecked(!bHasUmode);
-	connect(m_pUseDefaultInitUMode,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(useDefaultInitUModeToggled(bool)));
+	connect(m_pUseDefaultInitUMode,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(useDefaultInitUModeToggled(bool)));
 	
 	m_pIMode = new KviStyledCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox);
 	m_pIMode->setEnabled(bHasUmode);
@@ -564,7 +564,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pPortEditor,__tr2qs_ctx("<center>This is the default <b>port</b> that this server will be contacted on.<br>Usually <b>6667</b> is OK.</center>","options"));
 #endif
-	connect(m_pPortEditor,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(portEditorTextChanged(const TQString &)));
+	connect(m_pPortEditor,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(portEditorTextChanged(const TQString &)));
 
 
 
@@ -613,7 +613,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
 #else
 	m_pUseIPV6Check->setEnabled(false);
 #endif
-	connect(m_pUseIPV6Check,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(useIPV6CheckToggled(bool)));
+	connect(m_pUseIPV6Check,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(useIPV6CheckToggled(bool)));
 
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pUseIPV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
@@ -804,12 +804,12 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
 	b->setMinimumWidth(80);
 	g->addWidget(b,3,2);
 	b->setDefault(true);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept()));
 
 	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	g->addWidget(b,3,3);
 	b->setMinimumWidth(80);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 
 	g->setRowStretch(2,1);
 	g->setColStretch(1,1);
@@ -1029,8 +1029,8 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pContextPopup = new KviTalPopupMenu(this);
 	m_pImportPopup = new KviTalPopupMenu(this);
 
-	connect(m_pImportPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(importPopupAboutToShow()));
-	connect(m_pImportPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(importPopupActivated(int)));
+	connect(m_pImportPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(importPopupAboutToShow()));
+	connect(m_pImportPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(importPopupActivated(int)));
 
 	m_pServerDetailsDialog = 0;
 	m_pNetworkDetailsDialog = 0;
@@ -1043,12 +1043,12 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pListView->setRootIsDecorated(true);
 	m_pListView->setAllColumnsShowFocus(true);
 	m_pListView->setSelectionMode(KviTalListView::Single);
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),
-		this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
-	connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem*, const TQPoint&, int )),
-		this,TQT_SLOT(detailsClicked()));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),
+		this,TQ_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem*, const TQPoint&, int )),
+		this,TQ_SLOT(detailsClicked()));
 
 #ifdef COMPILE_INFO_TIPS
 	TQString tiptxt = __tr2qs_ctx("<center>This is the list of available IRC servers.<br>" \
@@ -1064,7 +1064,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pNewNetworkButton = new KviStyledToolButton(vbox);
 	m_pNewNetworkButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)));
 	m_pNewNetworkButton->setAutoRaise(true);
-	connect(m_pNewNetworkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newNetwork()));
+	connect(m_pNewNetworkButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(newNetwork()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options"));
 #endif
@@ -1072,7 +1072,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pNewServerButton = new KviStyledToolButton(vbox);
 	m_pNewServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)));
 	m_pNewServerButton->setAutoRaise(true);
-	connect(m_pNewServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newServer()));
+	connect(m_pNewServerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(newServer()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options"));
 #endif
@@ -1081,7 +1081,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pRemoveButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)));
 	m_pRemoveButton->setEnabled(false);
 	m_pRemoveButton->setAutoRaise(true);
-	connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeCurrent()));
+	connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeCurrent()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove Network/Server","options"));
 #endif
@@ -1093,7 +1093,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pCopyServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)));
 	m_pCopyServerButton->setEnabled(false);
 	m_pCopyServerButton->setAutoRaise(true);
-	connect(m_pCopyServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(copyServer()));
+	connect(m_pCopyServerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(copyServer()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options"));
 #endif
@@ -1102,7 +1102,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 	m_pPasteServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)));
 	m_pPasteServerButton->setEnabled(false);
 	m_pPasteServerButton->setAutoRaise(true);
-	connect(m_pPasteServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(pasteServer()));
+	connect(m_pPasteServerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(pasteServer()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste Server","options"));
 #endif
@@ -1151,22 +1151,22 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 */
 
 	m_pDetailsButton = new TQPushButton(__tr2qs_ctx("Advanced...","options"),gbox);
-	connect(m_pDetailsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(detailsClicked()));
+	connect(m_pDetailsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(detailsClicked()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pDetailsButton,__tr2qs_ctx("<center>Click here to edit advanced options for this entry</center>","options"));
 #endif
 
 	m_pConnectCurrent = new TQPushButton(__tr2qs_ctx("Connect &Now","options"),this);
 	addWidgetToLayout(m_pConnectCurrent,0,2,0,2);
-	connect(m_pConnectCurrent,TQT_SIGNAL(clicked()),this,TQT_SLOT(connectCurrentClicked()));
+	connect(m_pConnectCurrent,TQ_SIGNAL(clicked()),this,TQ_SLOT(connectCurrentClicked()));
 
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pConnectCurrent,__tr2qs_ctx("<center>Hit this button to connect to the currently selected server.</center>","options"));
 #endif
 
 	m_pRecentPopup = new KviTalPopupMenu(this);
-	connect(m_pRecentPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(recentServersPopupAboutToShow()));
-	connect(m_pRecentPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(recentServersPopupClicked(int)));
+	connect(m_pRecentPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(recentServersPopupAboutToShow()));
+	connect(m_pRecentPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(recentServersPopupClicked(int)));
 
 	TQToolButton * tb = new KviStyledToolButton(this);
 	addWidgetToLayout(tb,1,2,1,2);
@@ -1427,21 +1427,21 @@ void KviServerOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,c
 	int id;
 	bool bServer = (it && ((KviServerOptionsListViewItem *)it)->m_pServerData);
 	m_pContextPopup->clear();
-	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,TQT_SLOT(newNetwork()));
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,TQT_SLOT(removeCurrent()));
+	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,TQ_SLOT(newNetwork()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,TQ_SLOT(removeCurrent()));
 	m_pContextPopup->setItemEnabled(id,!bServer);
 	m_pContextPopup->insertSeparator();
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs_ctx("&New Server","options"),this,TQT_SLOT(newServer()));
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Server","options"),this,TQT_SLOT(removeCurrent()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs_ctx("&New Server","options"),this,TQ_SLOT(newServer()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Server","options"),this,TQ_SLOT(removeCurrent()));
 	m_pContextPopup->setItemEnabled(id,bServer);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs_ctx("&Copy Server","options"),this,TQT_SLOT(copyServer()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs_ctx("&Copy Server","options"),this,TQ_SLOT(copyServer()));
 	m_pContextPopup->setItemEnabled(id,bServer);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),__tr2qs_ctx("&Paste Server","options"),this,TQT_SLOT(pasteServer()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),__tr2qs_ctx("&Paste Server","options"),this,TQ_SLOT(pasteServer()));
 	m_pContextPopup->setItemEnabled(id,m_pClipboard);
 
 	m_pContextPopup->insertSeparator();
-	//	m_pContextPopup->insertItem(__c2q(__tr("Merge list from server.ini","options")),this,TQT_SLOT(importFromIni()));
-	m_pContextPopup->insertItem(__tr2qs_ctx("Clear List","options"),this,TQT_SLOT(clearList()));
+	//	m_pContextPopup->insertItem(__c2q(__tr("Merge list from server.ini","options")),this,TQ_SLOT(importFromIni()));
+	m_pContextPopup->insertItem(__tr2qs_ctx("Clear List","options"),this,TQ_SLOT(clearList()));
 	m_pContextPopup->insertSeparator();
 	m_pContextPopup->insertItem(__tr2qs_ctx("Import List","options"),m_pImportPopup);
 	m_pContextPopup->popup(TQCursor::pos());
@@ -1501,8 +1501,8 @@ void KviServerOptionsWidget::importPopupActivated(int id)
 		return;
 	}
 
-	connect(m_pImportFilter,TQT_SIGNAL(server(const KviIrcServer &,const char *)),this,TQT_SLOT(importServer(const KviIrcServer &,const char *)));
-	connect(m_pImportFilter,TQT_SIGNAL(destroyed()),this,TQT_SLOT(importerDead()));
+	connect(m_pImportFilter,TQ_SIGNAL(server(const KviIrcServer &,const char *)),this,TQ_SLOT(importServer(const KviIrcServer &,const char *)));
+	connect(m_pImportFilter,TQ_SIGNAL(destroyed()),this,TQ_SLOT(importerDead()));
 
 	m_pImportFilter->start();
 }
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 72f527a7..b77262ce 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -70,10 +70,10 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent)
 	m_pSoundSystemBox = new TQComboBox(false,h);
 
 	m_pSoundAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h);
-	connect(m_pSoundAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundAutoDetect()));
+	connect(m_pSoundAutoDetectButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(soundAutoDetect()));
 
 	m_pSoundTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h);
-	connect(m_pSoundTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundTest()));
+	connect(m_pSoundTestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(soundTest()));
 
 
 	g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Media Player","options"),true);
@@ -86,10 +86,10 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent)
 	m_pMediaPlayerBox = new TQComboBox(false,h);
 
 	m_pMediaAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h);
-	connect(m_pMediaAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaAutoDetect()));
+	connect(m_pMediaAutoDetectButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(mediaAutoDetect()));
 
 	m_pMediaTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h);
-	connect(m_pMediaTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaTest()));
+	connect(m_pMediaTestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(mediaTest()));
 
 	addRowSpacer(0,2,0,2);
 
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 01a0290f..f9c24501 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -42,8 +42,8 @@ KviTextIconEditor::KviTextIconEditor(TQWidget * par,KviTextIcon * icon,KviTextIc
 	m_pIcon = icon;
 	m_pPopup = 0;
 	updateIcon();
-	connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(doPopup()));
-	connect(m_pBrowseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFromFile()));
+	connect(m_pIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(doPopup()));
+	connect(m_pBrowseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseFromFile()));
 }
 
 
@@ -58,7 +58,7 @@ void KviTextIconEditor::doPopup()
 	{
 		m_pPopup = new KviTalPopupMenu(this);
 		KviIconWidget * iw = new KviIconWidget(m_pPopup);
-		connect(iw,TQT_SIGNAL(selected(int)),this,TQT_SLOT(iconSelected(int)));
+		connect(iw,TQ_SIGNAL(selected(int)),this,TQ_SLOT(iconSelected(int)));
 		m_pPopup->insertItem(iw);
 	}
 	m_pPopup->popup(TQCursor::pos());
@@ -164,15 +164,15 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent)
 
 	m_pAdd = new TQPushButton(__tr2qs_ctx("Add","options"),this);
 	layout()->addWidget(m_pAdd,1,0);
-	connect(m_pAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
+	connect(m_pAdd,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked()));
 
 	m_pDel = new TQPushButton(__tr2qs_ctx("Delete","options"),this);
 	layout()->addWidget(m_pDel,1,1);
-	connect(m_pDel,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked()));
+	connect(m_pDel,TQ_SIGNAL(clicked()),this,TQ_SLOT(delClicked()));
 
 	m_pDel->setEnabled(false);
 
-	connect(m_pTable,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged()));
+	connect(m_pTable,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged()));
 }
 
 KviTextIconsOptionsWidget::~KviTextIconsOptionsWidget()
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 6ddc3ede..32a5f4cf 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -56,8 +56,8 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * parent)
 	
 	addRowSpacer(0,6,0,6);
 	
-	connect(m_pEnable,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabled(bool)));
-	connect(m_pLevelBasedNotify,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnable,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabled(bool)));
+	connect(m_pLevelBasedNotify,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabled(bool)));
 	setEnabled(true);
 }
 
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index 6e356770..f7b366e9 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -62,7 +62,7 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * parent)
 	m_pMailtoHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers));
 	m_pOtherHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers));
 
-	connect(b,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleEditors(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggleEditors(bool)));
 
 #endif
 
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index e5f68b48..a75c1efa 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -65,7 +65,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(T
 	hb->setSpacing(4);
 	KviBoolSelector * b = addBoolSelector(hb,__tr2qs_ctx("Use different color for own nick:","options"),KviOption_boolUseDifferentColorForOwnNick);
 	KviColorSelector * s = addColorSelector(hb,"",KviOption_colorUserListViewOwnForeground,KVI_OPTION_BOOL(KviOption_boolUseDifferentColorForOwnNick));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,3,0,3);
 }
@@ -81,7 +81,7 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent)
 	KviBoolSelector* b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid);
 
 	KviColorSelector* s = addColorSelector(0,1,0,1,__tr2qs_ctx("Grid color:","options"),KviOption_colorUserListViewGrid,KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool)));
 
 	KviTalHBox* hb = new KviTalHBox(this);
 	addWidgetToLayout(hb,0,2,0,2);
@@ -89,7 +89,7 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent)
 
 	TQLabel * l = new TQLabel(__tr2qs_ctx("Grid type:","options"),hb);
 	l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,TQT_SIGNAL(toggled(bool)),l,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),l,TQ_SLOT(setEnabled(bool)));
 	m_pGridTypeCombo = new TQComboBox(false,hb);
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("3D Grid","options"));
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("3D Buttons","options"));
@@ -97,7 +97,7 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent)
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("Dotted Grid","options"));
 	m_pGridTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintUserListViewGridType));
 	m_pGridTypeCombo->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,TQT_SIGNAL(toggled(bool)),m_pGridTypeCombo,TQT_SLOT(setEnabled(bool)));
+	connect(b,TQ_SIGNAL(toggled(bool)),m_pGridTypeCombo,TQ_SLOT(setEnabled(bool)));
 	addRowSpacer(0,3,0,3);
 }