TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 184 insertions, 184 deletions

diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 0b50bc78..9410d174 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -51,24 +51,24 @@
 #include "kvi_kvs_script.h"
 #include "kvi_styled_controls.h"
 
-#include <qtoolbutton.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
+#include <tqtoolbutton.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
 #include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
+#include <tqcursor.h>
 #include "kvi_tal_tooltip.h"
-#include <qvalidator.h>
-#include <qmessagebox.h>
+#include <tqvalidator.h>
+#include <tqmessagebox.h>
 #include "kvi_pointerhashtable.h"
-#include <qcombobox.h>
-#include <qbuttongroup.h>
-#include <qmessagebox.h>
-#include <qinputdialog.h>
-#include <qmessagebox.h>
+#include <tqcombobox.h>
+#include <tqbuttongroup.h>
+#include <tqmessagebox.h>
+#include <tqinputdialog.h>
+#include <tqmessagebox.h>
 
 
-KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n)
-	: QDialog(par,"network_details",true)
+KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * n)
+	: TQDialog(par,"network_details",true)
 {
 	m_pOnConnectEditor=0;
 	m_pOnLoginEditor=0;
@@ -91,25 +91,25 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	
 	m_pChannelListSelector=0;
 	
-	QGridLayout * g = new QGridLayout(this,4,4,10,4);
+	TQGridLayout * g = new TQGridLayout(this,4,4,10,4);
 
 	setCaption(__tr2qs_ctx("Network Details","options"));
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)));
 
-	QString szTmp = "<font size=\"+1\"><b>";
+	TQString szTmp = "<font size=\"+1\"><b>";
 	szTmp += n->name();
 	szTmp += "</b></font>";
 
-	QLabel * l = new QLabel(szTmp,this);
-	l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel);
-	l->setAlignment(Qt::AlignCenter);
+	TQLabel * l = new TQLabel(szTmp,this);
+	l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel);
+	l->tqsetAlignment(TQt::AlignCenter);
 	l->setMargin(10);
 	g->addMultiCellWidget(l,0,0,0,3);
 	l->setMinimumWidth(200);
 
-	l = new QLabel(__tr2qs_ctx("Description:","options"),this);
+	l = new TQLabel(__tr2qs_ctx("Description:","options"),this);
 	g->addWidget(l,1,0);
-	m_pDescEditor = new QLineEdit(this);
+	m_pDescEditor = new TQLineEdit(this);
 	g->addMultiCellWidget(m_pDescEditor,1,1,1,3);
 	m_pDescEditor->setText(n->description());
 #ifdef COMPILE_INFO_TIPS
@@ -118,17 +118,17 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 
 	// Identity tab
 
-	QTabWidget * tw = new QTabWidget(this);
+	TQTabWidget * tw = new TQTabWidget(this);
 	g->addMultiCellWidget(tw,2,2,0,3);
 
-	QWidget * tab = new QWidget(tw);
-	QGridLayout * gl = new QGridLayout(tab,4,2,10,4);
+	TQWidget * tab = new TQWidget(tw);
+	TQGridLayout * gl = new TQGridLayout(tab,4,2,10,4);
 
 	KviTalGroupBox *gbox = new KviTalGroupBox(2,Qt::Horizontal,__tr2qs_ctx("Properties","options"),tab);
 	gl->addMultiCellWidget(gbox,0,0,0,1);
 
-	l = new QLabel(__tr2qs_ctx("Username:","options"),gbox);
-	m_pUserEditor = new QLineEdit(gbox);
+	l = new TQLabel(__tr2qs_ctx("Username:","options"),gbox);
+	m_pUserEditor = new TQLineEdit(gbox);
 	m_pUserEditor->setText(n->userName());
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pUserEditor,__tr2qs_ctx("<center>This is the <b>username</b> that KVIrc will use to login to servers on this network.\n" \
@@ -136,9 +136,9 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 										"specified in the \"Identity\" options tab.</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Nickname:","options"),gbox);
-	m_pNickEditor = new QLineEdit(gbox);
-	QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*","options"),gbox);
+	l = new TQLabel(__tr2qs_ctx("Nickname:","options"),gbox);
+	m_pNickEditor = new TQLineEdit(gbox);
+	TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*","options"),TQT_TQOBJECT(gbox));
 	m_pNickEditor->setValidator(v);
 	m_pNickEditor->setText(n->nickName());
 #ifdef COMPILE_INFO_TIPS
@@ -146,8 +146,8 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 									"If this field is left empty (most common case), the default nickname (specified in the \"Identity\" settings) will be used.</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Real name:","options"),gbox);
-	m_pRealEditor = new QLineEdit(gbox);
+	l = new TQLabel(__tr2qs_ctx("Real name:","options"),gbox);
+	m_pRealEditor = new TQLineEdit(gbox);
 	m_pRealEditor->setText(n->realName());
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pRealEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>real name</b> that will be used to login with the servers on this network.<br>" \
@@ -155,9 +155,9 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 #endif
 
 
-	l = new QLabel(__tr2qs_ctx("Encoding:","options"),tab);
+	l = new TQLabel(__tr2qs_ctx("Encoding:","options"),tab);
 	gl->addWidget(l,1,0);
-	m_pEncodingEditor = new QComboBox(false,tab);
+	m_pEncodingEditor = new TQComboBox(false,tab);
 	m_pEncodingEditor->setDuplicatesEnabled(false);
 	gl->addWidget(m_pEncodingEditor,1,1);
 #ifdef COMPILE_INFO_TIPS
@@ -169,13 +169,13 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	int i = 0;
 	int current = 0;
 	KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i);
-	QString tmp;
+	TQString tmp;
 	m_pEncodingEditor->insertItem(__tr2qs_ctx("Use System Encoding","options"));
 	while(d->szName)
 	{
-		KviQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription);
+		KviTQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription);
 		m_pEncodingEditor->insertItem(tmp);
-		if(KviQString::equalCI(d->szName,n->encoding()))current = i + 1;
+		if(KviTQString::equalCI(d->szName,n->encoding()))current = i + 1;
 		i = i + 1;
 		d = KviLocale::encodingDescription(i);
 	}
@@ -190,7 +190,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 #endif
 
 
-	l = new QLabel("",tab);
+	l = new TQLabel("",tab);
 	gl->addWidget(l,3,0);
 
 	gl->setRowStretch(3,1);
@@ -199,9 +199,9 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	tw->addTab(tab,__tr2qs_ctx("General","options"));
 
 	// after login join channels
-	tab = new QWidget(tw);
+	tab = new TQWidget(tw);
 
-	gl = new QGridLayout(tab,1,1,10,4);
+	gl = new TQGridLayout(tab,1,1,10,4);
 
 	if(n->autoJoinChannelList())
 		m_lstChannels = *(n->autoJoinChannelList());
@@ -217,8 +217,8 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	tw->addTab(tab,__tr2qs_ctx("Join Channels","options"));
 
 	// after connect execute
-	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,1,1,10,4);
+	tab = new TQWidget(tw);
+	gl = new TQGridLayout(tab,1,1,10,4);
 	
 	m_pOnConnectEditor = KviScriptEditor::createInstance(tab);
 	gl->addWidget(m_pOnConnectEditor,0,0);
@@ -235,8 +235,8 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	
 
 	// after login execute
-	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,1,1,10,4);
+	tab = new TQWidget(tw);
+	gl = new TQGridLayout(tab,1,1,10,4);
 
 	m_pOnLoginEditor = KviScriptEditor::createInstance(tab);
 	gl->addWidget(m_pOnLoginEditor,0,0);
@@ -256,8 +256,8 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 
 	// nick serv rules
 	
-	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,3,3,10,5);
+	tab = new TQWidget(tw);
+	gl = new TQGridLayout(tab,3,3,10,5);
 	
 	KviNickServRuleSet * rs = n->nickServRuleSet();
 	bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false;
@@ -277,7 +277,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	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,SIGNAL(selectionChanged()),this,SLOT(enableDisableNickServControls()));
+	connect(m_pNickServListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableDisableNickServControls()));
 	
 	gl->addMultiCellWidget(m_pNickServListView,1,1,0,2);
 #ifdef COMPILE_INFO_TIPS
@@ -290,20 +290,20 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 				"Also note that the password that you provide is stored as <b>PLAIN TEXT</b>.</center>","options"));
 #endif
 	
-	m_pAddRuleButton = new QPushButton(__tr2qs_ctx("Add Rule","options"),tab);
-	connect(m_pAddRuleButton,SIGNAL(clicked()),this,SLOT(addNickServRule()));
+	m_pAddRuleButton = new TQPushButton(__tr2qs_ctx("Add Rule","options"),tab);
+	connect(m_pAddRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addNickServRule()));
 	gl->addWidget(m_pAddRuleButton,2,0);
 	
 	
-	m_pEditRuleButton = new QPushButton(__tr2qs_ctx("Edit Rule","options"),tab);
-	connect(m_pEditRuleButton,SIGNAL(clicked()),this,SLOT(editNickServRule()));
+	m_pEditRuleButton = new TQPushButton(__tr2qs_ctx("Edit Rule","options"),tab);
+	connect(m_pEditRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editNickServRule()));
 	gl->addWidget(m_pEditRuleButton,2,1);
 	
-	m_pDelRuleButton = new QPushButton(__tr2qs_ctx("Delete Rule","options"),tab);
-	connect(m_pDelRuleButton,SIGNAL(clicked()),this,SLOT(delNickServRule()));
+	m_pDelRuleButton = new TQPushButton(__tr2qs_ctx("Delete Rule","options"),tab);
+	connect(m_pDelRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delNickServRule()));
 	gl->addWidget(m_pDelRuleButton,2,2);
 	
-	connect(m_pNickServCheck,SIGNAL(toggled(bool)),this,SLOT(enableDisableNickServControls()));
+	connect(m_pNickServCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableNickServControls()));
 	
 	if(rs && rs->rules())
 	{
@@ -320,16 +320,16 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	
 	tw->addTab(tab,__tr2qs_ctx("NickServ","options"));
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this);
+	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","options"),this);
 	b->setMinimumWidth(80);
 	g->addWidget(b,3,2);
 	b->setDefault(true);
-	connect(b,SIGNAL(clicked()),this,SLOT(accept()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
 
-	b = new QPushButton(__tr2qs_ctx("Cancel","options"),this);
+	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	g->addWidget(b,3,3);
 	b->setMinimumWidth(80);
-	connect(b,SIGNAL(clicked()),this,SLOT(reject()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
 
 
 	g->setRowStretch(2,1);
@@ -396,7 +396,7 @@ void KviNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 	if(m_pAutoConnectCheck)
 		n->setAutoConnect(m_pAutoConnectCheck->isChecked());
 	if(m_pEncodingEditor)
-		if(m_pEncodingEditor->currentItem() <= 0)n->setEncoding(QString::null);
+		if(m_pEncodingEditor->currentItem() <= 0)n->setEncoding(TQString());
 		else {
 			KviLocale::EncodingDescription * d = KviLocale::encodingDescription(m_pEncodingEditor->currentItem() - 1);
 			n->setEncoding(d->szName);
@@ -404,7 +404,7 @@ void KviNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 	if(m_pChannelListSelector)
 		m_pChannelListSelector->commit();
 	if(m_lstChannels.isEmpty())n->setAutoJoinChannelList(0);
-	else n->setAutoJoinChannelList(new QStringList(m_lstChannels));
+	else n->setAutoJoinChannelList(new TQStringList(m_lstChannels));
 	if(m_pNickServListView)
 	{
 		if(m_pNickServListView->childCount() > 0)
@@ -422,13 +422,13 @@ void KviNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 	}
 	if(m_pOnConnectEditor)
 	{
-		QString tmp;
+		TQString tmp;
 		m_pOnConnectEditor->getText(tmp);
 		n->setOnConnectCommand(tmp);
 	}
 	if(m_pOnLoginEditor)
 	{
-		QString tmp;
+		TQString tmp;
 		m_pOnLoginEditor->getText(tmp);
 		n->setOnLoginCommand(tmp);
 	}
@@ -440,25 +440,25 @@ void KviNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 
 
 
-KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
-    : QDialog(par,"server_details",true)
+KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
+    : TQDialog(par,"server_details",true)
 {
 	m_szHostname = s->hostName();
-	QGridLayout * g = new QGridLayout(this,4,4,10,4);
+	TQGridLayout * g = new TQGridLayout(this,4,4,10,4);
 
 	setCaption(__tr2qs_ctx("Server Details","options"));
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)));
 
-	m_pHeaderLabel = new QLabel("",this); // the text will be set later
-	m_pHeaderLabel->setFrameStyle(QFrame::Raised | QFrame::StyledPanel);
-	m_pHeaderLabel->setAlignment(Qt::AlignCenter);
+	m_pHeaderLabel = new TQLabel("",this); // the text will be set later
+	m_pHeaderLabel->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel);
+	m_pHeaderLabel->tqsetAlignment(TQt::AlignCenter);
 	m_pHeaderLabel->setMargin(10);
 	g->addMultiCellWidget(m_pHeaderLabel,0,0,0,3);
 	m_pHeaderLabel->setMinimumWidth(200);
 
-	QLabel * l = new QLabel(__tr2qs_ctx("Description:","options"),this);
+	TQLabel * l = new TQLabel(__tr2qs_ctx("Description:","options"),this);
 	g->addWidget(l,1,0);
-	m_pDescEditor = new QLineEdit(this);
+	m_pDescEditor = new TQLineEdit(this);
 	g->addMultiCellWidget(m_pDescEditor,1,1,1,3);
 	m_pDescEditor->setText(s->description());
 #ifdef COMPILE_INFO_TIPS
@@ -468,17 +468,17 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	// Identity tab
 
-	QTabWidget * tw = new QTabWidget(this);
+	TQTabWidget * tw = new TQTabWidget(this);
 	g->addMultiCellWidget(tw,2,2,0,3);
 
-	QWidget * tab = new QWidget(tw);
-	QGridLayout * gl = new QGridLayout(tab,3,1,10,4);
+	TQWidget * tab = new TQWidget(tw);
+	TQGridLayout * gl = new TQGridLayout(tab,3,1,10,4);
 
 	KviTalGroupBox *gbox = new KviTalGroupBox(2,Qt::Horizontal,__tr2qs_ctx("Properties","options"),tab);
 	gl->addWidget(gbox,0,0);
 
-	l = new QLabel(__tr2qs_ctx("Username:","options"),gbox);
-	m_pUserEditor = new QLineEdit(gbox);
+	l = new TQLabel(__tr2qs_ctx("Username:","options"),gbox);
+	m_pUserEditor = new TQLineEdit(gbox);
 	m_pUserEditor->setText(s->userName());
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pUserEditor,__tr2qs_ctx("<center>This is the <b>username</b> that KVIrc will use to login to this server.\n" \
@@ -487,17 +487,17 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 										"specified in the \"Identity\" options tab.</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Password:","options"),gbox);
-	m_pPassEditor = new QLineEdit(gbox);
-	m_pPassEditor->setEchoMode(QLineEdit::Password);
+	l = new TQLabel(__tr2qs_ctx("Password:","options"),gbox);
+	m_pPassEditor = new TQLineEdit(gbox);
+	m_pPassEditor->setEchoMode(TQLineEdit::Password);
 	m_pPassEditor->setText(s->password());
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pPassEditor,__tr2qs_ctx("<center>If this server requires a password, put it in this field, otherwise leave it empty.</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Nickname:","options"),gbox);
-	m_pNickEditor = new QLineEdit(gbox);
-	QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"),gbox);
+	l = new TQLabel(__tr2qs_ctx("Nickname:","options"),gbox);
+	m_pNickEditor = new TQLineEdit(gbox);
+	TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),TQT_TQOBJECT(gbox));
 	m_pNickEditor->setValidator(v);
 	m_pNickEditor->setText(s->nickName());
 #ifdef COMPILE_INFO_TIPS
@@ -506,8 +506,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 									"for the network that this server belongs to, and if that is empty then the default nickname (specified in the \"Identity\" settings) will be used.</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Real name:","options"),gbox);
-	m_pRealEditor = new QLineEdit(gbox);
+	l = new TQLabel(__tr2qs_ctx("Real name:","options"),gbox);
+	m_pRealEditor = new TQLineEdit(gbox);
 	m_pRealEditor->setText(s->realName());
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pRealEditor,__tr2qs_ctx("<center>You can specify a \"special\" <b>real name</b> that will be used to login with this server.<br>" \
@@ -525,21 +525,21 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	bool bHasUmode = !(s->initUMode().isEmpty());
 	KviStr szDefUMode = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
 	m_pUseDefaultInitUMode->setChecked(!bHasUmode);
-	connect(m_pUseDefaultInitUMode,SIGNAL(toggled(bool)),this,SLOT(useDefaultInitUModeToggled(bool)));
+	connect(m_pUseDefaultInitUMode,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(useDefaultInitUModeToggled(bool)));
 	
 	m_pIMode = new KviStyledCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox);
 	m_pIMode->setEnabled(bHasUmode);
-	m_pIMode->setChecked(bHasUmode ? s->initUMode().contains('i',false) : szDefUMode.contains('i',false));
+	m_pIMode->setChecked(bHasUmode ? s->initUMode().tqcontains('i',false) : szDefUMode.tqcontains('i',false));
 	
 	m_pSMode = new KviStyledCheckBox(__tr2qs_ctx("Server notices (+s)","options"),gbox);
 	m_pSMode->setEnabled(bHasUmode);
-	m_pSMode->setChecked(bHasUmode ? s->initUMode().contains('s',false) : szDefUMode.contains('s',false));
+	m_pSMode->setChecked(bHasUmode ? s->initUMode().tqcontains('s',false) : szDefUMode.tqcontains('s',false));
 	
 	m_pWMode = new KviStyledCheckBox(__tr2qs_ctx("Wallops (+w)","options"),gbox);
 	m_pWMode->setEnabled(bHasUmode);
-	m_pWMode->setChecked(bHasUmode ? s->initUMode().contains('w',false) : szDefUMode.contains('w',false));
+	m_pWMode->setChecked(bHasUmode ? s->initUMode().tqcontains('w',false) : szDefUMode.tqcontains('w',false));
 
-	l = new QLabel("",tab);
+	l = new TQLabel("",tab);
 	gl->addWidget(l,2,0);
 
 	gl->setRowStretch(2,1);
@@ -549,26 +549,26 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	// Connection tab
 	
-	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,11,1,10,4);
+	tab = new TQWidget(tw);
+	gl = new TQGridLayout(tab,11,1,10,4);
 	
-	l = new QLabel(__tr2qs_ctx("Port:","options"),tab);
+	l = new TQLabel(__tr2qs_ctx("Port:","options"),tab);
 	gl->addWidget(l,0,0);
 	
 
-	m_pPortEditor = new QLineEdit(tab);
+	m_pPortEditor = new TQLineEdit(tab);
 	gl->addWidget(m_pPortEditor,0,1);
-	QString tmpz;
+	TQString tmpz;
 	tmpz.setNum(s->port());
 	m_pPortEditor->setText(tmpz);
 #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,SIGNAL(textChanged(const QString &)),this,SLOT(portEditorTextChanged(const QString &)));
+	connect(m_pPortEditor,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(portEditorTextChanged(const TQString &)));
 
 
 
-	l = new QLabel(__tr2qs_ctx("IP address:","options"),tab);
+	l = new TQLabel(__tr2qs_ctx("IP address:","options"),tab);
 	gl->addWidget(l,1,0);
 	m_pIpEditor = new KviIpEditor(tab,KviIpEditor::IpV4);
 	gl->addWidget(m_pIpEditor,1,1);
@@ -613,7 +613,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 #else
 	m_pUseIPV6Check->setEnabled(false);
 #endif
-	connect(m_pUseIPV6Check,SIGNAL(toggled(bool)),this,SLOT(useIPV6CheckToggled(bool)));
+	connect(m_pUseIPV6Check,TQT_SIGNAL(toggled(bool)),this,TQT_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 " \
@@ -641,9 +641,9 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	KviTalToolTip::add(m_pUseAutoConnect,__tr2qs_ctx("<center>This option will cause KVIrc to connect to the IRC server when it is started.</center>","options"));
 #endif
 	
-	l = new QLabel(__tr2qs_ctx("Encoding:","options"),tab);
+	l = new TQLabel(__tr2qs_ctx("Encoding:","options"),tab);
 	gl->addWidget(l,6,0);
-	m_pEncodingEditor = new QComboBox(false,tab);
+	m_pEncodingEditor = new TQComboBox(false,tab);
 	m_pEncodingEditor->setDuplicatesEnabled(false);
 	gl->addWidget(m_pEncodingEditor,6,1);
 #ifdef COMPILE_INFO_TIPS
@@ -655,13 +655,13 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	int i = 0;
 	int current = 0;
 	KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i);
-	QString tmp;
+	TQString tmp;
 	m_pEncodingEditor->insertItem(__tr2qs_ctx("Use Network Encoding","options"));
 	while(d->szName)
 	{
-		KviQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription);
+		KviTQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription);
 		m_pEncodingEditor->insertItem(tmp);
-		if(KviQString::equalCI(d->szName,s->encoding()))current = i + 1;
+		if(KviTQString::equalCI(d->szName,s->encoding()))current = i + 1;
 		i = i + 1;
 		d = KviLocale::encodingDescription(i);
 	}
@@ -669,9 +669,9 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pEncodingEditor->setCurrentItem(current);
 
 
-	l = new QLabel(__tr2qs_ctx("Link filter:","options"),tab);
+	l = new TQLabel(__tr2qs_ctx("Link filter:","options"),tab);
 	gl->addWidget(l,7,0);
-	m_pLinkFilterEditor = new QComboBox(true,tab);
+	m_pLinkFilterEditor = new TQComboBox(true,tab);
 	m_pLinkFilterEditor->setDuplicatesEnabled(false);
 	gl->addWidget(m_pLinkFilterEditor,7,1);
 
@@ -702,9 +702,9 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 		"For plain IRC connections, you don't need any link filters; this is used for incompatible protocols.</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Id:","options"),tab);
+	l = new TQLabel(__tr2qs_ctx("Id:","options"),tab);
 	gl->addWidget(l,8,0);
-	m_pIdEditor = new QLineEdit(tab);
+	m_pIdEditor = new TQLineEdit(tab);
 	if(s->id().isEmpty())s->generateUniqueId();
 	m_pIdEditor->setText(s->id());
 	gl->addWidget(m_pIdEditor,8,1);
@@ -716,9 +716,9 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 #endif
 
 
-	l = new QLabel(__tr2qs_ctx("Proxy server:","options"),tab);
+	l = new TQLabel(__tr2qs_ctx("Proxy server:","options"),tab);
 	gl->addWidget(l,9,0);
-	m_pProxyEditor = new QComboBox(tab);
+	m_pProxyEditor = new TQComboBox(tab);
 	gl->addWidget(m_pProxyEditor,9,1);
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pProxyEditor,__tr2qs_ctx("<center>This is the <b>proxy</b> that KVIrc will use to connect to thos server.\n" \
@@ -732,13 +732,13 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	KviPointerList<KviProxy> * proxylist = g_pProxyDataBase->proxyList();
 	for(KviProxy * p = proxylist->first();p;p = proxylist->next())
 	{
-		m_pProxyEditor->insertItem(QString("%1:%2").arg(p->hostname()).arg(p->port()));
+		m_pProxyEditor->insertItem(TQString("%1:%2").tqarg(p->hostname()).tqarg(p->port()));
 	}
 	if(m_pProxyEditor->count() > (s->proxy()+2))
 		m_pProxyEditor->setCurrentItem(s->proxy()+2);
 
 
-	l = new QLabel("",tab);
+	l = new TQLabel("",tab);
 	gl->addMultiCellWidget(l,10,10,0,1);
 
 	gl->setRowStretch(10,1);
@@ -746,9 +746,9 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	tw->addTab(tab,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SOCKETWARNING)),__tr2qs_ctx("Connection","options"));
 
 	// after login join channels
-	tab = new QWidget(tw);
+	tab = new TQWidget(tw);
 
-	gl = new QGridLayout(tab,1,1,10,4);
+	gl = new TQGridLayout(tab,1,1,10,4);
 
 	if(s->autoJoinChannelList())
 		m_lstChannels = *(s->autoJoinChannelList());
@@ -764,8 +764,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	tw->addTab(tab,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs_ctx("Join Channels","options"));
 
 	// after connect execute
-	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,1,1,10,4);
+	tab = new TQWidget(tw);
+	gl = new TQGridLayout(tab,1,1,10,4);
 
 
 	m_pOnConnectEditor = KviScriptEditor::createInstance(tab);
@@ -782,8 +782,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	tw->addTab(tab,__tr2qs_ctx("On Connect","options"));
 	// after login execute
 
-	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,1,1,10,4);
+	tab = new TQWidget(tw);
+	gl = new TQGridLayout(tab,1,1,10,4);
 
 	m_pOnLoginEditor = KviScriptEditor::createInstance(tab);
 	gl->addWidget(m_pOnLoginEditor,0,0);
@@ -800,16 +800,16 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	tw->addTab(tab,__tr2qs_ctx("On Login","options"));
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("OK","options"),this);
+	TQPushButton * b = new TQPushButton(__tr2qs_ctx("OK","options"),this);
 	b->setMinimumWidth(80);
 	g->addWidget(b,3,2);
 	b->setDefault(true);
-	connect(b,SIGNAL(clicked()),this,SLOT(accept()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
 
-	b = new QPushButton(__tr2qs_ctx("Cancel","options"),this);
+	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	g->addWidget(b,3,3);
 	b->setMinimumWidth(80);
-	connect(b,SIGNAL(clicked()),this,SLOT(reject()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
 
 	g->setRowStretch(2,1);
 	g->setColStretch(1,1);
@@ -835,14 +835,14 @@ void KviServerDetailsWidget::useIPV6CheckToggled(bool)
 	setHeaderLabelText();
 }
 
-void KviServerDetailsWidget::portEditorTextChanged(const QString &)
+void KviServerDetailsWidget::portEditorTextChanged(const TQString &)
 {
 	setHeaderLabelText();
 }
 
 void KviServerDetailsWidget::setHeaderLabelText()
 {
-	QString szTmp = "<font size=\"+1\"><b>irc";
+	TQString szTmp = "<font size=\"+1\"><b>irc";
 	if(m_pUseIPV6Check->isChecked())szTmp += "6";
 	szTmp += "://";
 	szTmp += m_szHostname;
@@ -850,7 +850,7 @@ void KviServerDetailsWidget::setHeaderLabelText()
 
 	bool bOk;
 
-	QString num = m_pPortEditor->text();
+	TQString num = m_pPortEditor->text();
 	unsigned int uPort = num.toUInt(&bOk);
 	if(!bOk)uPort = 6667;
 	num.setNum(uPort);
@@ -897,7 +897,7 @@ void KviServerDetailsWidget::fillData(KviIrcServer * s)
 		s->setInitUMode(szUMode.ptr());
 	}
 	
-	QString tmp = m_pPortEditor->text();
+	TQString tmp = m_pPortEditor->text();
 	bool bOk;
 	kvi_u32_t uPort = tmp.toUInt(&bOk);
 	if(!bOk)uPort = 6667;
@@ -943,20 +943,20 @@ void KviServerDetailsWidget::fillData(KviIrcServer * s)
 	}
 	if(m_pOnConnectEditor)
 	{
-		QString tmp;
+		TQString tmp;
 		m_pOnConnectEditor->getText(tmp);
 		s->setOnConnectCommand(tmp);
 	}
 	if(m_pOnLoginEditor)
 	{
-		QString tmp;
+		TQString tmp;
 		m_pOnLoginEditor->getText(tmp);
 		s->setOnLoginCommand(tmp);
 	}
 	if(m_pChannelListSelector)
 		m_pChannelListSelector->commit();
 	if(m_lstChannels.isEmpty())s->setAutoJoinChannelList(0);
-	else s->setAutoJoinChannelList(new QStringList(m_lstChannels));
+	else s->setAutoJoinChannelList(new TQStringList(m_lstChannels));
 	if(m_pUseAutoConnect)
 		s->setAutoConnect(m_pUseAutoConnect->isChecked());
 	if(m_pProxyEditor)
@@ -973,8 +973,8 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 // kvi_app.cpp
 extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase;
 
-KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,const KviIrcNetwork *n)
-    : KviTalListViewItem(parent)
+KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,const KviIrcNetwork *n)
+    : KviTalListViewItem(tqparent)
 {
 	setPixmap(0,pm);
 	m_pServerData = 0;
@@ -983,8 +983,8 @@ KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *paren
 	setText(1,n->description());
 }
 
-KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListViewItem *parent,const QPixmap &pm,const KviIrcServer *s)
-    : KviTalListViewItem(parent)
+KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListViewItem *tqparent,const TQPixmap &pm,const KviIrcServer *s)
+    : KviTalListViewItem(tqparent)
 {
 	setPixmap(0,pm);
 	m_pServerData = new KviIrcServer(*s);
@@ -1021,16 +1021,16 @@ void KviServerOptionsListViewItem::updateVisibleStrings()
 
 
 
-KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
-    : KviOptionsWidget(parent,"server_options_widget")
+KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * tqparent)
+    : KviOptionsWidget(tqparent,"server_options_widget")
 {
 	createLayout(4,2);
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 	m_pImportPopup = new KviTalPopupMenu(this);
 
-	connect(m_pImportPopup,SIGNAL(aboutToShow()),this,SLOT(importPopupAboutToShow()));
-	connect(m_pImportPopup,SIGNAL(activated(int)),this,SLOT(importPopupActivated(int)));
+	connect(m_pImportPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(importPopupAboutToShow()));
+	connect(m_pImportPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(importPopupActivated(int)));
 
 	m_pServerDetailsDialog = 0;
 	m_pNetworkDetailsDialog = 0;
@@ -1043,15 +1043,15 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pListView->setRootIsDecorated(true);
 	m_pListView->setAllColumnsShowFocus(true);
 	m_pListView->setSelectionMode(KviTalListView::Single);
-	connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),
-		this,SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,SIGNAL(rightButtonPressed(KviTalListViewItem *,const QPoint &,int)),
-		this,SLOT(listViewRightButtonPressed(KviTalListViewItem *,const QPoint &,int)));
-	connect(m_pListView,SIGNAL(doubleClicked(KviTalListViewItem*, const QPoint&, int )),
-		this,SLOT(detailsClicked()));
+	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()));
 
 #ifdef COMPILE_INFO_TIPS
-	QString tiptxt = __tr2qs_ctx("<center>This is the list of available IRC servers.<br>" \
+	TQString tiptxt = __tr2qs_ctx("<center>This is the list of available IRC servers.<br>" \
 							"Right-click on the list to add or remove servers and perform other actions.<br>"\
 							"Double-click on a item for advanced options.</center>","options");
 	KviTalToolTip::add(m_pListView,tiptxt);
@@ -1064,7 +1064,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pNewNetworkButton = new KviStyledToolButton(vbox);
 	m_pNewNetworkButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)));
 	m_pNewNetworkButton->setAutoRaise(true);
-	connect(m_pNewNetworkButton,SIGNAL(clicked()),this,SLOT(newNetwork()));
+	connect(m_pNewNetworkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newNetwork()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options"));
 #endif
@@ -1072,7 +1072,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pNewServerButton = new KviStyledToolButton(vbox);
 	m_pNewServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)));
 	m_pNewServerButton->setAutoRaise(true);
-	connect(m_pNewServerButton,SIGNAL(clicked()),this,SLOT(newServer()));
+	connect(m_pNewServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newServer()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options"));
 #endif
@@ -1081,19 +1081,19 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pRemoveButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)));
 	m_pRemoveButton->setEnabled(false);
 	m_pRemoveButton->setAutoRaise(true);
-	connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeCurrent()));
+	connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeCurrent()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove Network/Server","options"));
 #endif
 
-	QFrame * f = new QFrame(vbox);
-	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
+	TQFrame * f = new TQFrame(vbox);
+	f->setFrameStyle(TQFrame::Sunken | TQFrame::HLine);
 
 	m_pCopyServerButton = new KviStyledToolButton(vbox);
 	m_pCopyServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)));
 	m_pCopyServerButton->setEnabled(false);
 	m_pCopyServerButton->setAutoRaise(true);
-	connect(m_pCopyServerButton,SIGNAL(clicked()),this,SLOT(copyServer()));
+	connect(m_pCopyServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(copyServer()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options"));
 #endif
@@ -1102,13 +1102,13 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	m_pPasteServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)));
 	m_pPasteServerButton->setEnabled(false);
 	m_pPasteServerButton->setAutoRaise(true);
-	connect(m_pPasteServerButton,SIGNAL(clicked()),this,SLOT(pasteServer()));
+	connect(m_pPasteServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(pasteServer()));
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste Server","options"));
 #endif
 
-	f = new QFrame(vbox);
-	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
+	f = new TQFrame(vbox);
+	f->setFrameStyle(TQFrame::Sunken | TQFrame::HLine);
 
 	m_pImportButton = new KviStyledToolButton(vbox);
 	m_pImportButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)));
@@ -1119,13 +1119,13 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	KviTalToolTip::add(m_pImportButton,__tr2qs_ctx("Import List","options"));
 #endif
 
-	QFrame * lll = new QFrame(vbox);
+	TQFrame * lll = new TQFrame(vbox);
 	vbox->setStretchFactor(lll,100);
 	
 	KviTalGroupBox *gbox = addGroupBox(0,1,1,1,3,Qt::Horizontal,__tr2qs_ctx("Active Configuration","options"));
-	m_pSrvNetLabel = new QLabel(__tr2qs_ctx("Server:","options"),gbox);
+	m_pSrvNetLabel = new TQLabel(__tr2qs_ctx("Server:","options"),gbox);
 
-	m_pSrvNetEdit = new QLineEdit(gbox);
+	m_pSrvNetEdit = new TQLineEdit(gbox);
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pSrvNetEdit,__tr2qs_ctx("<center>This is the name of the currently selected server or network</center>","options"));
 #endif
@@ -1142,33 +1142,33 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 						"(thus your OS <b>must</b> have a working IPv6 stack and you <b>must</b> have an IPv6 connection).</center>","options"));
 #endif
 
-	m_pPortLabel = new QLabel(__tr2qs_ctx("Port:","options"),gbox);
+	m_pPortLabel = new TQLabel(__tr2qs_ctx("Port:","options"),gbox);
 
-	m_pPortEdit = new QLineEdit(gbox);
+	m_pPortEdit = new TQLineEdit(gbox);
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pPortEdit,__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
 */
 
-	m_pDetailsButton = new QPushButton(__tr2qs_ctx("Advanced...","options"),gbox);
-	connect(m_pDetailsButton,SIGNAL(clicked()),this,SLOT(detailsClicked()));
+	m_pDetailsButton = new TQPushButton(__tr2qs_ctx("Advanced...","options"),gbox);
+	connect(m_pDetailsButton,TQT_SIGNAL(clicked()),this,TQT_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 QPushButton(__tr2qs_ctx("Connect &Now","options"),this);
+	m_pConnectCurrent = new TQPushButton(__tr2qs_ctx("Connect &Now","options"),this);
 	addWidgetToLayout(m_pConnectCurrent,0,2,0,2);
-	connect(m_pConnectCurrent,SIGNAL(clicked()),this,SLOT(connectCurrentClicked()));
+	connect(m_pConnectCurrent,TQT_SIGNAL(clicked()),this,TQT_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,SIGNAL(aboutToShow()),this,SLOT(recentServersPopupAboutToShow()));
-	connect(m_pRecentPopup,SIGNAL(activated(int)),this,SLOT(recentServersPopupClicked(int)));
+	connect(m_pRecentPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(recentServersPopupAboutToShow()));
+	connect(m_pRecentPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(recentServersPopupClicked(int)));
 
-	QToolButton * tb = new KviStyledToolButton(this);
+	TQToolButton * tb = new KviStyledToolButton(this);
 	addWidgetToLayout(tb,1,2,1,2);
 	tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)));
 	tb->setPopup(m_pRecentPopup);
@@ -1192,10 +1192,10 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 
 	fillServerList();
 
-	layout()->setRowStretch(0,1);
-	//layout()->setColStretch(1,5);
-	//layout()->setColStretch(2,2);
-	layout()->setColStretch(0,1);
+	tqlayout()->setRowStretch(0,1);
+	//tqlayout()->setColStretch(1,5);
+	//tqlayout()->setColStretch(2,2);
+	tqlayout()->setColStretch(0,1);
 	setMinimumWidth(320);
 }
 
@@ -1289,7 +1289,7 @@ void KviServerOptionsWidget::fillServerList()
 	KviServerOptionsListViewItem * srv;
 	KviServerOptionsListViewItem * cur = 0;
 
-	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*(g_pIrcServerDataBase->recordDict()));
+	KviPointerHashTableIterator<TQString,KviIrcServerDataBaseRecord> it(*(g_pIrcServerDataBase->recordDict()));
 
 	while(KviIrcServerDataBaseRecord * r = it.current())
 	{
@@ -1360,7 +1360,7 @@ void KviServerOptionsWidget::saveLastItem()
 		m_pLastEditedItem->updateVisibleStrings();
 	} else if(m_pLastEditedItem->m_pNetworkData)
 	{
-		QString tmp = m_pSrvNetEdit->text();
+		TQString tmp = m_pSrvNetEdit->text();
 		if(tmp.isEmpty())tmp = __tr2qs_ctx("UnknownNet","options");
 		m_pLastEditedItem->m_pNetworkData->setName(tmp);
 		m_pLastEditedItem->updateVisibleStrings();
@@ -1374,7 +1374,7 @@ void KviServerOptionsWidget::commit()
 	KviServerOptionsListViewItem * it = (KviServerOptionsListViewItem *)m_pListView->firstChild();
 	while(it)
 	{
-		QString tmp = it->m_pNetworkData ? it->m_pNetworkData->name() : QString::null;
+		TQString tmp = it->m_pNetworkData ? it->m_pNetworkData->name() : TQString();
 		if(!tmp.isEmpty())
 		{
 			KviIrcNetwork * net = 0;
@@ -1422,29 +1422,29 @@ void KviServerOptionsWidget::commit()
 	KviOptionsWidget::commit();
 }
 
-void KviServerOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col)
+void KviServerOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const TQPoint &pnt,int col)
 {
 	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,SLOT(newNetwork()));
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent()));
+	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->setItemEnabled(id,!bServer);
 	m_pContextPopup->insertSeparator();
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs_ctx("&New Server","options"),this,SLOT(newServer()));
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Server","options"),this,SLOT(removeCurrent()));
+	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()));
 	m_pContextPopup->setItemEnabled(id,bServer);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs_ctx("&Copy Server","options"),this,SLOT(copyServer()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs_ctx("&Copy Server","options"),this,TQT_SLOT(copyServer()));
 	m_pContextPopup->setItemEnabled(id,bServer);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),__tr2qs_ctx("&Paste Server","options"),this,SLOT(pasteServer()));
+	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),__tr2qs_ctx("&Paste Server","options"),this,TQT_SLOT(pasteServer()));
 	m_pContextPopup->setItemEnabled(id,m_pClipboard);
 
 	m_pContextPopup->insertSeparator();
-	//	m_pContextPopup->insertItem(__c2q(__tr("Merge list from server.ini","options")),this,SLOT(importFromIni()));
-	m_pContextPopup->insertItem(__tr2qs_ctx("Clear List","options"),this,SLOT(clearList()));
+	//	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->insertSeparator();
 	m_pContextPopup->insertItem(__tr2qs_ctx("Import List","options"),m_pImportPopup);
-	m_pContextPopup->popup(QCursor::pos());
+	m_pContextPopup->popup(TQCursor::pos());
 }
 
 void KviServerOptionsWidget::importPopupAboutToShow()
@@ -1501,8 +1501,8 @@ void KviServerOptionsWidget::importPopupActivated(int id)
 		return;
 	}
 
-	connect(m_pImportFilter,SIGNAL(server(const KviIrcServer &,const char *)),this,SLOT(importServer(const KviIrcServer &,const char *)));
-	connect(m_pImportFilter,SIGNAL(destroyed()),this,SLOT(importerDead()));
+	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()));
 
 	m_pImportFilter->start();
 }
@@ -1528,7 +1528,7 @@ void KviServerOptionsWidget::importServer(const KviIrcServer &s,const char * net
 		{
 			if(srv->m_pServerData->isIpV6() == s.isIpV6())
 			{
-				if(KviQString::equalCI(srv->m_pServerData->hostName(),s.hostName()))
+				if(KviTQString::equalCI(srv->m_pServerData->hostName(),s.hostName()))
 				{
 					// update the port
 					srv->m_pServerData->setPort(s.port());
@@ -1565,7 +1565,7 @@ void KviServerOptionsWidget::newServer()
 		KviServerOptionsListViewItem * net;
 		if(m_pLastEditedItem->m_pServerData)
 		{
-			net = (KviServerOptionsListViewItem *)m_pLastEditedItem->parent();
+			net = (KviServerOptionsListViewItem *)m_pLastEditedItem->tqparent();
 			if(!net)return;
 		}
 		else net = m_pLastEditedItem;
@@ -1607,7 +1607,7 @@ void KviServerOptionsWidget::pasteServer()
 			KviServerOptionsListViewItem * net;
 			if(m_pLastEditedItem->m_pServerData)
 			{
-				net = (KviServerOptionsListViewItem *)m_pLastEditedItem->parent();
+				net = (KviServerOptionsListViewItem *)m_pLastEditedItem->tqparent();
 				if(!net)return;
 			}
 			else net = m_pLastEditedItem;
@@ -1669,7 +1669,7 @@ void KviServerOptionsWidget::detailsClicked()
 		m_pServerDetailsDialog = new KviServerDetailsWidget(this,m_pLastEditedItem->m_pServerData);
 
 		int retCode = m_pServerDetailsDialog->exec();
-		if(retCode == QDialog::Accepted)
+		if(retCode == TQDialog::Accepted)
 		{
 			if(m_pLastEditedItem)
 			{
@@ -1692,7 +1692,7 @@ void KviServerOptionsWidget::detailsClicked()
 		m_pNetworkDetailsDialog = new KviNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData);
 
 		int retCode = m_pNetworkDetailsDialog->exec();
-		if(retCode == QDialog::Accepted)
+		if(retCode == TQDialog::Accepted)
 		{
 			if(m_pLastEditedItem)
 			{