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

83 files changed, 1717 insertions, 1628 deletions

diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index 7e2272c1..d86abbba 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -27,19 +27,19 @@
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
 
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
 #include "kvi_tal_tooltip.h"
-#include <qevent.h>
+#include <tqevent.h>
 
 #ifdef COMPILE_USE_QT4
-	#include <qdesktopwidget.h>
+	#include <tqdesktopwidget.h>
 #endif
 
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviOptionsWidgetContainer::KviOptionsWidgetContainer(QWidget * par,bool bModal)
-: QDialog(par,"container","options")
+KviOptionsWidgetContainer::KviOptionsWidgetContainer(TQWidget * par,bool bModal)
+: TQDialog(par,"container","options")
 {
 	m_pOptionsWidget = 0;
 	setModal(bModal);
@@ -52,23 +52,23 @@ KviOptionsWidgetContainer::~KviOptionsWidgetContainer()
 
 void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 {
-	QGridLayout * g = new QGridLayout(this,2,3,4,8);
+	TQGridLayout * g = new TQGridLayout(this,2,3,4,8);
 
 	g->addMultiCellWidget(w,0,0,0,2);
 
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this);
+	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","options"),this);
 	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options"));
-	//b->setMinimumWidth(m_pCancel->sizeHint().width());
+	//b->setMinimumWidth(m_pCancel->tqsizeHint().width());
 	g->addWidget(b,1,1);
 	b->setDefault(true);
-	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 
-	m_pCancel = new QPushButton(__tr2qs_ctx("Cancel","options"),this);
+	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,SIGNAL(clicked()),this,SLOT(cancelClicked()));
+	connect(m_pCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
 	m_pCancel->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 
 
@@ -86,20 +86,20 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 
 }
 
-void KviOptionsWidgetContainer::closeEvent(QCloseEvent *e)
+void KviOptionsWidgetContainer::closeEvent(TQCloseEvent *e)
 {
 	e->ignore();
 	cancelClicked();
 }
 
-void KviOptionsWidgetContainer::showEvent(QShowEvent *e)
+void KviOptionsWidgetContainer::showEvent(TQShowEvent *e)
 {
-	if(parent() == 0)
+	if(tqparent() == 0)
 	{
 		move((g_pApp->desktop()->width() - width()) / 2,
 			(g_pApp->desktop()->height() - height()) / 2);
 	}
-	QWidget::showEvent(e);
+	TQWidget::showEvent(e);
 	m_pCancel->setFocus();
 }
 
diff --git a/src/modules/options/container.h b/src/modules/options/container.h
index 10ae69de..dad9789b 100644
--- a/src/modules/options/container.h
+++ b/src/modules/options/container.h
@@ -24,24 +24,25 @@
 
 
 #include "kvi_optionswidget.h"
-#include <qdialog.h>
+#include <tqdialog.h>
 
-class QPushButton;
+class TQPushButton;
 
-class KviOptionsWidgetContainer : public QDialog
+class KviOptionsWidgetContainer : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviOptionsWidgetContainer(QWidget * par,bool bModal = false);
+	KviOptionsWidgetContainer(TQWidget * par,bool bModal = false);
 	~KviOptionsWidgetContainer();
 protected:
 	KviOptionsWidget * m_pOptionsWidget;
-	QPushButton      * m_pCancel;
+	TQPushButton      * m_pCancel;
 public:
 	void setup(KviOptionsWidget * w);
 protected:
-	virtual void closeEvent(QCloseEvent *e);
-	virtual void showEvent(QShowEvent *e);
+	virtual void closeEvent(TQCloseEvent *e);
+	virtual void showEvent(TQShowEvent *e);
 	virtual void reject();
 protected slots:
 	void okClicked();
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index bebcae3e..6b5f6e80 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -32,45 +32,45 @@
 #include "kvi_module.h"
 #include "kvi_styled_controls.h"
 #include "kvi_pointerhashtable.h"
-#include <qlayout.h>
+#include <tqlayout.h>
 #include "kvi_accel.h"
-#include <qlabel.h>
+#include <tqlabel.h>
 #include "kvi_tal_vbox.h"
-#include <qsplitter.h>
+#include <tqsplitter.h>
 #include "kvi_tal_widgetstack.h"
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
 #include "kvi_tal_tooltip.h"
 
 #ifdef COMPILE_USE_QT4
-	#include <q3header.h>
+	#include <tq3header.h>
 #else
-	#include <qheader.h>
-	#include <qobjectlist.h>
+	#include <tqheader.h>
+	#include <tqobjectlist.h>
 #endif
 #include "kvi_tal_popupmenu.h"
-#include <qtoolbutton.h>
-#include <qcheckbox.h>
+#include <tqtoolbutton.h>
+#include <tqcheckbox.h>
 #include <kvi_tal_groupbox.h>
-#include <qpainter.h>
-#include <qfont.h>
-#include <qevent.h>
+#include <tqpainter.h>
+#include <tqfont.h>
+#include <tqevent.h>
 
 //extern KviModule * g_pOptionsModule;
-extern KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict;
+extern KviPointerHashTable<TQString,KviOptionsDialog> * g_pOptionsDialogDict;
 
 extern KVIRC_API KviApp * g_pApp;
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText)
-:KviOptionsWidget(parent,"general_options_front_widget")
+KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *tqparent,const TQString &szText)
+:KviOptionsWidget(tqparent,"general_options_front_widget")
 {
 	createLayout(1,1);
-	QLabel * l = new QLabel(szText,this);
+	TQLabel * l = new TQLabel(szText,this);
 #ifdef COMPILE_USE_QT4
 	l->setWordWrap(true);
 #endif
-	l->setAlignment(Qt::AlignTop);
-	layout()->addWidget(l,0,0);
+	l->tqsetAlignment(TQt::AlignTop);
+	tqlayout()->addWidget(l,0,0);
 }
 
 KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
@@ -80,8 +80,8 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
 
 
 
-KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e)
-:KviTalListViewItem(parent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *tqparent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(tqparent,e->szName)
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -89,8 +89,8 @@ KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *parent,KviOptions
 	setPixmap(0,*(g_pIconManager->getSmallIcon(e->iIcon)));
 }
 
-KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e)
-:KviTalListViewItem(parent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *tqparent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(tqparent,e->szName)
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -102,14 +102,14 @@ KviOptionsListViewItem::~KviOptionsListViewItem()
 {
 }
 
-void KviOptionsListViewItem::paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align)
+void KviOptionsListViewItem::paintCell(TQPainter * p,const TQColorGroup & cg,int column,int width,int align)
 {
 	if(m_bHighlighted)
 	{
-		QColorGroup tmp(cg);
-		tmp.setColor(QColorGroup::Base,Qt::red);
-		tmp.setColor(QColorGroup::Background,Qt::red);
-		tmp.setColor(QColorGroup::Text,Qt::yellow);
+		TQColorGroup tmp(cg);
+		tmp.setColor(TQColorGroup::Base,TQt::red);
+		tmp.setColor(TQColorGroup::Background,TQt::red);
+		tmp.setColor(TQColorGroup::Text,TQt::yellow);
 		KviTalListViewItem::paintCell(p,tmp,column,width,align);
 	} else {
 		KviTalListViewItem::paintCell(p,cg,column,width,align);
@@ -117,44 +117,44 @@ void KviOptionsListViewItem::paintCell(QPainter * p,const QColorGroup & cg,int c
 }
 
 
-KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
-: QDialog(par,"general_options_dialog")
+KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
+: TQDialog(par,"general_options_dialog")
 {
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)));
 
 	m_szGroup = szGroup;
 
-	QString szDialogTitle;
+	TQString szDialogTitle;
 
-	if(szGroup.isEmpty() || KviQString::equalCI(szGroup,"general"))
+	if(szGroup.isEmpty() || KviTQString::equalCI(szGroup,"general"))
 	{
 		szDialogTitle = __tr2qs_ctx("General Preferences","options");
-	} else if(KviQString::equalCI(szGroup,"theme"))
+	} else if(KviTQString::equalCI(szGroup,"theme"))
 	{
 		szDialogTitle = __tr2qs_ctx("Theme Preferences","options");
 	} else {
 		szDialogTitle = __tr2qs_ctx("KVIrc Preferences","options");
 	}
 
-	QString szDialog = __tr2qs_ctx("This dialog contains a set of KVIrc settings.<br> Use the icons " \
+	TQString szDialog = __tr2qs_ctx("This dialog contains a set of KVIrc settings.<br> Use the icons " \
 							"on the left to navigate through the option pages. The text box in the " \
 							"bottom left corner is a small search engine. It will highlight the " \
 							"pages that contain options related to the search term you have entered.","options");
 
 
-	QString szInfoTips;
+	TQString szInfoTips;
 #ifdef COMPILE_INFO_TIPS
 	szInfoTips = __tr2qs_ctx("Many settings have tooltips that can be shown by holding " \
 							"the cursor over their label for a few seconds.","options"); 
 #else
 	szInfoTips = "";
 #endif
-	QString szOkCancelButtons = __tr2qs_ctx("When you have finished, click \"<b>OK</b>\" to accept your changes " \
+	TQString szOkCancelButtons = __tr2qs_ctx("When you have finished, click \"<b>OK</b>\" to accept your changes " \
 						"or \"<b>Cancel</b>\" to discard them. Clicking \"<b>Apply</b>\" will commit your " \
 						"changes without closing the window.","options");
 
 
-	QString szFrontText = QString(
+	TQString szFrontText = TQString(
 			"<table width=\"100%\" height=\"100%\" valign=\"top\" align=\"center\" cellpadding=\"4\">" \
 				"<tr>" \
 					"<td bgcolor=\"#303030\" valign=\"top\">" \
@@ -179,13 +179,13 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 					"</td>" \
 				"</tr>" \
 			"</table>"
-		).arg(szDialogTitle).arg(szDialog).arg(szInfoTips).arg(szOkCancelButtons);
+		).tqarg(szDialogTitle).tqarg(szDialog).tqarg(szInfoTips).tqarg(szOkCancelButtons);
 
-	QString szCaption = szDialogTitle + " - KVIrc";
+	TQString szCaption = szDialogTitle + " - KVIrc";
 	setCaption(szCaption);
 
-	QGridLayout * g1 = new QGridLayout(this,2,5,8,8);
-	QSplitter * spl = new QSplitter(Qt::Horizontal,this);
+	TQGridLayout * g1 = new TQGridLayout(this,2,5,8,8);
+	TQSplitter * spl = new TQSplitter(Qt::Horizontal,this);
 
 	g1->addMultiCellWidget(spl,0,0,0,4);
 
@@ -199,22 +199,22 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	m_pListView->header()->hide();
 	m_pListView->setRootIsDecorated(true);
 	m_pListView->setSorting(-1);
-	connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
 
 	KviTalHBox * hbox = new KviTalHBox(vbox);
 	vbox->setSpacing(2);
 	vbox->setMargin(0);
 
-	m_pSearchLineEdit = new QLineEdit(hbox);
-	connect(m_pSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(searchClicked()));
+	m_pSearchLineEdit = new TQLineEdit(hbox);
+	connect(m_pSearchLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(searchClicked()));
 	m_pSearchButton = new KviStyledToolButton(hbox);
 	m_pSearchButton->setUsesBigPixmap(false);
 	m_pSearchButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)));
-	connect(m_pSearchButton,SIGNAL(clicked()),this,SLOT(searchClicked()));
-	connect(m_pSearchLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(searchLineEditTextChanged(const QString &)));
+	connect(m_pSearchButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchClicked()));
+	connect(m_pSearchLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(searchLineEditTextChanged(const TQString &)));
 
 #ifdef COMPILE_INFO_TIPS
-	QString szTip = __tr2qs_ctx("<p>This is the search tool for this options dialog.</p>" \
+	TQString szTip = __tr2qs_ctx("<p>This is the search tool for this options dialog.</p>" \
 								"<p>You can enter a search term either in your native " \
 								"language or in english and press the button on the right. " \
 								"The pages that contain some options related to the " \
@@ -228,11 +228,11 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	vbox->setSpacing(2);
 	vbox->setMargin(0);
 
-	m_pCategoryLabel = new QLabel("<b>&nbsp;</b>",vbox,"labgeneraloptions");
+	m_pCategoryLabel = new TQLabel("<b>&nbsp;</b>",vbox,"labgeneraloptions");
 	//m_pCategoryLabel->setMargin(3);
 
-	QFrame * f = new QFrame(vbox);
-	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
+	TQFrame * f = new TQFrame(vbox);
+	f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
 
 	// Widget stack
 	m_pWidgetStack = new KviTalWidgetStack(vbox);
@@ -245,24 +245,24 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 
 //  Ok,Cancel,Help
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this,"btnok");
+	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","options"),this,"btnok");
 	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options"));
-	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
 	//b->setMinimumWidth(whatIsThisWidth);
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g1->addWidget(b,1,2);	
 
-	b = new QPushButton(__tr2qs_ctx("&Apply","options"),this,"btnapply");
+	b = new TQPushButton(__tr2qs_ctx("&Apply","options"),this,"btnapply");
 	KviTalToolTip::add(b,__tr2qs_ctx("Commit all changes immediately.","options"));
-	connect(b,SIGNAL(clicked()),this,SLOT(applyClicked()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g1->addWidget(b,1,3);
 
-	b = new QPushButton(__tr2qs_ctx("Cancel","options"),this,"btncancel");
+	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),this,"btncancel");
 	KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, discarding all changes.","options"));
 	b->setDefault(true);
 	//b->setMinimumWidth(whatIsThisWidth);
-	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g1->addWidget(b,1,4);
 
@@ -272,7 +272,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 
 	fillListView(0,g_pOptionsInstanceManager->instanceEntryTree(),szGroup);
 	
-	if(!parent())
+	if(!tqparent())
 	{
 
 		if(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y() < 5)
@@ -287,26 +287,26 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	}
 
 	KviAccel *a = new KviAccel( this );
-        a->connectItem( a->insertItem(Qt::Key_Escape), this,SLOT(close()) );
+        a->connectItem( a->insertItem(TQt::Key_Escape), this,TQT_SLOT(close()) );
 	
 }
 
 KviOptionsDialog::~KviOptionsDialog()
 {
-	if(!parent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = QRect(pos().x(),pos().y(),
+	if(!tqparent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = TQRect(pos().x(),pos().y(),
 			size().width(),size().height());
 	if(g_pOptionsDialogDict)
 		g_pOptionsDialogDict->remove(m_szGroup);
 }
 
 
-void KviOptionsDialog::searchLineEditTextChanged(const QString &)
+void KviOptionsDialog::searchLineEditTextChanged(const TQString &)
 {
-	QString txt = m_pSearchLineEdit->text().stripWhiteSpace();
+	TQString txt = m_pSearchLineEdit->text().stripWhiteSpace();
 	m_pSearchButton->setEnabled(txt.length() > 0);
 }
 
-bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStringList &lKeywords)
+bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQStringList &lKeywords)
 {
 	//debug("recursive search:");
 	if(!pItem)return false;
@@ -320,34 +320,34 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 	bool bFoundSomethingHere = false;
 	KviPointerHashTable<void *,bool> lOptionWidgetsToMark;
 	lOptionWidgetsToMark.setAutoDelete(true);
-	QTabWidget * pTabWidgetToMark = 0;
+	TQTabWidget * pTabWidgetToMark = 0;
 	
-	QObject * o;
+	TQObject * o;
 #ifdef COMPILE_USE_QT4
-	QObjectList ol = pItem->m_pOptionsWidget->queryList();
+	TQObjectList ol = pItem->m_pOptionsWidget->queryList();
 	if(ol.count() > 0)
 	{
-		for(QObjectList::Iterator it = ol.begin();it != ol.end();++it)
+		for(TQObjectList::Iterator it = ol.begin();it != ol.end();++it)
 		{
 			o = *it;
 #else
-	QObjectList * ol = pItem->m_pOptionsWidget->queryList();
+	TQObjectList * ol = pItem->m_pOptionsWidget->queryList();
 	if(ol)
 	{
-		QObjectListIt it(*ol);
+		TQObjectListIt it(*ol);
 		while((o = it.current())/* && (!bFoundSomethingHere)*/)
 		{
 #endif
-			QString szText;
-			if(o->inherits("QLabel"))szText = ((QLabel *)o)->text();
-			else if(o->inherits("QCheckBox"))szText = ((QCheckBox *)o)->text();
+			TQString szText;
+			if(o->inherits(TQLABEL_OBJECT_NAME_STRING))szText = ((TQLabel *)o)->text();
+			else if(o->inherits(TQCHECKBOX_OBJECT_NAME_STRING))szText = ((TQCheckBox *)o)->text();
 			else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title();
 #ifdef COMPILE_INFO_TIPS
-			if(o->inherits("QWidget"))
+			if(o->inherits(TQWIDGET_OBJECT_NAME_STRING))
 #ifdef COMPILE_USE_QT4
-				szText.append(((QWidget *)o)->toolTip());
+				szText.append(((TQWidget *)o)->toolTip());
 #else
-				szText.append(QToolTip::textFor((QWidget*)o));
+				szText.append(TQToolTip::textFor((TQWidget*)o));
 #endif
 #endif
 			if(!szText.isEmpty())
@@ -356,9 +356,9 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 				for(int j=0;j<lKeywords.count();j++)
 				{
 #ifdef COMPILE_USE_QT4
-					if(szText.find(lKeywords.at(j),0,false) == -1)
+					if(szText.tqfind(lKeywords.at(j),0,false) == -1)
 #else
-					if(szText.find(*(lKeywords.at(j)),0,false) == -1)
+					if(szText.tqfind(*(lKeywords.at(j)),0,false) == -1)
 #endif
 					{
 						bOk = false;
@@ -370,35 +370,35 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 					bFoundSomethingHere = true;
 				}
 				
-				if(o->inherits("QWidget"))
+				if(o->inherits(TQWIDGET_OBJECT_NAME_STRING))
 				{
-					QWidget* pWidget=(QWidget*)o;
-					QFont font = pWidget->font();
+					TQWidget* pWidget=(TQWidget*)o;
+					TQFont font = pWidget->font();
 					font.setBold(bOk);
 					font.setUnderline(bOk);
 					pWidget->setFont(font);
 
-					// if there is a QTabWidget in the parent chain, signal it in the tab text
-					QObject * pParent = pWidget->parent();
+					// if there is a TQTabWidget in the tqparent chain, signal it in the tab text
+					TQObject * pParent = pWidget->tqparent();
 					while(pParent)
 					{
-						if(pParent->inherits("QTabWidget"))
+						if(pParent->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
 						{
-							pTabWidgetToMark = (QTabWidget *)pParent;
+							pTabWidgetToMark = (TQTabWidget *)pParent;
 							break;
 						}
-						pParent = pParent->parent();
+						pParent = pParent->tqparent();
 					}
 
 					if(pTabWidgetToMark)
 					{
-						// lookup the KviOptionsWidget parent
-						pParent = pWidget->parent();
+						// lookup the KviOptionsWidget tqparent
+						pParent = pWidget->tqparent();
 						while(pParent)
 						{
 							if(pParent->inherits("KviOptionsWidget"))
 							{
-								bool * pExistingBool = lOptionWidgetsToMark.find(pParent);
+								bool * pExistingBool = lOptionWidgetsToMark.tqfind(pParent);
 								if(pExistingBool)
 								{
 									if(bOk)
@@ -408,7 +408,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 								}
 								break;
 							}
-							pParent = pParent->parent();
+							pParent = pParent->tqparent();
 						}
 					}
 				}
@@ -429,16 +429,16 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 		while(bool * pBool = it.current())
 		{
 			KviOptionsWidget * pOptionsWidget = (KviOptionsWidget *)it.currentKey();
-			QString szTxt = pTabWidgetToMark->tabLabel(pOptionsWidget);
-			if(KviQString::equalCIN(szTxt,">>> ",4))
+			TQString szTxt = pTabWidgetToMark->tabLabel(pOptionsWidget);
+			if(KviTQString::equalCIN(szTxt,">>> ",4))
 			{
-				szTxt.replace(">>> ","");
-				szTxt.replace(" <<<","");
+				szTxt.tqreplace(">>> ","");
+				szTxt.tqreplace(" <<<","");
 			}
 			if(*pBool)
 			{
 				szTxt.insert(0,">>> ");
-				szTxt += QString(" <<<");
+				szTxt += TQString(" <<<");
 			}
 			pTabWidgetToMark->setTabLabel(pOptionsWidget,szTxt);
 			++it;
@@ -460,7 +460,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 	return (bFoundSomethingInside || bFoundSomethingHere);
 }
 
-void KviOptionsDialog::search(const QStringList &lKeywords)
+void KviOptionsDialog::search(const TQStringList &lKeywords)
 {
 	m_pListView->setUpdatesEnabled(false);
 
@@ -475,20 +475,20 @@ void KviOptionsDialog::search(const QStringList &lKeywords)
 	m_pListView->triggerUpdate();
 }
 
-void KviOptionsDialog::search(const QString &szKeywords)
+void KviOptionsDialog::search(const TQString &szKeywords)
 {
-	QStringList lKeywords = QStringList::split(" ",szKeywords,false);
+	TQStringList lKeywords = TQStringList::split(" ",szKeywords,false);
 	search(lKeywords);
 }
 
 void KviOptionsDialog::searchClicked()
 {
-	QString szTxt = m_pSearchLineEdit->text().stripWhiteSpace();
+	TQString szTxt = m_pSearchLineEdit->text().stripWhiteSpace();
 	if(!szTxt.isEmpty())
 		search(szTxt);
 }
 
-void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
+void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const TQString &szGroup,bool bNotContainedOnly)
 {
 	if(!l)return;
 
@@ -503,7 +503,7 @@ void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerList<KviOpt
 	{
 		// must be in the correct group
 		// if we want only containers then well.. must be one
-		e->bDoInsert = KviQString::equalCI(szGroup,e->szGroup) && ((!bNotContainedOnly) || e->bIsContainer || e->bIsNotContained);
+		e->bDoInsert = KviTQString::equalCI(szGroup,e->szGroup) && ((!bNotContainedOnly) || e->bIsContainer || e->bIsNotContained);
 		KviOptionsWidgetInstanceEntry * ee = tmp.first();
 		int idx = 0;
 		while(ee)
@@ -534,10 +534,10 @@ void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerList<KviOpt
 		{
 			if(e->bIsContainer)
 			{
-				// it's a container: add only eventual not contained children (containers or explicitly marked as not contained)
+				// it's a container: add only eventual not contained tqchildren (containers or explicitly marked as not contained)
 				fillListView(it,e->pChildList,szGroup,true);
 			} else {
-				// it's not a container, add any children
+				// it's not a container, add any tqchildren
 				fillListView(it,e->pChildList,szGroup,false);
 			}
 		}
@@ -548,14 +548,14 @@ void KviOptionsDialog::listViewItemSelectionChanged(KviTalListViewItem *it)
 {
 	if(it)
 	{
-		QString str = it->text(0);
-		KviTalListViewItem * par = it->parent();
+		TQString str = it->text(0);
+		KviTalListViewItem * par = it->tqparent();
 
 		while(par)
 		{
 			str.prepend(" :: ");
 			str.prepend(par->text(0));
-			par = par->parent();
+			par = par->tqparent();
 		}
 		str.prepend("<b>");
 		str += "</b>";
@@ -578,7 +578,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem
 	if(it->m_pOptionsWidget == pPage)return it;
 
 	KviOptionsListViewItem *i;
-	// run through the children
+	// run through the tqchildren
 	i = (KviOptionsListViewItem *)(it->firstChild());
 	if(i)
 	{
@@ -586,7 +586,7 @@ KviOptionsListViewItem * KviOptionsDialog::findItemByPage(KviOptionsListViewItem
 		if(i)return i;
 	}
 	
-	// not found in the children tree.. look in the next sibling
+	// not found in the tqchildren tree.. look in the next sibling
 	i = (KviOptionsListViewItem *)(it->nextSibling());
 	if(i)
 	{
@@ -639,7 +639,7 @@ void KviOptionsDialog::cancelClicked()
 	delete this;
 }
 
-void KviOptionsDialog::closeEvent(QCloseEvent *e)
+void KviOptionsDialog::closeEvent(TQCloseEvent *e)
 {
 	e->ignore();
 	delete this;
@@ -647,7 +647,7 @@ void KviOptionsDialog::closeEvent(QCloseEvent *e)
 
 void KviOptionsDialog::recursiveCommit(KviOptionsListViewItem *it)
 {
-	// First commit the children
+	// First commit the tqchildren
 	if(!it) return;
 	KviOptionsListViewItem *it2 = (KviOptionsListViewItem *)it->firstChild();
 	while(it2)
@@ -655,7 +655,7 @@ void KviOptionsDialog::recursiveCommit(KviOptionsListViewItem *it)
 		recursiveCommit(it2);
 		it2 = (KviOptionsListViewItem *)it2->nextSibling();
 	}
-	// then the parents
+	// then the tqparents
 	if(it->m_pOptionsWidget)
 	{
 		it->m_pOptionsWidget->commit();
@@ -664,9 +664,9 @@ void KviOptionsDialog::recursiveCommit(KviOptionsListViewItem *it)
 	}
 	//refreshListView(); // <-- this tends to jump into infinite recursion
 }
-void  KviOptionsDialog::keyPressEvent( QKeyEvent * e )
+void  KviOptionsDialog::keyPressEvent( TQKeyEvent * e )
 {
-	if(e->key()==Qt::Key_Return)
+	if(e->key()==TQt::Key_Return)
 		e->accept();
 	else
 		e->ignore();
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index b342ca51..267c5529 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -26,32 +26,33 @@
 //=============================================================================
 
 
-#include <qdialog.h>
+#include <tqdialog.h>
 #include "kvi_tal_listview.h"
-#include <qstringlist.h>
+#include <tqstringlist.h>
 #include "kvi_optionswidget.h"
 
 #include "instances.h"
 
-class QLabel;
+class TQLabel;
 class KviTalWidgetStack;
-class QPushButton;
-class QLineEdit;
-class QToolButton;
+class TQPushButton;
+class TQLineEdit;
+class TQToolButton;
 
 class KviGeneralOptionsFrontWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText);
+	KviGeneralOptionsFrontWidget(TQWidget *tqparent,const TQString &szText);
 	~KviGeneralOptionsFrontWidget();
 };
 
 class KviOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e);
-	KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e);
+	KviOptionsListViewItem(KviTalListView *tqparent,KviOptionsWidgetInstanceEntry * e);
+	KviOptionsListViewItem(KviTalListViewItem *tqparent,KviOptionsWidgetInstanceEntry * e);
 	~KviOptionsListViewItem();
 public:
 	KviOptionsWidgetInstanceEntry * m_pInstanceEntry;
@@ -60,26 +61,27 @@ public:
 public:
 	void setHighlighted(bool b){ m_bHighlighted = b; };
 protected:
-	virtual void paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align);
+	virtual void paintCell(TQPainter * p,const TQColorGroup & cg,int column,int width,int align);
 };
 
-class KviOptionsDialog : public QDialog
+class KviOptionsDialog : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviOptionsDialog(QWidget * par,const QString &szGroup); 
+	KviOptionsDialog(TQWidget * par,const TQString &szGroup); 
 	~KviOptionsDialog();
 private:
 	KviTalListView    * m_pListView;
-	QLabel       * m_pCategoryLabel;
+	TQLabel       * m_pCategoryLabel;
 	KviTalWidgetStack * m_pWidgetStack;
 	KviGeneralOptionsFrontWidget* m_pFrontWidget;
-	QString        m_szGroup;
-	QLineEdit    * m_pSearchLineEdit;
-	QToolButton  * m_pSearchButton;
+	TQString        m_szGroup;
+	TQLineEdit    * m_pSearchLineEdit;
+	TQToolButton  * m_pSearchButton;
 private:
 	void recursiveCommit(KviOptionsListViewItem *it);
-	void fillListView(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
+	void fillListView(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const TQString &szGroup,bool bNotContainedOnly = false);
 	//KviOptionsListViewItem * showHiddenChildren(KviTalListViewItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
 	KviOptionsListViewItem * findItemByPage(KviOptionsListViewItem *it,KviOptionsWidget * pPage);
 private slots:
@@ -89,15 +91,15 @@ private slots:
 	void cancelClicked();
 	void pageWantsToSwitchToAdvancedPage(KviOptionsWidget * pPage);
 	void searchClicked();
-	void searchLineEditTextChanged(const QString &);
+	void searchLineEditTextChanged(const TQString &);
 protected:
 	void apply(bool bDialogAboutToClose);
-	virtual void closeEvent(QCloseEvent *e);
-	virtual void keyPressEvent( QKeyEvent * e );
-	bool recursiveSearch(KviOptionsListViewItem * pItem,const QStringList &lKeywords);
+	virtual void closeEvent(TQCloseEvent *e);
+	virtual void keyPressEvent( TQKeyEvent * e );
+	bool recursiveSearch(KviOptionsListViewItem * pItem,const TQStringList &lKeywords);
 public:
-	void search(const QString &szKeywords);
-	void search(const QStringList &lKeywords);
+	void search(const TQString &szKeywords);
+	void search(const TQStringList &lKeywords);
 };
 
 
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index aa23e7be..c338f4a3 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -76,409 +76,409 @@
 
 int g_iOptionWidgetInstances = 0;
 
-KviOptionsWidget * classKviAntispamOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviAntispamOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviAntispamOptionsWidget(parent);
+	return new KviAntispamOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviAvatarAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviAvatarAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviAvatarAdvancedOptionsWidget(parent);
+	return new KviAvatarAdvancedOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviAwayOptionsWidget(parent);
+	return new KviAwayOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviConnectionOptionsWidget(parent);
+	return new KviConnectionOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviConnectionAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviConnectionAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviConnectionAdvancedOptionsWidget(parent);
+	return new KviConnectionAdvancedOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviSSLOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviSSLOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviSSLOptionsWidget(parent);
+	return new KviSSLOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTransportOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTransportOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTransportOptionsWidget(parent);
+	return new KviTransportOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIdentOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIdentOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIdentOptionsWidget(parent);
+	return new KviIdentOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviCtcpOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviCtcpOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviCtcpOptionsWidget(parent);
+	return new KviCtcpOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviCtcpFloodProtectionOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviCtcpFloodProtectionOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviCtcpFloodProtectionOptionsWidget(parent);
+	return new KviCtcpFloodProtectionOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviDccOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviDccOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviDccOptionsWidget(parent);
+	return new KviDccOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviDccGeneralOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviDccGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviDccGeneralOptionsWidget(parent);
+	return new KviDccGeneralOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviDccAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviDccAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviDccAdvancedOptionsWidget(parent);
+	return new KviDccAdvancedOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviDccSendOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviDccSendOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviDccSendOptionsWidget(parent);
+	return new KviDccSendOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviDccSendGeneralOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviDccSendGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviDccSendGeneralOptionsWidget(parent);
+	return new KviDccSendGeneralOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviDccSendAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviDccSendAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviDccSendAdvancedOptionsWidget(parent);
+	return new KviDccSendAdvancedOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviDccChatOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviDccChatOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviDccChatOptionsWidget(parent);
+	return new KviDccChatOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviDccVoiceOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviDccVoiceOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviDccVoiceOptionsWidget(parent);
+	return new KviDccVoiceOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviGeneralOptOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviGeneralOptOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviGeneralOptOptionsWidget(parent);
+	return new KviGeneralOptOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviAlertHighlightingOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviAlertHighlightingOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviAlertHighlightingOptionsWidget(parent);
+	return new KviAlertHighlightingOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviHighlightingOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviHighlightingOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviHighlightingOptionsWidget(parent);
+	return new KviHighlightingOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviAlertOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviAlertOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviAlertOptionsWidget(parent);
+	return new KviAlertOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIdentityOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIdentityOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIdentityOptionsWidget(parent);
+	return new KviIdentityOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIdentityGeneralOptionsWidget(parent);
+	return new KviIdentityGeneralOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIdentityAvatarOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIdentityAvatarOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIdentityAvatarOptionsWidget(parent);
+	return new KviIdentityAvatarOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIdentityAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIdentityAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIdentityAdvancedOptionsWidget(parent);
+	return new KviIdentityAdvancedOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIgnoreOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIgnoreOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIgnoreOptionsWidget(parent);
+	return new KviIgnoreOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviInputLookOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviInputLookOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviInputLookOptionsWidget(parent);
+	return new KviInputLookOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviInputFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviInputFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviInputFeaturesOptionsWidget(parent);
+	return new KviInputFeaturesOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviInterfaceFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviInterfaceFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviInterfaceFeaturesOptionsWidget(parent);
+	return new KviInterfaceFeaturesOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviThemeGeneralOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviThemeGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviThemeGeneralOptionsWidget(parent);
+	return new KviThemeGeneralOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviThemeTransparencyOptionsWidget(parent);
+	return new KviThemeTransparencyOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviThemeMdiCaptionsOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviThemeMdiCaptionsOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviThemeMdiCaptionsOptionsWidget(parent);
+	return new KviThemeMdiCaptionsOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviThemeMdiAreaOptionsWidget(parent);
+	return new KviThemeMdiAreaOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviThemeToolBarAppletsOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviThemeToolBarAppletsOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviThemeToolBarAppletsOptionsWidget(parent);
+	return new KviThemeToolBarAppletsOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIrcOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIrcOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIrcOptionsWidget(parent);
+	return new KviIrcOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIrcGeneralOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIrcGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIrcGeneralOptionsWidget(parent);
+	return new KviIrcGeneralOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIrcAdvancedOptionsWidget(parent);
+	return new KviIrcAdvancedOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviChannelOptionsWidget(parent);
+	return new KviChannelOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviChannelGeneralOptionsWidget(parent);
+	return new KviChannelGeneralOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviChannelAdvancedOptionsWidget(parent);
+	return new KviChannelAdvancedOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIrcOutputOptionsWidget(parent);
+	return new KviIrcOutputOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIrcViewThemeOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIrcViewThemeOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIrcViewThemeOptionsWidget(parent);
+	return new KviIrcViewThemeOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIrcViewLookOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIrcViewLookOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIrcViewLookOptionsWidget(parent);
+	return new KviIrcViewLookOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviIrcViewFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviIrcViewFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviIrcViewFeaturesOptionsWidget(parent);
+	return new KviIrcViewFeaturesOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviLagOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviLagOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviLagOptionsWidget(parent);
+	return new KviLagOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviLoggingOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviLoggingOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviLoggingOptionsWidget(parent);
+	return new KviLoggingOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviMediaTypesOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviMediaTypesOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviMediaTypesOptionsWidget(parent);
+	return new KviMediaTypesOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviMessageOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviMessageOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviMessageOptionsWidget(parent);
+	return new KviMessageOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviPrivmsgOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviPrivmsgOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviPrivmsgOptionsWidget(parent);
+	return new KviPrivmsgOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTimestampOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTimestampOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTimestampOptionsWidget(parent);
+	return new KviTimestampOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviMessageColorsOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviMessageColorsOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviMessageColorsOptionsWidget(parent);
+	return new KviMessageColorsOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviStandardColorsOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviStandardColorsOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviStandardColorsOptionsWidget(parent);
+	return new KviStandardColorsOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviNickServOptionsWidget(parent);
+	return new KviNickServOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviNotifyOptionsWidget(parent);
+	return new KviNotifyOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviNotifierOptionsWidget(parent);
+	return new KviNotifierOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviProtectionOptionsWidget(parent);
+	return new KviProtectionOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviProxyOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviProxyOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviProxyOptionsWidget(parent);
+	return new KviProxyOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviQueryOptionsWidget(parent);
+	return new KviQueryOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviServerOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviServerOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviServerOptionsWidget(parent);
+	return new KviServerOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviSoundOptionsWidget(parent);
+	return new KviSoundOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviSoundGeneralOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviSoundGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviSoundGeneralOptionsWidget(parent);
+	return new KviSoundGeneralOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviSoundsOptionsWidget(parent);
+	return new KviSoundsOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTaskBarOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTaskBarOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTaskBarOptionsWidget(parent);
+	return new KviTaskBarOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTreeTaskBarOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTreeTaskBarOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTreeTaskBarOptionsWidget(parent);
+	return new KviTreeTaskBarOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTreeTaskBarForegroundOptionsWidget(parent);
+	return new KviTreeTaskBarForegroundOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTreeTaskBarBackgroundOptionsWidget(parent);
+	return new KviTreeTaskBarBackgroundOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTreeTaskBarFeaturesOptionsWidget(parent);
+	return new KviTreeTaskBarFeaturesOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviClassicTaskBarOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviClassicTaskBarOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviClassicTaskBarOptionsWidget(parent);
+	return new KviClassicTaskBarOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTextEncodingOptionsWidget(parent);
+	return new KviTextEncodingOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTextIconsOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTextIconsOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTextIconsOptionsWidget(parent);
+	return new KviTextIconsOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviToolsOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviToolsOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviToolsOptionsWidget(parent);
+	return new KviToolsOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTopicLabelLookOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTopicLabelLookOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTopicLabelLookOptionsWidget(parent);
+	return new KviTopicLabelLookOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviTrayOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviTrayOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviTrayOptionsWidget(parent);
+	return new KviTrayOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviUParserOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviUParserOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviUParserOptionsWidget(parent);
+	return new KviUParserOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviUrlHandlersOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviUrlHandlersOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviUrlHandlersOptionsWidget(parent);
+	return new KviUrlHandlersOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviUserListLookOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviUserListLookOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviUserListLookOptionsWidget(parent);
+	return new KviUserListLookOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviUserListLookBackgroundOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviUserListLookBackgroundOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviUserListLookBackgroundOptionsWidget(parent);
+	return new KviUserListLookBackgroundOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviUserListLookForegroundOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviUserListLookForegroundOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviUserListLookForegroundOptionsWidget(parent);
+	return new KviUserListLookForegroundOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviUserListGridOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviUserListGridOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviUserListGridOptionsWidget(parent);
+	return new KviUserListGridOptionsWidget(tqparent);
 }
 
-KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
 {
-	return new KviUserListFeaturesOptionsWidget(parent);
+	return new KviUserListFeaturesOptionsWidget(tqparent);
 }
 
 
@@ -647,7 +647,7 @@ static const char * g_szName_KviUserListFeaturesOptionsWidget = KVI_OPTIONS_WIDG
 static const char * g_szClassName_KviUserListFeaturesOptionsWidget = "KviUserListFeaturesOptionsWidget";
 
 KviOptionsInstanceManager::KviOptionsInstanceManager()
-: QObject(0)
+: TQObject(0)
 {
 
 	//debug("Instantiating");
@@ -3460,10 +3460,10 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 		{
 			if(e->pWidget)
 			{
-				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->tqparent()->inherits("KviOptionsWidgetContainer"))
 				{
-					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
-					delete e->pWidget->parent();
+					disconnect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
+					delete e->pWidget->tqparent();
 					e->pWidget =  0;
 				} else {
 					debug("Ops...i have deleted the options dialog ?");
@@ -3489,25 +3489,25 @@ void KviOptionsInstanceManager::cleanup(KviModule * m)
 
 void KviOptionsInstanceManager::widgetDestroyed()
 {
-	KviOptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
+	KviOptionsWidgetInstanceEntry * e = findInstanceEntry(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())),m_pInstanceTree);
 	if(e)e->pWidget = 0;
 	if(g_iOptionWidgetInstances > 0)g_iOptionWidgetInstances--;
 
 }
 
-KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par)
+KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par)
 {
 	if(!e)return 0;
 	if(!(e->pWidget))
 	{
 		e->pWidget = e->createProc(par);
 		g_iOptionWidgetInstances++;
-		connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
+		connect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
 	}
-	if(e->pWidget->parent() != par)
+	if(TQT_BASE_OBJECT(e->pWidget->tqparent()) != TQT_BASE_OBJECT(par))
 	{
-		QWidget * oldPar = (QWidget *)e->pWidget->parent();
-		e->pWidget->reparent(par,QPoint(0,0));
+		TQWidget * oldPar = (TQWidget *)e->pWidget->tqparent();
+		e->pWidget->reparent(par,TQPoint(0,0));
 		delete oldPar;
 	}
 	if(e->bIsContainer)
@@ -3546,13 +3546,13 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	return e->pWidget;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const TQObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
 		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
-			if(ptr == e->pWidget)return e;
+			if(TQT_BASE_OBJECT_CONST(ptr) == TQT_BASE_OBJECT(e->pWidget))return e;
 			if(e->pChildList)
 			{
 				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h
index fc8674cc..c5564d9e 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/instances.h
@@ -41,16 +41,16 @@ typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
 
 typedef struct _KviOptionsWidgetInstanceEntry
 {
-	KviOptionsWidget                          * (*createProc)(QWidget *);
+	KviOptionsWidget                          * (*createProc)(TQWidget *);
 	KviOptionsWidget                          * pWidget;   // singleton
 	int                                         iIcon;
-	QString                                     szName;
-	QString                                     szNameNoLocale;
+	TQString                                     szName;
+	TQString                                     szNameNoLocale;
 	const char                                * szClassName;
 	int                                         iPriority;
-	QString                                     szKeywords;
-	QString                                     szKeywordsNoLocale;
-	QString                                     szGroup;
+	TQString                                     szKeywords;
+	TQString                                     szKeywordsNoLocale;
+	TQString                                     szGroup;
 	bool                                        bIsContainer;
 	bool                                        bIsNotContained;
 	KviPointerList<KviOptionsWidgetInstanceEntry> * pChildList;
@@ -58,9 +58,10 @@ typedef struct _KviOptionsWidgetInstanceEntry
 } KviOptionsWidgetInstanceEntry;
 
 
-class KviOptionsInstanceManager : public QObject
+class KviOptionsInstanceManager : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviOptionsInstanceManager();
 	virtual ~KviOptionsInstanceManager();
@@ -68,12 +69,12 @@ protected:
 	KviPointerList<KviOptionsWidgetInstanceEntry> *  m_pInstanceTree;
 public:
 	KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
-	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par);
+	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par);
 	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
 	void cleanup(KviModule * m);
 protected:
 	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	KviOptionsWidgetInstanceEntry * findInstanceEntry(const TQObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
 	void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
 protected slots:
 	void widgetDestroyed();
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 175b61ff..38593666 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -37,11 +37,11 @@
 
 #include "dialog.h"
 
-#include <qsplitter.h>
+#include <tqsplitter.h>
 #include "kvi_pointerhashtable.h"
 
 
-KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict = 0;
+KviPointerHashTable<TQString,KviOptionsDialog> * g_pOptionsDialogDict = 0;
 
 KviOptionsInstanceManager * g_pOptionsInstanceManager = 0;
 
@@ -93,24 +93,24 @@ static bool options_kvs_cmd_save(KviKvsModuleCommandCall * c)
 
 static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 {
-	QString szGroup;
+	TQString szGroup;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
 	KVSM_PARAMETERS_END(c)
 	if(szGroup.isEmpty())szGroup = "general";
-	KviOptionsDialog * d = g_pOptionsDialogDict->find(szGroup);
+	KviOptionsDialog * d = g_pOptionsDialogDict->tqfind(szGroup);
 	if(d)
 	{
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			if(d->parent())
+			if(d->tqparent())
 			{
-				d->reparent(0,QPoint(0,0),true);
+				d->reparent(0,TQPoint(0,0),true);
 			}
 		} else {
-			if(d->parent() != c->window()->frame()->splitter())
+			if(TQT_BASE_OBJECT(d->tqparent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter()))
 			{
-				d->reparent(c->window()->frame()->splitter(),QPoint(0,0),true);
+				d->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true);
 			}
 		}
 	} else {
@@ -189,7 +189,7 @@ static bool options_kvs_cmd_pages(KviKvsModuleCommandCall * c)
 
 static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 {
-	QString szOption;
+	TQString szOption;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("option",KVS_PT_STRING,0,szOption)
 	KVSM_PARAMETERS_END(c)
@@ -209,11 +209,11 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	QWidget * w;
+	TQWidget * w;
 
 	if(c->hasSwitch('m',"modal"))
 	{
-		w = g_pApp->activeModalWidget();
+		w = TQT_TQWIDGET(g_pApp->activeModalWidget());
 		if(!w)w = g_pFrame;
 	} else {
 		w = g_pFrame;
@@ -223,12 +223,12 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 
 	wc->setup(g_pOptionsInstanceManager->getInstance(e,wc));
 
-	// a trick for the dialog covering the splash screen before the time (this is prolly a WM or Qt bug)
+	// a trick for the dialog covering the splash screen before the time (this is prolly a WM or TQt bug)
 	if(g_pSplashScreen)
 	{
 		if(g_pSplashScreen->isVisible()) // another bug: this ALWAYS RETURNS TRUE, even if the splash was hidden by a mouse click...
 		{
-			QObject::connect(g_pSplashScreen,SIGNAL(destroyed()),wc,SLOT(show()));
+			TQObject::connect(g_pSplashScreen,TQT_SIGNAL(destroyed()),wc,TQT_SLOT(show()));
 			return true;
 		}
 	}
@@ -259,12 +259,12 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 
 static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c)
 { 
-	QString szGroup;
+	TQString szGroup;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
 	KVSM_PARAMETERS_END(c)
 	if(szGroup.isEmpty())szGroup = "general";
-	c->returnValue()->setBoolean(g_pOptionsDialogDict->find(szGroup));
+	c->returnValue()->setBoolean(g_pOptionsDialogDict->tqfind(szGroup));
 	return true;
 }
 
@@ -279,7 +279,7 @@ static bool options_module_init(KviModule * m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",options_kvs_cmd_edit);
 	KVSM_REGISTER_FUNCTION(m,"isDialog",options_kvs_fnc_isdialog);
 
-	g_pOptionsDialogDict = new KviPointerHashTable<QString,KviOptionsDialog>;
+	g_pOptionsDialogDict = new KviPointerHashTable<TQString,KviOptionsDialog>;
 	g_pOptionsDialogDict->setAutoDelete(false);
 
 	return true;
@@ -287,7 +287,7 @@ static bool options_module_init(KviModule * m)
 
 static bool options_module_cleanup(KviModule *m)
 {
-	KviPointerHashTableIterator<QString,KviOptionsDialog> it(*g_pOptionsDialogDict);
+	KviPointerHashTableIterator<TQString,KviOptionsDialog> it(*g_pOptionsDialogDict);
 	KviPointerList<KviOptionsDialog> l;
 	l.setAutoDelete(false);
 	KviOptionsDialog * d;
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index 97be80b5..fd1d7ffe 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -90,7 +90,7 @@ protected:
 	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
 	KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
 	void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-protected slots:
+protected Q_SLOTS:
 	void widgetDestroyed();
 };
 
@@ -160,9 +160,9 @@ EOF
 
 for aclass in $CLASS_LIST; do
 	echo -n "KviOptionsWidget * class$aclass" >> $TARGET
-		echo "_createInstanceProc(QWidget * parent)" >> $TARGET
+		echo "_createInstanceProc(QWidget * tqparent)" >> $TARGET
 	echo "{" >> $TARGET
-	echo "	return new $aclass(parent);" >> $TARGET
+	echo "	return new $aclass(tqparent);" >> $TARGET
 	echo "}" >> $TARGET
 	echo "" >> $TARGET
 done
@@ -271,7 +271,7 @@ printclass()
 	fi
 }
 
-addchildren()
+addtqchildren()
 {
 	if [ -f "$CLASSDIR/$2" ]; then
 		LEVEL=`cat $CLASSDIR/$2`
@@ -282,7 +282,7 @@ addchildren()
 				echo "$3	e$1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;" >> $TARGET
 				echo "$3	e$1->pChildList->setAutoDelete(true);" >> $TARGET
 				NEXTLEVEL=`expr $1 + 1`
-				addchildren $NEXTLEVEL $achild "$3	"
+				addtqchildren $NEXTLEVEL $achild "$3	"
 			else
 				echo "$3	e$1->pChildList = 0;" >> $TARGET
 			fi
@@ -290,7 +290,7 @@ addchildren()
 	fi
 }
 
-addchildren 0 NOPARENT ""
+addtqchildren 0 NOPARENT ""
 
 
 rm -fr $CLASSDIR
@@ -308,10 +308,10 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 		{
 			if(e->pWidget)
 			{
-				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->tqparent()->inherits("KviOptionsWidgetContainer"))
 				{
 					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
-					delete e->pWidget->parent();
+					delete e->pWidget->tqparent();
 					e->pWidget =  0;
 				} else {
 					debug("Ops...i have deleted the options dialog ?");
@@ -352,9 +352,9 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		g_iOptionWidgetInstances++;
 		connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
 	}
-	if(e->pWidget->parent() != par)
+	if(e->pWidget->tqparent() != par)
 	{
-		QWidget * oldPar = (QWidget *)e->pWidget->parent();
+		QWidget * oldPar = (QWidget *)e->pWidget->tqparent();
 		e->pWidget->reparent(par,QPoint(0,0));
 		delete oldPar;
 	}
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index ba8180e6..b317307b 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -22,32 +22,32 @@
 
 #include "optw_antispam.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-#include <qlabel.h>
+#include <tqlabel.h>
 
 
 
-KviAntispamOptionsWidget::KviAntispamOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"antispam_options_widget")
+KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"antispam_options_widget")
 {
 	createLayout(3,1);
 
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options"));
 	m_b1 = addBoolSelector(g,__tr2qs_ctx("Private messages","options"),KviOption_boolUseAntiSpamOnPrivmsg);
-	connect(m_b1,SIGNAL(toggled(bool)),this,SLOT(reenableStuff(bool)));
+	connect(m_b1,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(reenableStuff(bool)));
 	m_b2 = addBoolSelector(g,__tr2qs_ctx("Private notices","options"),KviOption_boolUseAntiSpamOnNotice);
-	connect(m_b2,SIGNAL(toggled(bool)),this,SLOT(reenableStuff(bool)));
+	connect(m_b2,TQT_SIGNAL(toggled(bool)),this,TQT_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);
 
 	reenableStuff(true);
 
-	layout()->setRowStretch(2,1);
+	tqlayout()->setRowStretch(2,1);
 }
 
 KviAntispamOptionsWidget::~KviAntispamOptionsWidget()
diff --git a/src/modules/options/optw_antispam.h b/src/modules/options/optw_antispam.h
index 28e51b41..5e7f9bed 100644
--- a/src/modules/options/optw_antispam.h
+++ b/src/modules/options/optw_antispam.h
@@ -31,8 +31,9 @@
 class KviAntispamOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviAntispamOptionsWidget(QWidget * parent);
+	KviAntispamOptionsWidget(TQWidget * tqparent);
 	~KviAntispamOptionsWidget();
 protected:
 	KviBoolSelector * m_b1;
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index f93631fd..58165847 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -30,8 +30,8 @@
 
 #include "kvi_tal_tooltip.h"
 
-KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"avatar_advanced_options_widget")
+KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"avatar_advanced_options_widget")
 {
 	createLayout(4,1);
 	// AVATAR
@@ -48,18 +48,18 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * 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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
 	u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintAvatarScaleHeight,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars));
-	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
 
 	//2nd
 	g = addGroupBox(0,1,0,1,1,Qt::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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
 	u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintScaleAvatarsOnLoadHeight,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad));
-	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
 
 	// 2st Box
 	KviTalGroupBox *gs = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("Request CTCP","options"));
@@ -78,7 +78,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
 			"will be automatically requested.<br>" \
 			"A reasonable value might be 102400 bytes (100 K).</center>","options"));
 #endif
-	connect(bs,SIGNAL(toggled(bool)),us,SLOT(setEnabled(bool)));
+	connect(bs,TQT_SIGNAL(toggled(bool)),us,TQT_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_avatar.h b/src/modules/options/optw_avatar.h
index 2235a659..003f8d86 100644
--- a/src/modules/options/optw_avatar.h
+++ b/src/modules/options/optw_avatar.h
@@ -37,8 +37,9 @@
 class KviAvatarAdvancedOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviAvatarAdvancedOptionsWidget(QWidget * parent);
+	KviAvatarAdvancedOptionsWidget(TQWidget * tqparent);
 	~KviAvatarAdvancedOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index 151b8446..3f67fa24 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -23,7 +23,7 @@
 
 #include "optw_away.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
@@ -31,8 +31,8 @@
 //#warning "Info tips"
 
 
-KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"away_options_widget")
+KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"away_options_widget")
 {
 	createLayout(4,1);
 
@@ -42,11 +42,11 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
 
 	KviTalGroupBox *g = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("Away Nickname","options"));
 	m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway);	
-	connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool)));
+	connect(m_pEnableAwayNick,TQT_SIGNAL(toggled(bool)),this,TQT_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,SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,SLOT(setEnabled(bool)));
-	connect(m_pEnableCustomAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool)));
+	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)));
 	
 	// m_p <-- stands for pointer
 	// m_sz <-- stands for a string :)
diff --git a/src/modules/options/optw_away.h b/src/modules/options/optw_away.h
index e8892faa..53d342b0 100644
--- a/src/modules/options/optw_away.h
+++ b/src/modules/options/optw_away.h
@@ -31,8 +31,9 @@
 class KviAwayOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviAwayOptionsWidget(QWidget * parent);
+	KviAwayOptionsWidget(TQWidget * tqparent);
 	~KviAwayOptionsWidget();
 protected: 
 	KviBoolSelector		* m_pEnableAwayNick;
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 608b47bd..3427522d 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -28,11 +28,11 @@
 #include "kvi_locale.h"
 #include "kvi_options.h"
 #include "kvi_iconmanager.h"
-#include <qradiobutton.h>
+#include <tqradiobutton.h>
 
 
-KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"connection_options_widget")
+KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"connection_options_widget")
 {
 
 	createLayout(2,1);
@@ -76,11 +76,11 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b,__tr2qs_ctx("<center>This option will enable auto-reconnecting after an unexpected disconnect. " \
 						"An unexpected disconnect is the <b>termination</b> of a <b>fully connected IRC session</b> " \
-						"that was <b>not requested by the user</b> by the means of the QUIT message." \
-						"<p><b>Warning:</b> If you use /RAW to send a QUIT message to the server, " \
+						"that was <b>not requested by the user</b> by the means of the TQUIT message." \
+						"<p><b>Warning:</b> If you use /RAW to send a TQUIT message to the server, " \
 						"this option will not behave correctly, since does not detect the outgoing " \
-						"QUIT message and will attempt to reconnect after the server has closed the connection. " \
-						"For this reason, always use the /QUIT command to close your connections. " \
+						"TQUIT message and will attempt to reconnect after the server has closed the connection. " \
+						"For this reason, always use the /TQUIT command to close your connections. " \
 						"This option may also behave incorrectly with bouncers that support " \
 						"detaching, in this case a solution could be to prepare an alias that sends the " \
 						"bouncer \"detach\" command immediately before the \"quit\" command.<br>" \
@@ -89,13 +89,13 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
 	KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Maximum attempts (0: unlimited):","options"),
 			KviOption_uintMaxAutoReconnectAttempts,0,100,5,
 			KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect));
-	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_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
@@ -114,8 +114,8 @@ KviConnectionOptionsWidget::~KviConnectionOptionsWidget()
 
 
 
-KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ssl_options_widget")
+KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ssl_options_widget")
 {
 #ifdef COMPILE_SSL_SUPPORT
 	createLayout(3,1);
@@ -126,20 +126,20 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * 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,SIGNAL(toggled(bool)),f,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_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,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),p,TQT_SLOT(setEnabled(bool)));
 
 	gbox = addGroupBox(0,1,0,1,1,Qt::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,SIGNAL(toggled(bool)),f,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
 	p = addPasswordSelector(gbox,__tr2qs_ctx("Private key password:","options"),
 		&(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass)),KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey));
-	connect(b,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),p,TQT_SLOT(setEnabled(bool)));
 	addRowSpacer(0,2,0,2);
 #else
 	createLayout(1,1);
@@ -156,8 +156,8 @@ KviSSLOptionsWidget::~KviSSLOptionsWidget()
 
 
 
-KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"transport_options_widget")
+KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"transport_options_widget")
 {
 	createLayout(5,1);
 	KviUIntSelector * u;
@@ -174,17 +174,17 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * 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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
 
 	g = addGroupBox(0,3,0,3,2,Qt::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,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_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,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
 #endif //!COMPILE_IPV6_SUPPORT
 
 	addRowSpacer(0,4,0,4);
@@ -202,22 +202,22 @@ KviTransportOptionsWidget::~KviTransportOptionsWidget()
 
 
 
-KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ident_options_widget")
+KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ident_options_widget")
 {
 	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,SIGNAL(toggled(bool)),this,SLOT(enableIpv4InIpv6(bool)));
+	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableIpv4InIpv6(bool)));
 
 	KviTalGroupBox * gbox = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Output verbosity","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
-	connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool)));
 
 	addLabel(gbox,__tr2qs_ctx("Output identd messages to:","options"));
 
-	m_pActiveRadio = new QRadioButton(__tr2qs_ctx("Active window","options"),gbox);
-	m_pConsoleRadio = new QRadioButton(__tr2qs_ctx("Console","options"),gbox);
-	m_pQuietRadio = new QRadioButton(__tr2qs_ctx("Do not show any identd messages","options"),gbox);
+	m_pActiveRadio = new TQRadioButton(__tr2qs_ctx("Active window","options"),gbox);
+	m_pConsoleRadio = new TQRadioButton(__tr2qs_ctx("Console","options"),gbox);
+	m_pQuietRadio = new TQRadioButton(__tr2qs_ctx("Do not show any identd messages","options"),gbox);
 
 	switch(KVI_OPTION_UINT(KviOption_uintIdentdOutputMode))
 	{
@@ -235,30 +235,30 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
 	gbox = addGroupBox(0,2,0,2,1,Qt::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,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),b,TQT_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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
-	connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool)));
 
 	gbox = addGroupBox(0,3,0,3,1,Qt::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,SIGNAL(toggled(bool)),m_pEnableIpv6,SLOT(setEnabled(bool)));
-	connect(m_pEnableIpv6,SIGNAL(toggled(bool)),this,SLOT(enableIpv4InIpv6(bool)));
+	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)));
 #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,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool)));
+	connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool)));
 
 	addLabel(0,4,0,4,
 #ifdef COMPILE_ON_WINDOWS
@@ -307,8 +307,8 @@ void KviIdentOptionsWidget::enableIpv4InIpv6(bool)
 
 
 
-KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"connection_advanced_options_widget")
+KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"connection_advanced_options_widget")
 {
 
 }
diff --git a/src/modules/options/optw_connection.h b/src/modules/options/optw_connection.h
index 189ee4a0..fd180e42 100644
--- a/src/modules/options/optw_connection.h
+++ b/src/modules/options/optw_connection.h
@@ -31,8 +31,9 @@
 class KviConnectionOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviConnectionOptionsWidget(QWidget * parent);
+	KviConnectionOptionsWidget(TQWidget * tqparent);
 	~KviConnectionOptionsWidget();
 };
 
@@ -45,8 +46,9 @@ public:
 class KviConnectionAdvancedOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviConnectionAdvancedOptionsWidget(QWidget * parent);
+	KviConnectionAdvancedOptionsWidget(TQWidget * tqparent);
 	~KviConnectionAdvancedOptionsWidget();
 };
 
@@ -61,8 +63,9 @@ public:
 class KviSSLOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviSSLOptionsWidget(QWidget * parent);
+	KviSSLOptionsWidget(TQWidget * tqparent);
 	~KviSSLOptionsWidget();
 };
 
@@ -77,8 +80,9 @@ public:
 class KviTransportOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTransportOptionsWidget(QWidget * parent);
+	KviTransportOptionsWidget(TQWidget * tqparent);
 	~KviTransportOptionsWidget();
 };
 
@@ -88,13 +92,14 @@ public:
 #define KVI_OPTIONS_WIDGET_PARENT_KviIdentOptionsWidget KviConnectionAdvancedOptionsWidget
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentOptionsWidget 10
 
-class QRadioButton;
+class TQRadioButton;
 
 class KviIdentOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIdentOptionsWidget(QWidget * parent);
+	KviIdentOptionsWidget(TQWidget * tqparent);
 	~KviIdentOptionsWidget();
 
 	virtual void commit();
@@ -103,9 +108,9 @@ protected:
 	KviBoolSelector * m_pEnableIpv6;
 	KviBoolSelector * m_pIpv4InIpv6;
 
-	QRadioButton *m_pConsoleRadio;
-	QRadioButton *m_pActiveRadio;
-	QRadioButton *m_pQuietRadio;
+	TQRadioButton *m_pConsoleRadio;
+	TQRadioButton *m_pActiveRadio;
+	TQRadioButton *m_pQuietRadio;
 public slots:
 	void enableIpv4InIpv6(bool);
 };
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index 3913751e..72a6d039 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -30,13 +30,13 @@
 //	#include "kvi_tal_tooltip.h"
 //#endif
 
-KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ctcp_options_widget")
+KviCtcpOptionsWidget::KviCtcpOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ctcp_options_widget")
 {
 
 	createLayout(4,1);
 
-	QLabel * l;
+	TQLabel * l;
 	l = addLabel(0,0,0,0,__tr2qs_ctx("<center><b>Settings for CTCP.</b></center>"\
 					"<p>The <b>Client-To-Client Protocol</b> (CTCP) " \
 					"is used to transmit special control messages over an IRC connection. " \
diff --git a/src/modules/options/optw_ctcp.h b/src/modules/options/optw_ctcp.h
index 55bdb238..745f0bb7 100644
--- a/src/modules/options/optw_ctcp.h
+++ b/src/modules/options/optw_ctcp.h
@@ -32,8 +32,9 @@
 class KviCtcpOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviCtcpOptionsWidget(QWidget * parent);
+	KviCtcpOptionsWidget(TQWidget * tqparent);
 	~KviCtcpOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index f814858e..9d03daaf 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -22,12 +22,12 @@
 
 #include "optw_ctcpfloodprotection.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-#include <qlabel.h>
+#include <tqlabel.h>
 
 /*
 	@doc: ctcpfloodprotectionoptions
@@ -71,8 +71,8 @@
 */
 
 
-KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ctcpfloodprotection_options_widget")
+KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ctcpfloodprotection_options_widget")
 {
 	createLayout(4,2);
 
@@ -85,13 +85,13 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget
 #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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
 
 	KviTalGroupBox * g = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Ignored Requests","options"));
 	addBoolSelector(g,__tr2qs_ctx("PING","options"),KviOption_boolIgnoreCtcpPing);
diff --git a/src/modules/options/optw_ctcpfloodprotection.h b/src/modules/options/optw_ctcpfloodprotection.h
index 43f28fbe..0462c432 100644
--- a/src/modules/options/optw_ctcpfloodprotection.h
+++ b/src/modules/options/optw_ctcpfloodprotection.h
@@ -32,9 +32,10 @@
 class KviCtcpFloodProtectionOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
-//	Q_CLASSINFO("help","ctcpfloodprotectionoptions")
+  TQ_OBJECT
+//	TQ_CLASSINFO("help","ctcpfloodprotectionoptions")
 public:
-	KviCtcpFloodProtectionOptionsWidget(QWidget * parent);
+	KviCtcpFloodProtectionOptionsWidget(TQWidget * tqparent);
 	~KviCtcpFloodProtectionOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 1b792da3..d6d66e20 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -24,14 +24,14 @@
 
 #include "optw_dcc.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
 //#warning "Info tips"
 
-KviDccOptionsWidget::KviDccOptionsWidget(QWidget * pParent)
+KviDccOptionsWidget::KviDccOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
@@ -43,8 +43,8 @@ KviDccOptionsWidget::~KviDccOptionsWidget()
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccgeneral_options_widget")
+KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"dccgeneral_options_widget")
 {
 	createLayout(2,1);
 
@@ -65,8 +65,8 @@ KviDccGeneralOptionsWidget::~KviDccGeneralOptionsWidget()
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccgeneral_options_widget")
+KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"dccgeneral_options_widget")
 {
 	createLayout(5,1);
 
@@ -89,7 +89,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * 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,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
 
  	b = addBoolSelector(g,__tr2qs_ctx("Use user-defined port range","options"),KviOption_boolUserDefinedPortRange);
 
@@ -100,10 +100,10 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * 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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
 
 	u = addUIntSelector(hb,__tr2qs_ctx("Highest port:","options"),KviOption_uintDccMaxPort,1,65535,30000,KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange));
-	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
 
 	b = addBoolSelector(g,__tr2qs_ctx("Send a fixed address in requests","options"),KviOption_boolDccSendFakeAddressByDefault);
 
@@ -113,7 +113,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
 #endif
 
 	s = addStringSelector(g,__tr2qs_ctx("Send address/interface:","options"),KviOption_stringDefaultDccFakeAddress,KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault));
-	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_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,13 +122,13 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * 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,SIGNAL(toggled(bool)),b2,SLOT(setNotEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),b2,TQT_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>" \
 			"KVIrc will try to guess the IP address to use for DCC by looking up the local hostname as seen " \
 			"by the IRC server you're connected to.<br>This method is an exclusive alternative to the \"fixed address\" above.<br>" \
-			"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server does not mask hostnames).</center>","options"));
+			"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server does not tqmask hostnames).</center>","options"));
 #endif
 
 	b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"),
@@ -139,7 +139,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
 				"It's an ugly hack - use it only if nothing else works.</center>","options"));
 #endif
 									
-	connect(b2,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool)));
+	connect(b2,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool)));
 
 	b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Notify failed DCC handshakes to the remote end","options"),
 									KviOption_boolNotifyFailedDccHandshakes);
@@ -177,8 +177,8 @@ KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccSendOptionsWidget::KviDccSendOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccsend_options_widget")
+KviDccSendOptionsWidget::KviDccSendOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"dccsend_options_widget")
 {
 }
 
@@ -188,8 +188,8 @@ KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
 
 
 
-KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccsend_options_widget")
+KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"dccsend_options_widget")
 {
 	createLayout(5,1);
 
@@ -219,8 +219,8 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
 
 	KviBoolSelector * b1 = addBoolSelector(0,3,0,3,__tr2qs_ctx("Always open transfer window as minimized","options"),KviOption_boolCreateMinimizedDccSend);
 
-	connect(b1,SIGNAL(toggled(bool)),b3,SLOT(setNotEnabled(bool)));
-	connect(b2,SIGNAL(toggled(bool)),b4,SLOT(setEnabled(bool)));
+	connect(b1,TQT_SIGNAL(toggled(bool)),b3,TQT_SLOT(setNotEnabled(bool)));
+	connect(b2,TQT_SIGNAL(toggled(bool)),b4,TQT_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,4,0,4);
 }
@@ -230,8 +230,8 @@ KviDccSendGeneralOptionsWidget::~KviDccSendGeneralOptionsWidget()
 }
 
 
-KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccsend_advanced_options_widget")
+KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"dccsend_advanced_options_widget")
 {
 	createLayout(4,1);
 
@@ -265,13 +265,13 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 	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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_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(QWidget * paren
 #endif // COMPILE_INFO_TIPS
 
 	u = addUIntSelector(hb,__tr2qs_ctx("","options"),KviOption_uintDccSendIdleStepInMSec,1,65536,30,KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep));
-	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
 	u->setSuffix(__tr2qs_ctx(" msec","options"));
 	
 #ifdef COMPILE_INFO_TIPS
@@ -341,8 +341,8 @@ KviDccSendAdvancedOptionsWidget::~KviDccSendAdvancedOptionsWidget()
 //}
 
 
-KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"dccchat_options_widget")
+KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"dccchat_options_widget")
 {
 	createLayout(3,1);
 
@@ -352,7 +352,7 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
 
 	KviBoolSelector * b1 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Always open as minimized","options"),KviOption_boolCreateMinimizedDccChat);
 
-	connect(b1,SIGNAL(toggled(bool)),b,SLOT(setNotEnabled(bool)));
+	connect(b1,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setNotEnabled(bool)));
 
 	addRowSpacer(0,2,0,2);
 }
@@ -362,7 +362,7 @@ KviDccChatOptionsWidget::~KviDccChatOptionsWidget()
 }
 
 
-KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *p):KviOptionsWidget(p)
+KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(TQWidget *p):KviOptionsWidget(p)
 {
 	createLayout(8, 1);
 
@@ -371,7 +371,7 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *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,SIGNAL(toggled(bool)),b,SLOT(setNotEnabled(bool)));
+	connect(b1,TQT_SIGNAL(toggled(bool)),b,TQT_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_dcc.h b/src/modules/options/optw_dcc.h
index 5dc67424..90587666 100644
--- a/src/modules/options/optw_dcc.h
+++ b/src/modules/options/optw_dcc.h
@@ -32,8 +32,9 @@
 class KviDccOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviDccOptionsWidget(QWidget * parent);
+	KviDccOptionsWidget(TQWidget * tqparent);
 	~KviDccOptionsWidget();
 };
 
@@ -47,8 +48,9 @@ public:
 class KviDccGeneralOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviDccGeneralOptionsWidget(QWidget * parent);
+	KviDccGeneralOptionsWidget(TQWidget * tqparent);
 	~KviDccGeneralOptionsWidget();
 };
 
@@ -60,8 +62,9 @@ public:
 class KviDccAdvancedOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviDccAdvancedOptionsWidget(QWidget * parent);
+	KviDccAdvancedOptionsWidget(TQWidget * tqparent);
 	~KviDccAdvancedOptionsWidget();
 };
 
@@ -77,8 +80,9 @@ public:
 class KviDccSendOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviDccSendOptionsWidget(QWidget * parent);
+	KviDccSendOptionsWidget(TQWidget * tqparent);
 	~KviDccSendOptionsWidget();
 };
 
@@ -90,8 +94,9 @@ public:
 class KviDccSendGeneralOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviDccSendGeneralOptionsWidget(QWidget * parent);
+	KviDccSendGeneralOptionsWidget(TQWidget * tqparent);
 	~KviDccSendGeneralOptionsWidget();
 };
 
@@ -103,8 +108,9 @@ public:
 class KviDccSendAdvancedOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviDccSendAdvancedOptionsWidget(QWidget * parent);
+	KviDccSendAdvancedOptionsWidget(TQWidget * tqparent);
 	~KviDccSendAdvancedOptionsWidget();
 };
 
@@ -117,8 +123,9 @@ public:
 class KviDccChatOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviDccChatOptionsWidget(QWidget * parent);
+	KviDccChatOptionsWidget(TQWidget * tqparent);
 	~KviDccChatOptionsWidget();
 };
 
@@ -130,8 +137,9 @@ public:
 class KviDccVoiceOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviDccVoiceOptionsWidget(QWidget *);
+	KviDccVoiceOptionsWidget(TQWidget *);
 	~KviDccVoiceOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp
index 18f86902..c411b735 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/optw_generalopt.cpp
@@ -29,13 +29,13 @@
 #include "kvi_options.h"
 
 
-KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"generalopt_options_widget")
+KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"generalopt_options_widget")
 {
 
 	createLayout(1,4);
 
-	QLabel * l;
+	TQLabel * l;
 	l = addLabel(0,0,4,0,__tr2qs_ctx("This section contains the general client options<br>"\
 					"<p>like<b> sound, mediafiles, URL handler </b> etc... " \
 					"</p>","options"));
diff --git a/src/modules/options/optw_generalopt.h b/src/modules/options/optw_generalopt.h
index fbaaf192..7da3c28a 100644
--- a/src/modules/options/optw_generalopt.h
+++ b/src/modules/options/optw_generalopt.h
@@ -31,8 +31,9 @@
 class KviGeneralOptOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviGeneralOptOptionsWidget(QWidget * parent);
+	KviGeneralOptOptionsWidget(TQWidget * tqparent);
 	~KviGeneralOptOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index ef0f5442..bf12aafa 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -24,15 +24,15 @@
 
 #include "optw_highlighting.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-#include <qlabel.h>
+#include <tqlabel.h>
 
-KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"highlighting_options_widget")
+KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"highlighting_options_widget")
 {
 }
 
@@ -42,8 +42,8 @@ KviAlertHighlightingOptionsWidget::~KviAlertHighlightingOptionsWidget()
 
 
 
-KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"highlighting_options_widget")
+KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"highlighting_options_widget")
 {
 	createLayout(7,1);
 
@@ -51,9 +51,9 @@ KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent)
 
 	connect(
 		addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable word highlighting","options"),KviOption_boolUseWordHighlighting),
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addStringListSelector(0,1,0,1,__tr2qs_ctx("Words to highlight:","options"),KviOption_stringlistHighlightWords,KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)),
-		SLOT(setEnabled(bool)));
+		TQT_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);
@@ -81,8 +81,8 @@ KviHighlightingOptionsWidget::~KviHighlightingOptionsWidget()
 
 
 
-KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"highlighting_options_widget")
+KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"highlighting_options_widget")
 {
 	createLayout(2,1);
 
@@ -101,8 +101,8 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * 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,SIGNAL(toggled(bool)),b4,SLOT(setEnabled(bool)));
-	connect(b3,SIGNAL(toggled(bool)),b5,SLOT(setEnabled(bool)));
+	connect(b3,TQT_SIGNAL(toggled(bool)),b4,TQT_SLOT(setEnabled(bool)));
+	connect(b3,TQT_SIGNAL(toggled(bool)),b5,TQT_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(QWidget * 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,SIGNAL(toggled(bool)),b7,SLOT(setEnabled(bool)));
+	connect(b6,TQT_SIGNAL(toggled(bool)),b7,TQT_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,1,0,1);
 }
diff --git a/src/modules/options/optw_highlighting.h b/src/modules/options/optw_highlighting.h
index f222412e..6f03a0db 100644
--- a/src/modules/options/optw_highlighting.h
+++ b/src/modules/options/optw_highlighting.h
@@ -32,8 +32,9 @@
 class KviAlertHighlightingOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviAlertHighlightingOptionsWidget(QWidget * parent);
+	KviAlertHighlightingOptionsWidget(TQWidget * tqparent);
 	~KviAlertHighlightingOptionsWidget();
 };
 
@@ -45,8 +46,9 @@ public:
 class KviHighlightingOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviHighlightingOptionsWidget(QWidget * parent);
+	KviHighlightingOptionsWidget(TQWidget * tqparent);
 	~KviHighlightingOptionsWidget();
 };
 
@@ -58,8 +60,9 @@ public:
 class KviAlertOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviAlertOptionsWidget(QWidget * parent);
+	KviAlertOptionsWidget(TQWidget * tqparent);
 	~KviAlertOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 998ca5a4..4c892102 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -24,16 +24,16 @@
 
 #include "optw_identity.h"
 
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqlayout.h>
 #include "kvi_tal_tooltip.h"
-#include <qtabwidget.h>
-#include <qcombobox.h>
-#include <qmessagebox.h>
-#include <qtimer.h>
-#include <qvalidator.h>
+#include <tqtabwidget.h>
+#include <tqcombobox.h>
+#include <tqmessagebox.h>
+#include <tqtimer.h>
+#include <tqvalidator.h>
 
 #include "kvi_defaults.h"
 #include "kvi_settings.h"
@@ -51,51 +51,51 @@
 //#warning "Info tips"
 
 
-KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3)
-: QDialog(par)
+KviNickAlternativesDialog::KviNickAlternativesDialog(TQWidget * par,const TQString &n1,const TQString &n2,const TQString &n3)
+: TQDialog(par)
 {
-	QGridLayout * g = new QGridLayout(this,5,3,4,12);
+	TQGridLayout * g = new TQGridLayout(this,5,3,4,12);
 
 	setCaption(__tr2qs_ctx("Nickname alternatives","options"));
 
-	QLabel * l = new QLabel(this);
+	TQLabel * l = new TQLabel(this);
 	l->setText(__tr2qs_ctx("<center>Here you can choose up to three nicknames " \
 		"alternative to the primary one. KVIrc will use the alternatives " \
 		"if the primary nick is already used by someone else on a particular " \
 		"IRC network.</center>","options"));
 	g->addMultiCellWidget(l,0,0,0,2);
 
-	l = new QLabel(this);
+	l = new TQLabel(this);
 	l->setText(__tr2qs_ctx("Alt. Nickname 1:","options"));
 	g->addWidget(l,1,0);
-	m_pNickEdit1 = new QLineEdit(this);
+	m_pNickEdit1 = new TQLineEdit(this);
 	g->addMultiCellWidget(m_pNickEdit1,1,1,1,2);
 	m_pNickEdit1->setText(n1);
 
-	l = new QLabel(this);
+	l = new TQLabel(this);
 	l->setText(__tr2qs_ctx("Alt. Nickname 2:","options"));
 	g->addWidget(l,2,0);
-	m_pNickEdit2 = new QLineEdit(this);
+	m_pNickEdit2 = new TQLineEdit(this);
 	g->addMultiCellWidget(m_pNickEdit2,2,2,1,2);
 	m_pNickEdit2->setText(n2);
 
-	l = new QLabel(this);
+	l = new TQLabel(this);
 	l->setText(__tr2qs_ctx("Alt. Nickname 3:","options"));
 	g->addWidget(l,3,0);
-	m_pNickEdit3 = new QLineEdit(this);
+	m_pNickEdit3 = new TQLineEdit(this);
 	g->addMultiCellWidget(m_pNickEdit3,3,3,1,2);
 	m_pNickEdit3->setText(n3);
 	KviTalHBox * h = new KviTalHBox(this);
 	h->setSpacing(8);
 	g->addWidget(h,4,2);
 
-	QPushButton * pb = new QPushButton(__tr2qs_ctx("Cancel","options"),h);
+	TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Cancel","options"),h);
 	//g->addWidget(pb,4,2);
-	connect(pb,SIGNAL(clicked()),this,SLOT(reject()));
+	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
 
-	pb = new QPushButton(__tr2qs_ctx("Ok","options"),h);
+	pb = new TQPushButton(__tr2qs_ctx("Ok","options"),h);
 	pb->setDefault(true);
-	connect(pb,SIGNAL(clicked()),this,SLOT(accept()));
+	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept()));
 	
 	g->setColStretch(0,1);
 	
@@ -106,7 +106,7 @@ KviNickAlternativesDialog::~KviNickAlternativesDialog()
 {
 }
 
-void KviNickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3)
+void KviNickAlternativesDialog::fill(TQString &n1,TQString &n2,TQString &n3)
 {
 	n1 = m_pNickEdit1->text();
 	n2 = m_pNickEdit2->text();
@@ -124,25 +124,25 @@ void KviNickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3)
 
 
 
-KviAvatarDownloadDialog::KviAvatarDownloadDialog(QWidget * par,const QString &szUrl)
-: QDialog(par)
+KviAvatarDownloadDialog::KviAvatarDownloadDialog(TQWidget * par,const TQString &szUrl)
+: TQDialog(par)
 {
 	setCaption(__tr2qs_ctx("Avatar Download - KVIrc","options"));
 
 	m_szUrl = szUrl;
 
-	QGridLayout * g = new QGridLayout(this,2,2,4,8);
+	TQGridLayout * g = new TQGridLayout(this,2,2,4,8);
 
-	m_pOutput = new QLabel(__tr2qs_ctx("<center>Please wait while the avatar is being downloaded</center>","options"),this);
+	m_pOutput = new TQLabel(__tr2qs_ctx("<center>Please wait while the avatar is being downloaded</center>","options"),this);
 	g->addMultiCellWidget(m_pOutput,0,0,0,1);
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("Abort","options"),this);
+	TQPushButton * b = new TQPushButton(__tr2qs_ctx("Abort","options"),this);
 	g->addWidget(b,1,1);
-	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
 
 	m_pRequest = new KviHttpRequest();
 	
-	QTimer::singleShot(0,this,SLOT(startDownload()));
+	TQTimer::singleShot(0,this,TQT_SLOT(startDownload()));
 
 	g->setRowStretch(0,1);
 	g->setColStretch(0,1);
@@ -157,10 +157,10 @@ KviAvatarDownloadDialog::~KviAvatarDownloadDialog()
 
 void KviAvatarDownloadDialog::startDownload()
 {
-	connect(m_pRequest,SIGNAL(terminated(bool)),this,SLOT(downloadTerminated(bool)));
-	connect(m_pRequest,SIGNAL(status(const char *)),this,SLOT(downloadMessage(const char *)));
+	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 *)));
 
-	QString tmp = m_szUrl;
+	TQString tmp = m_szUrl;
 	g_pIconManager->urlToCachedFileName(tmp);
 	g_pApp->getLocalKvircDirectory(m_szLocalFileName,KviApp::Avatars,tmp);
 
@@ -172,7 +172,7 @@ void KviAvatarDownloadDialog::startDownload()
 	}
 }
 
-void KviAvatarDownloadDialog::closeEvent(QCloseEvent * e)
+void KviAvatarDownloadDialog::closeEvent(TQCloseEvent * e)
 {
 	m_szErrorMessage = __tr2qs_ctx("Download aborted by user","options");
 	e->ignore();
@@ -189,7 +189,7 @@ void KviAvatarDownloadDialog::downloadMessage(const char * message)
 {
 	if(message)
 	{
-		QString txt = "<center>";
+		TQString txt = "<center>";
 		txt += message;
 		txt += "</center>";
 		m_pOutput->setText(message);
@@ -207,15 +207,15 @@ void KviAvatarDownloadDialog::downloadTerminated(bool bSuccess)
 	}
 }
 
-KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &szInitialPath)
-: QDialog(par)
+KviAvatarSelectionDialog::KviAvatarSelectionDialog(TQWidget * par,const TQString &szInitialPath)
+: TQDialog(par)
 {
 	setCaption(__tr2qs_ctx("Choose Avatar - KVIrc","options"));
 
-	QGridLayout * g = new QGridLayout(this,3,3,4,8);
+	TQGridLayout * g = new TQGridLayout(this,3,3,4,8);
 	
 
-	QString msg = "<center>";
+	TQString msg = "<center>";
 	msg += __tr2qs_ctx("Please select an avatar image. " \
 				"The full path to a local file or an image on the Web can be used.<br>" \
 				"If you wish to use a local image file, click the \"<b>Browse</b>\"" \
@@ -223,30 +223,30 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &
 				"The full URL for an image (including <b>http://</b>) can be entered manually.","options");
 	msg += "</center><br>";
 
-	QLabel * l = new QLabel(msg,this);
+	TQLabel * l = new TQLabel(msg,this);
 	l->setMinimumWidth(250);
 
 	g->addMultiCellWidget(l,0,0,0,2);
 
-	m_pLineEdit = new QLineEdit(this);
+	m_pLineEdit = new TQLineEdit(this);
 	m_pLineEdit->setText(szInitialPath);
 	m_pLineEdit->setMinimumWidth(180);
 
 	g->addMultiCellWidget(m_pLineEdit,1,1,0,1);
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("&Browse...","options"),this);
-	connect(b,SIGNAL(clicked()),this,SLOT(chooseFileClicked()));
+	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&Browse...","options"),this);
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFileClicked()));
 	g->addWidget(b,1,2);
 	KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2);
-	b = new QPushButton(__tr2qs_ctx("&OK","options"),h);
+	b = new TQPushButton(__tr2qs_ctx("&OK","options"),h);
 	b->setMinimumWidth(80);
 	b->setDefault(true);
-	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
 	//g->addWidget(b,2,1);
 
-	b = new QPushButton(__tr2qs_ctx("Cancel","options"),h);
+	b = new TQPushButton(__tr2qs_ctx("Cancel","options"),h);
 	b->setMinimumWidth(80);
-	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
 	//g->addWidget(b,2,2);
 	
 	g->setRowStretch(0,1);
@@ -271,15 +271,15 @@ void KviAvatarSelectionDialog::cancelClicked()
 
 void KviAvatarSelectionDialog::chooseFileClicked()
 {
-	QString tmp;
+	TQString tmp;
  	if(KviFileDialog::askForOpenFileName(tmp,__tr2qs_ctx("Choose an Image File - KVIrc","options"),
-		QString::null,QString::null,false,true,this))
+		TQString(),TQString(),false,true,this))
 	{
 		m_pLineEdit->setText(tmp);
 	}
 }
 
-void KviAvatarSelectionDialog::closeEvent(QCloseEvent * e)
+void KviAvatarSelectionDialog::closeEvent(TQCloseEvent * e)
 {
 	e->ignore();
 	reject();
@@ -290,8 +290,8 @@ void KviAvatarSelectionDialog::closeEvent(QCloseEvent * e)
 
 
 
-KviIdentityOptionsWidget::KviIdentityOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviIdentityOptionsWidget::KviIdentityOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 }
 
@@ -302,8 +302,8 @@ KviIdentityOptionsWidget::~KviIdentityOptionsWidget()
 
 
 
-KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 	m_szAltNicknames[0] = KVI_OPTION_STRING(KviOption_stringNickname2);
 	m_szAltNicknames[1] = KVI_OPTION_STRING(KviOption_stringNickname3);
@@ -311,7 +311,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 
 
 	createLayout(3,1);
-	layout()->setMargin(10);
+	tqlayout()->setMargin(10);
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options"));
 	KviTalHBox * hb = new KviTalHBox(gbox);
@@ -325,11 +325,11 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 			"(case insensitive), you can provide alternative nicknames to be used in case"\
 			"the server refuses to accept the default one.</center>","options"));
 #endif
-	QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"),hb);
+	TQValidator * v = new TQRegExpValidator(TQRegExp("[^-0-9 ][^ ]*"),TQT_TQOBJECT(hb));
 	sel->setValidator(v);
 	
-	QPushButton * pb = new QPushButton(__tr2qs_ctx("Alternatives...","options"),hb);
-	connect(pb,SIGNAL(clicked()),this,SLOT(setNickAlternatives()));
+	TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Alternatives...","options"),hb);
+	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(setNickAlternatives()));
 
 	sel = addStringSelector(gbox,__tr2qs_ctx("Username:","options"),KviOption_stringUsername);
 	sel->setMinimumLabelWidth(120);
@@ -348,22 +348,22 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 #endif
 
 
-	QString szOptionalCtcpUserInfo = __tr2qs_ctx("This field is optional and will appear as part of the CTCP USERINFO reply.","options");
-	QString szCenterBegin("<center>");
-	QString szCenterEnd("</center>");
-	QString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd;
+	TQString szOptionalCtcpUserInfo = __tr2qs_ctx("This field is optional and will appear as part of the CTCP USERINFO reply.","options");
+	TQString szCenterBegin("<center>");
+	TQString szCenterEnd("</center>");
+	TQString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd;
 
 	gbox = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Profile","options"));
 
 	hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
 	
-	QLabel * l = new QLabel(__tr2qs_ctx("Age:","options"),hb);
+	TQLabel * l = new TQLabel(__tr2qs_ctx("Age:","options"),hb);
 	l->setMinimumWidth(120);
 	
-	m_pAgeCombo = new QComboBox(hb);
+	m_pAgeCombo = new TQComboBox(hb);
 #ifdef COMPILE_INFO_TIPS
-	QString szTip1 = szCenterBegin + __tr2qs_ctx("Here you can specify your age.","options") + szTrailing;
+	TQString szTip1 = szCenterBegin + __tr2qs_ctx("Here you can specify your age.","options") + szTrailing;
 	KviTalToolTip::add(l,szTip1);
 	KviTalToolTip::add(m_pAgeCombo,szTip1);
 #endif
@@ -371,7 +371,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	unsigned int i;
 	for(i=1;i<120;i++)
 	{
-		QString tmp;
+		TQString tmp;
 		tmp.setNum(i);
 		m_pAgeCombo->insertItem(tmp);
 	}
@@ -388,12 +388,12 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
 	
-	l = new QLabel(__tr2qs_ctx("Gender:","options"),hb);
+	l = new TQLabel(__tr2qs_ctx("Gender:","options"),hb);
 	l->setMinimumWidth(120);
 
-	m_pGenderCombo = new QComboBox(hb);
+	m_pGenderCombo = new TQComboBox(hb);
 #ifdef COMPILE_INFO_TIPS
-	QString szTip2 =  szCenterBegin + __tr2qs_ctx("Here you can specify your gender.","options") + szTrailing;
+	TQString szTip2 =  szCenterBegin + __tr2qs_ctx("Here you can specify your gender.","options") + szTrailing;
 	KviTalToolTip::add(l,szTip2);
 	KviTalToolTip::add(m_pGenderCombo,szTip2);
 #endif
@@ -402,9 +402,9 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	m_pGenderCombo->insertItem(__tr2qs_ctx("Female","options"));
 	m_pGenderCombo->insertItem(__tr2qs_ctx("Male","options"));
 
-	if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Male"))
+	if(KviTQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Male"))
 		m_pGenderCombo->setCurrentItem(2);
-	else if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Female"))
+	else if(KviTQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Female"))
 		m_pGenderCombo->setCurrentItem(1);
 	else
 		m_pGenderCombo->setCurrentItem(0);
@@ -445,7 +445,7 @@ KviIdentityGeneralOptionsWidget::~KviIdentityGeneralOptionsWidget()
 void KviIdentityGeneralOptionsWidget::setNickAlternatives()
 {
 	KviNickAlternativesDialog * dlg = new KviNickAlternativesDialog(this,m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
-	if(dlg->exec() != QDialog::Accepted)return;
+	if(dlg->exec() != TQDialog::Accepted)return;
 	dlg->fill(m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
 	delete dlg;
 }
@@ -488,18 +488,18 @@ void KviIdentityGeneralOptionsWidget::commit()
 }
 
 
-KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 	createLayout(4,1);
-	layout()->setMargin(10);
+	tqlayout()->setMargin(10);
 	
 	m_pLocalAvatar = new KviPixmap(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar));
 
 	bool bHaveAvatar = (!KVI_OPTION_STRING(KviOption_stringMyAvatar).isEmpty()) && m_pLocalAvatar->pixmap();
 
 #ifdef COMPILE_INFO_TIPS
-	QString szTip = __tr2qs_ctx("Here you can choose your avatar image. It will be visible<br>" \
+	TQString szTip = __tr2qs_ctx("Here you can choose your avatar image. It will be visible<br>" \
 							"by other people that request it. Choose a nice image of yourself,<br>" \
 							"possibly avoiding obscenity and offending images. It is a good idea<br>" \
 							"to choose a relatively small file (say 150 Kb max) because<br>" \
@@ -519,7 +519,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
 	addWidgetToLayout(m_pAvatarPreview,0,1,0,1);
 	m_pAvatarPreview->setPixmap(m_pLocalAvatar);
 	m_pAvatarPreview->setEnabled(bHaveAvatar);
-	connect(m_pUseAvatarCheck,SIGNAL(toggled(bool)),m_pAvatarPreview,SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pAvatarPreview,TQT_SLOT(setEnabled(bool)));
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pAvatarPreview,szTip);
 #endif
@@ -528,19 +528,19 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
 	hb->setSpacing(4);
 	addWidgetToLayout(hb,0,2,0,2);
 
-	m_pAvatarNameEdit = new QLineEdit(hb);
+	m_pAvatarNameEdit = new TQLineEdit(hb);
 	m_pAvatarNameEdit->setReadOnly(true);
 	m_pAvatarNameEdit->setEnabled(bHaveAvatar);
 	m_pAvatarNameEdit->setText(KVI_OPTION_STRING(KviOption_stringMyAvatar));
-	connect(m_pUseAvatarCheck,SIGNAL(toggled(bool)),m_pAvatarNameEdit,SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pAvatarNameEdit,TQT_SLOT(setEnabled(bool)));
 
-	m_pChooseAvatarButton = new QPushButton(__tr2qs_ctx("Choose...","options"),hb);
+	m_pChooseAvatarButton = new TQPushButton(__tr2qs_ctx("Choose...","options"),hb);
 	m_pChooseAvatarButton->setEnabled(bHaveAvatar);
-	connect(m_pUseAvatarCheck,SIGNAL(toggled(bool)),m_pChooseAvatarButton,SLOT(setEnabled(bool)));
+	connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pChooseAvatarButton,TQT_SLOT(setEnabled(bool)));
 
-	connect(m_pChooseAvatarButton,SIGNAL(clicked()),this,SLOT(chooseAvatar()));
+	connect(m_pChooseAvatarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseAvatar()));
 
-	layout()->setRowStretch(1,2);
+	tqlayout()->setRowStretch(1,2);
 }
 
 KviIdentityAvatarOptionsWidget::~KviIdentityAvatarOptionsWidget()
@@ -553,7 +553,7 @@ void KviIdentityAvatarOptionsWidget::commit(void)
 {
 	KviOptionsWidget::commit();
 
-	QString szAvatarName = m_pAvatarNameEdit->text();
+	TQString szAvatarName = m_pAvatarNameEdit->text();
 
 	if(m_pUseAvatarCheck->isChecked() && m_pLocalAvatar->pixmap() && (!szAvatarName.isEmpty()))
 	{
@@ -570,24 +570,24 @@ void KviIdentityAvatarOptionsWidget::commit(void)
 
 void KviIdentityAvatarOptionsWidget::chooseAvatar()
 {
-	QString szCurrent = m_pAvatarNameEdit->text();
+	TQString szCurrent = m_pAvatarNameEdit->text();
 
 	KviAvatarSelectionDialog dlg(this,szCurrent);
-	if(dlg.exec() != QDialog::Accepted)return;
+	if(dlg.exec() != TQDialog::Accepted)return;
 
 	szCurrent = dlg.avatarName();
 	szCurrent.stripWhiteSpace();
 
-	if(KviQString::equalCIN(szCurrent,"http://",7))
+	if(KviTQString::equalCIN(szCurrent,"http://",7))
 	{
 		// this is an url
 		// first check if we have it in the cache
-		KviAvatar * a = g_pIconManager->getAvatar(QString::null,szCurrent);
+		KviAvatar * a = g_pIconManager->getAvatar(TQString(),szCurrent);
 		if(!a)
 		{
 			// no cache... try downloading
 			KviAvatarDownloadDialog dlg(this,szCurrent);
-			if(dlg.exec() == QDialog::Accepted)
+			if(dlg.exec() == TQDialog::Accepted)
 			{
 				// downloaded!
 				// try to load it
@@ -595,17 +595,17 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 				{
 					// unloadable
 					szCurrent = "";
-					QMessageBox::warning(this,__tr2qs_ctx("Failed to Load Avatar - KVIrc","options"),
+					TQMessageBox::warning(this,__tr2qs_ctx("Failed to Load Avatar - KVIrc","options"),
 						__tr2qs_ctx("Failed to load the avatar image.<br>" \
 							"It may be an unaccessible file or an " \
-							"unsupported image format.","options"),QMessageBox::Ok,QMessageBox::NoButton);
+							"unsupported image format.","options"),TQMessageBox::Ok,TQMessageBox::NoButton);
 				} // else loaded!
 			} else {
 				// unloadable
-				QString tmp;
-				KviQString::sprintf(tmp,__tr2qs_ctx("Failed to download the avatar image.<br>" \
+				TQString tmp;
+				KviTQString::sprintf(tmp,__tr2qs_ctx("Failed to download the avatar image.<br>" \
 					"<b>%Q</b>","options"),&(dlg.errorMessage()));
-				QMessageBox::warning(this,__tr2qs_ctx("Avatar Download Failed - KVIrc","options"),tmp,QMessageBox::Ok,QMessageBox::NoButton);
+				TQMessageBox::warning(this,__tr2qs_ctx("Avatar Download Failed - KVIrc","options"),tmp,TQMessageBox::Ok,TQMessageBox::NoButton);
 				szCurrent = "";
 				m_pLocalAvatar->setNull();
 			}
@@ -619,14 +619,14 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 		if(m_pLocalAvatar->load(szCurrent))
 		{
 			// local path, loaded
-			QString tmp = szCurrent;
-			int idx = tmp.findRev("/");
+			TQString tmp = szCurrent;
+			int idx = tmp.tqfindRev("/");
 			if(idx != -1)
 			{
 				szCurrent = tmp.right(tmp.length() - (idx + 1));
 				tmp = szCurrent;
 			}
-			idx = tmp.findRev("\\");
+			idx = tmp.tqfindRev("\\");
 			if(idx != -1)
 			{
 				szCurrent = tmp.right(tmp.length() - (idx + 1));
@@ -634,10 +634,10 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 			}
 		} else {
 			// unloadable
-			QMessageBox::warning(this,__tr2qs_ctx("Failed to Load Avatar - KVIrc","options"),
+			TQMessageBox::warning(this,__tr2qs_ctx("Failed to Load Avatar - KVIrc","options"),
 					__tr2qs_ctx("Failed to load the avatar image.<br>" \
 						"It may be an unaccessible file or an " \
-						"unsupported image format.","options"),QMessageBox::Ok,QMessageBox::NoButton);
+						"unsupported image format.","options"),TQMessageBox::Ok,TQMessageBox::NoButton);
 			szCurrent = "";
 		}
 	}
@@ -646,7 +646,7 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 	{
 		if((m_pLocalAvatar->pixmap()->width() > 1024) || (m_pLocalAvatar->pixmap()->height() > 768))
 		{
-			QMessageBox::warning(this,__tr2qs_ctx("Avatar Might Be Too Big - KVIrc","options"),
+			TQMessageBox::warning(this,__tr2qs_ctx("Avatar Might Be Too Big - KVIrc","options"),
 						__tr2qs_ctx("The avatar you have choosen is bigger than 1024x768 pixels.<br>" \
 							"Such a big image will not be seen on all the user monitors<br>" \
 							"and will probably be scaled by the remote clients with poor quality<br>" \
@@ -664,21 +664,21 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 
 
 
-KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 	m_pISelector=0;
 	m_pWSelector=0;
 	m_pSSelector=0;
 
 	m_sModeStr = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
-	m_bI = m_sModeStr.contains('i');
-	m_bW = m_sModeStr.contains('w');
-	m_bS = m_sModeStr.contains('s');
+	m_bI = m_sModeStr.tqcontains('i');
+	m_bW = m_sModeStr.tqcontains('w');
+	m_bS = m_sModeStr.tqcontains('s');
     
 
 	createLayout(2,1);
-	layout()->setMargin(10);
+	tqlayout()->setMargin(10);
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("User Mode","options"));
 	m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI);
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index 479614c4..5170e4df 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -30,43 +30,45 @@
 #include "kvi_settings.h"
 #include "kvi_selectors.h"
 
-#include <qdialog.h>
+#include <tqdialog.h>
 #include "kvi_pixmap.h"
 
 
-class QLineEdit;
-class QCheckBox;
-class QPushButton;
-class QComboBox;
+class TQLineEdit;
+class TQCheckBox;
+class TQPushButton;
+class TQComboBox;
 
-class KviNickAlternativesDialog : public QDialog
+class KviNickAlternativesDialog : public TQDialog
 {
 	friend class KviIdentityGeneralOptionsWidget;
 	Q_OBJECT
+  TQ_OBJECT
 protected:
-	KviNickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3);
+	KviNickAlternativesDialog(TQWidget * par,const TQString &n1,const TQString &n2,const TQString &n3);
 	~KviNickAlternativesDialog();
 protected:
-	QLineEdit * m_pNickEdit1;
-	QLineEdit * m_pNickEdit2;
-	QLineEdit * m_pNickEdit3;
+	TQLineEdit * m_pNickEdit1;
+	TQLineEdit * m_pNickEdit2;
+	TQLineEdit * m_pNickEdit3;
 protected:
-	void fill(QString &n1,QString &n2,QString &n3);
+	void fill(TQString &n1,TQString &n2,TQString &n3);
 };
 
-class KviAvatarSelectionDialog : public QDialog
+class KviAvatarSelectionDialog : public TQDialog
 {
 	friend class KviIdentityAvatarOptionsWidget;
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviAvatarSelectionDialog(QWidget * par,const QString &szInitialPath);
+	KviAvatarSelectionDialog(TQWidget * par,const TQString &szInitialPath);
 	~KviAvatarSelectionDialog();
 protected:
-	QLineEdit   * m_pLineEdit;
-	QString       m_szAvatarName;
+	TQLineEdit   * m_pLineEdit;
+	TQString       m_szAvatarName;
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	const QString &avatarName(){ return m_szAvatarName; };
+	virtual void closeEvent(TQCloseEvent * e);
+	const TQString &avatarName(){ return m_szAvatarName; };
 protected slots:
 	void okClicked();
 	void cancelClicked();
@@ -75,23 +77,24 @@ protected slots:
 
 class KviHttpRequest;
 
-class KviAvatarDownloadDialog : public QDialog
+class KviAvatarDownloadDialog : public TQDialog
 {
 	friend class KviIdentityAvatarOptionsWidget;
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviAvatarDownloadDialog(QWidget * par,const QString &szUrl);
+	KviAvatarDownloadDialog(TQWidget * par,const TQString &szUrl);
 	~KviAvatarDownloadDialog();
 protected:
 	KviHttpRequest * m_pRequest;
-	QLabel         * m_pOutput;
-	QString          m_szErrorMessage;
-	QString          m_szLocalFileName;
-	QString          m_szUrl;
+	TQLabel         * m_pOutput;
+	TQString          m_szErrorMessage;
+	TQString          m_szLocalFileName;
+	TQString          m_szUrl;
 protected:
-	virtual void closeEvent(QCloseEvent * e);
-	const QString & localFileName(){ return m_szLocalFileName; };
-	const QString & errorMessage(){ return m_szErrorMessage; };
+	virtual void closeEvent(TQCloseEvent * e);
+	const TQString & localFileName(){ return m_szLocalFileName; };
+	const TQString & errorMessage(){ return m_szErrorMessage; };
 protected slots:
 	void startDownload();
 	void cancelClicked();
@@ -109,8 +112,9 @@ protected slots:
 class KviIdentityOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIdentityOptionsWidget(QWidget * parent);
+	KviIdentityOptionsWidget(TQWidget * tqparent);
 	~KviIdentityOptionsWidget();
 };
 
@@ -125,14 +129,15 @@ public:
 class KviIdentityGeneralOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIdentityGeneralOptionsWidget(QWidget * pParent);
+	KviIdentityGeneralOptionsWidget(TQWidget * pParent);
 	~KviIdentityGeneralOptionsWidget();
 protected:
-	QString            m_szAltNicknames[3];
+	TQString            m_szAltNicknames[3];
 
-	QComboBox        * m_pAgeCombo;
-	QComboBox        * m_pGenderCombo;
+	TQComboBox        * m_pAgeCombo;
+	TQComboBox        * m_pGenderCombo;
 protected slots:
 	void setNickAlternatives();
 protected:
@@ -149,13 +154,14 @@ protected:
 class KviIdentityAvatarOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIdentityAvatarOptionsWidget(QWidget * pParent);
+	KviIdentityAvatarOptionsWidget(TQWidget * pParent);
 	~KviIdentityAvatarOptionsWidget();
 protected:
-	QCheckBox        * m_pUseAvatarCheck;
-	QLineEdit        * m_pAvatarNameEdit;
-	QPushButton      * m_pChooseAvatarButton;
+	TQCheckBox        * m_pUseAvatarCheck;
+	TQLineEdit        * m_pAvatarNameEdit;
+	TQPushButton      * m_pChooseAvatarButton;
 	KviPixmap        * m_pLocalAvatar;
 	KviPixmapPreview * m_pAvatarPreview;
 protected slots:
@@ -174,8 +180,9 @@ protected:
 class KviIdentityAdvancedOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIdentityAdvancedOptionsWidget(QWidget * pParent);
+	KviIdentityAdvancedOptionsWidget(TQWidget * pParent);
 	~KviIdentityAdvancedOptionsWidget();
 protected:
 	bool               m_bI;
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index 26e4c0d9..d164f64f 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -22,7 +22,7 @@
 
 #include "optw_ignore.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
@@ -30,8 +30,8 @@
 //#warning "Info tips"
 
 
-KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ignore_options_widget")
+KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ignore_options_widget")
 {
 	createLayout(3,1);
 
@@ -39,7 +39,7 @@ KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * 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,SIGNAL(toggled(bool)),this,SLOT(enableVerbose(bool)));
+	connect(m_pIgnorePrivmsg,TQT_SIGNAL(toggled(bool)),this,TQT_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_ignore.h b/src/modules/options/optw_ignore.h
index cb7203f5..92864f33 100644
--- a/src/modules/options/optw_ignore.h
+++ b/src/modules/options/optw_ignore.h
@@ -33,8 +33,9 @@
 class KviIgnoreOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIgnoreOptionsWidget(QWidget * parent);
+	KviIgnoreOptionsWidget(TQWidget * tqparent);
 	~KviIgnoreOptionsWidget();
 public:
 	KviBoolSelector * m_pIgnorePrivmsg;
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index 4dd73987..210980e7 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -21,15 +21,15 @@
 //
 #include "optw_input.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
 //#warning "Info tips"
 
-KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircviewlook_options_widget")
+KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ircviewlook_options_widget")
 {
 	createLayout(10,2);
 
@@ -44,11 +44,11 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
 	addPixmapSelector(0,7,1,7,__tr2qs_ctx("Background image","options"),KviOption_pixmapInputBackground);
 
 	addLabel(0,8,0,8,__tr2qs_ctx("Horizontal align:","options"));
-	m_pHorizontalAlign=new QComboBox(this);
+	m_pHorizontalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pHorizontalAlign,1,8,1,8);
 	
 	addLabel(0,9,0,9,__tr2qs_ctx("Vertical align:","options"));
-	m_pVerticalAlign=new QComboBox(this);
+	m_pVerticalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,9,1,9);
 	
 	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Tile","options"));
@@ -61,30 +61,30 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Bottom","options"));
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Center","options"));
 	
-	switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignHorizontal_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & TQt::AlignHorizontal_Mask)
 	{
-		case Qt::AlignLeft:
+		case TQt::AlignLeft:
 			m_pHorizontalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignRight:
+		case TQt::AlignRight:
 			m_pHorizontalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignHCenter:
+		case TQt::AlignHCenter:
 			m_pHorizontalAlign->setCurrentItem(3);
 			break;
 		default:
 			m_pHorizontalAlign->setCurrentItem(0);
 	}
 	
-	switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignVertical_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & TQt::AlignVertical_Mask)
 	{
-		case Qt::AlignTop:
+		case TQt::AlignTop:
 			m_pVerticalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignBottom:
+		case TQt::AlignBottom:
 			m_pVerticalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignVCenter:
+		case TQt::AlignVCenter:
 			m_pVerticalAlign->setCurrentItem(3);
 			break;
 		default:
@@ -92,7 +92,7 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
 	}
 
 
-	layout()->setRowStretch(7,1);
+	tqlayout()->setRowStretch(7,1);
 }
 
 KviInputLookOptionsWidget::~KviInputLookOptionsWidget()
@@ -105,25 +105,25 @@ void KviInputLookOptionsWidget::commit()
 	switch(m_pHorizontalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignLeft;
+			iFlags|=TQt::AlignLeft;
 			break;
 		case 2:
-			iFlags|=Qt::AlignRight;
+			iFlags|=TQt::AlignRight;
 			break;
 		case 3:
-			iFlags|=Qt::AlignHCenter;
+			iFlags|=TQt::AlignHCenter;
 			break;
 	}
 	switch(m_pVerticalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignTop;
+			iFlags|=TQt::AlignTop;
 			break;
 		case 2:
-			iFlags|=Qt::AlignBottom;
+			iFlags|=TQt::AlignBottom;
 			break;
 		case 3:
-			iFlags|=Qt::AlignVCenter;
+			iFlags|=TQt::AlignVCenter;
 			break;
 	}
 	
@@ -133,8 +133,8 @@ void KviInputLookOptionsWidget::commit()
 
 
 
-KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircviewfeatures_options_widget")
+KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ircviewfeatures_options_widget")
 {
 	createLayout(6,1);
 
diff --git a/src/modules/options/optw_input.h b/src/modules/options/optw_input.h
index eb088460..0642ee71 100644
--- a/src/modules/options/optw_input.h
+++ b/src/modules/options/optw_input.h
@@ -26,7 +26,7 @@
 //==================================================================================
 
 #include "kvi_optionswidget.h"
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviInputLookOptionsWidget KVI_SMALLICON_INPUT
 #define KVI_OPTIONS_WIDGET_NAME_KviInputLookOptionsWidget __tr2qs_no_lookup("Input")
@@ -36,11 +36,12 @@
 class KviInputLookOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 private:
-	QComboBox* m_pHorizontalAlign;
-	QComboBox* m_pVerticalAlign;
+	TQComboBox* m_pHorizontalAlign;
+	TQComboBox* m_pVerticalAlign;
 public:
-	KviInputLookOptionsWidget(QWidget * parent);
+	KviInputLookOptionsWidget(TQWidget * tqparent);
 	~KviInputLookOptionsWidget();
 	
 	virtual void commit();
@@ -53,8 +54,9 @@ public:
 class KviInputFeaturesOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviInputFeaturesOptionsWidget(QWidget * parent);
+	KviInputFeaturesOptionsWidget(TQWidget * tqparent);
 	~KviInputFeaturesOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index 3cae7662..0eb2766e 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -24,8 +24,8 @@
 
 #include "optw_interfacefeatures.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 #include <string.h>
 
 #include "kvi_options.h"
@@ -33,8 +33,8 @@
 #include "kvi_app.h"
 #include "kvi_fileutils.h"
 
-KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"interfacefeatures_options_widget")
+KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"interfacefeatures_options_widget")
 {
 	createLayout(8,1);
 
@@ -44,7 +44,7 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Confirm quit with active connections","options"),KviOption_boolConfirmCloseWhenThereAreConnections);
 	addBoolSelector(0,2,0,2,__tr2qs_ctx("Remember window properties","options"),KviOption_boolWindowsRememberProperties);
 
-	QString szSplashDisableFile;
+	TQString szSplashDisableFile;
 	g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApp::Pics,"disable-splash." KVI_VERSION);
 	bool bDisableSplash = KviFileUtils::fileExists(szSplashDisableFile);
 	m_pDisableSplash = new KviStyledCheckBox(__tr2qs_ctx("Disable splash screen","options"),this);
@@ -71,7 +71,7 @@ void KviInterfaceFeaturesOptionsWidget::commit()
 {
 	KviOptionsWidget::commit();
 
-	QString szSplashDisableFile;
+	TQString szSplashDisableFile;
 	g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApp::Pics,"disable-splash." KVI_VERSION);
 
 	if(m_pDisableSplash->isChecked())
diff --git a/src/modules/options/optw_interfacefeatures.h b/src/modules/options/optw_interfacefeatures.h
index f85dfb9e..d302ce21 100644
--- a/src/modules/options/optw_interfacefeatures.h
+++ b/src/modules/options/optw_interfacefeatures.h
@@ -31,16 +31,17 @@
 #define KVI_OPTIONS_WIDGET_NAME_KviInterfaceFeaturesOptionsWidget __tr2qs_no_lookup("Interface")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviInterfaceFeaturesOptionsWidget 50000
 
-class QCheckBox;
+class TQCheckBox;
 
 class KviInterfaceFeaturesOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviInterfaceFeaturesOptionsWidget(QWidget * parent);
+	KviInterfaceFeaturesOptionsWidget(TQWidget * tqparent);
 	~KviInterfaceFeaturesOptionsWidget();
 protected:
-	QCheckBox * m_pDisableSplash;
+	TQCheckBox * m_pDisableSplash;
 public:
 	virtual void commit();
 };
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 50cf845f..5b7dde18 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -22,7 +22,7 @@
 
 #include "optw_interfacelookglobal.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_settings.h"
 #include "kvi_options.h"
@@ -31,8 +31,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 	createLayout(4,2);
 
@@ -41,7 +41,7 @@ KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(QWidget * parent)
 	KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication,
 							KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont));
 
-	connect(b,SIGNAL(toggled(bool)),f,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,3,1,3);
 }
@@ -53,8 +53,8 @@ KviThemeGeneralOptionsWidget::~KviThemeGeneralOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 
@@ -82,38 +82,38 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * p
 
 	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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_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,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_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,SIGNAL(toggled(bool)),c,SLOT(setEnabled(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),c,TQT_SLOT(setEnabled(bool)));
 
 //	addRowSpacer(0,13,0,13);
 #ifdef COMPILE_KDE_SUPPORT
 	m_pObtainBackgroundFromKdeBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use KDE desktop for transparency","options"),KviOption_boolObtainGlobalBackgroundFromKde,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,SLOT(setEnabled(bool)));
-	connect(m_pObtainBackgroundFromKdeBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
+	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)));
 
 	m_pUpdateKdeBackgroundOnChangeBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Keep in sync with KDE background changes","options"),KviOption_boolUpdateKdeBackgroundOnChange,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
 
 	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,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool)));
+	tqlayout()->setRowStretch(6,1);
+	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
 
 #else //!COMPILE_KDE_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);
+	tqlayout()->setRowStretch(4,1);
 #endif //!COMPILE_KDE_SUPPORT
-	connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool)));
-	connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
+	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
 #else
 	createLayout(1,1);
 	addRowSpacer(0,0,0,0);
@@ -147,8 +147,8 @@ void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bo
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 	createLayout(7,1);
 
@@ -169,15 +169,15 @@ KviThemeMdiCaptionsOptionsWidget::~KviThemeMdiCaptionsOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 	createLayout(2,1);
 
 	addColorSelector(0,0,0,0,__tr2qs_ctx("Background","options"),KviOption_colorMdiBackground);
 	addPixmapSelector(0,1,0,1,__tr2qs_ctx("Background Image","options"),KviOption_pixmapMdiBackground);
 
-	layout()->setRowStretch(1,1);
+	tqlayout()->setRowStretch(1,1);
 }
 
 KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
@@ -187,8 +187,8 @@ KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 	createLayout(9,1);
 	
@@ -204,7 +204,7 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(QWidget
 
 	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground);
 
-	layout()->setRowStretch(8,1);
+	tqlayout()->setRowStretch(8,1);
 }
 
 KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h
index ac4153b1..a631dbe8 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/optw_interfacelookglobal.h
@@ -37,8 +37,9 @@
 class KviThemeGeneralOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviThemeGeneralOptionsWidget(QWidget * parent);
+	KviThemeGeneralOptionsWidget(TQWidget * tqparent);
 	~KviThemeGeneralOptionsWidget();
 };
 
@@ -52,8 +53,9 @@ public:
 class KviThemeTransparencyOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviThemeTransparencyOptionsWidget(QWidget * parent);
+	KviThemeTransparencyOptionsWidget(TQWidget * tqparent);
 	~KviThemeTransparencyOptionsWidget();
 protected:
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -78,8 +80,9 @@ protected slots:
 class KviThemeMdiCaptionsOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviThemeMdiCaptionsOptionsWidget(QWidget * parent);
+	KviThemeMdiCaptionsOptionsWidget(TQWidget * tqparent);
 	~KviThemeMdiCaptionsOptionsWidget();
 };
 
@@ -91,8 +94,9 @@ public:
 class KviThemeMdiAreaOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviThemeMdiAreaOptionsWidget(QWidget * parent);
+	KviThemeMdiAreaOptionsWidget(TQWidget * tqparent);
 	~KviThemeMdiAreaOptionsWidget();
 };
 
@@ -105,8 +109,9 @@ public:
 class KviThemeToolBarAppletsOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviThemeToolBarAppletsOptionsWidget(QWidget * parent);
+	KviThemeToolBarAppletsOptionsWidget(TQWidget * tqparent);
 	~KviThemeToolBarAppletsOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 537fde9a..56552a23 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -28,11 +28,11 @@
 #include "kvi_options.h"
 #include "kvi_ircmask.h"
 
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 
-KviIrcOptionsWidget::KviIrcOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"irc_options_widget")
+KviIrcOptionsWidget::KviIrcOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"irc_options_widget")
 {
 }
 
@@ -42,8 +42,8 @@ KviIrcOptionsWidget::~KviIrcOptionsWidget()
 }
 
 
-KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"irc_options_widget")
+KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"irc_options_widget")
 {
 	createLayout(3,1);
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize console after successful login","options"),KviOption_boolMinimizeConsoleAfterConnect);
@@ -68,18 +68,18 @@ KviIrcGeneralOptionsWidget::~KviIrcGeneralOptionsWidget()
 
 
 
-KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"irc_advanced_options_widget")
+KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"irc_advanced_options_widget")
 {
 	createLayout(3,1);
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit);    
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option causes KVIrc to close " \
-		"the connection immediately after sending the QUIT message.<br>" \
+		"the connection immediately after sending the TQUIT message.<br>" \
 		"When this option is disabled, KVIrc will wait for the server " \
 		"to close the connection.<br>" \
-		"Note that if you use this, your QUIT message may be not displayed.</center>","options"));
+		"Note that if you use this, your TQUIT message may be not displayed.</center>","options"));
 #endif
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Prepend gender info to realname","options"),KviOption_boolPrependGenderInfoToRealname);    
 }
@@ -92,7 +92,7 @@ KviIrcAdvancedOptionsWidget::~KviIrcAdvancedOptionsWidget()
 
 
 
-KviChannelOptionsWidget::KviChannelOptionsWidget(QWidget * pParent)
+KviChannelOptionsWidget::KviChannelOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
@@ -102,7 +102,7 @@ KviChannelOptionsWidget::~KviChannelOptionsWidget()
 }
 
 
-KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent)
+KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	createLayout(5,1);
@@ -160,28 +160,28 @@ KviChannelGeneralOptionsWidget::~KviChannelGeneralOptionsWidget()
 }
 
 
-KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pParent)
+KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	createLayout(6,4);
 
 	KviBoolSelector * b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory);
 	
-	addLabel(0,1,0,1,__tr2qs_ctx("Default ban mask:","options"));
+	addLabel(0,1,0,1,__tr2qs_ctx("Default ban tqmask:","options"));
 	
-	m_pBanTypeCombo=new QComboBox(this);
+	m_pBanTypeCombo=new TQComboBox(this);
 	addWidgetToLayout(m_pBanTypeCombo,1,1,4,1);
 	
-	KviIrcMask hostmask("nick!user@machine.host.top");
-	KviIrcMask ipmask("nick!user@192.168.1.2");
-	QString tmp1;
-	QString tmp2;
+	KviIrcMask hosttqmask("nick!user@machine.host.top");
+	KviIrcMask iptqmask("nick!user@192.168.1.2");
+	TQString tmp1;
+	TQString tmp2;
 	for(int i=0;i<=26;i++)
 	{
 		
-		hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
-		ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
-		m_pBanTypeCombo->insertItem(QString("%1 (%2)").arg(tmp1).arg(tmp2));
+		hosttqmask.tqmask(tmp1,(KviIrcMask::MaskType)i);
+		iptqmask.tqmask(tmp2,(KviIrcMask::MaskType)i);
+		m_pBanTypeCombo->insertItem(TQString("%1 (%2)").tqarg(tmp1).tqarg(tmp2));
 	}
 	m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
 
diff --git a/src/modules/options/optw_irc.h b/src/modules/options/optw_irc.h
index cc33d284..d64c34ff 100644
--- a/src/modules/options/optw_irc.h
+++ b/src/modules/options/optw_irc.h
@@ -26,7 +26,7 @@
 
 #include "kvi_optionswidget.h"
 
-class QComboBox;
+class TQComboBox;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcOptionsWidget KVI_SMALLICON_IRC
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcOptionsWidget __tr2qs_no_lookup("IRC")
@@ -36,8 +36,9 @@ class QComboBox;
 class KviIrcOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIrcOptionsWidget(QWidget * parent);
+	KviIrcOptionsWidget(TQWidget * tqparent);
 	~KviIrcOptionsWidget();
 };
 
@@ -49,8 +50,9 @@ public:
 class KviIrcGeneralOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIrcGeneralOptionsWidget(QWidget * parent);
+	KviIrcGeneralOptionsWidget(TQWidget * tqparent);
 	~KviIrcGeneralOptionsWidget();
 };
 
@@ -63,8 +65,9 @@ public:
 class KviIrcAdvancedOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIrcAdvancedOptionsWidget(QWidget * parent);
+	KviIrcAdvancedOptionsWidget(TQWidget * tqparent);
 	~KviIrcAdvancedOptionsWidget();
 };
 
@@ -79,8 +82,9 @@ public:
 class KviChannelOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviChannelOptionsWidget(QWidget * parent);
+	KviChannelOptionsWidget(TQWidget * tqparent);
 	~KviChannelOptionsWidget();
 };
 
@@ -92,8 +96,9 @@ public:
 class KviChannelGeneralOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviChannelGeneralOptionsWidget(QWidget * parent);
+	KviChannelGeneralOptionsWidget(TQWidget * tqparent);
 	~KviChannelGeneralOptionsWidget();
 };
 
@@ -104,13 +109,14 @@ public:
 class KviChannelAdvancedOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviChannelAdvancedOptionsWidget(QWidget * parent);
+	KviChannelAdvancedOptionsWidget(TQWidget * tqparent);
 	~KviChannelAdvancedOptionsWidget();
 public:
 	virtual void commit();
 protected:
-	QComboBox * m_pBanTypeCombo;
+	TQComboBox * m_pBanTypeCombo;
 };
 
 #endif //_OPTW_IRC_H_
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index cfa28456..83414f33 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -22,28 +22,28 @@
 
 #include "optw_ircoutput.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_settings.h"
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-#include <qcombobox.h>
-#include <qlabel.h>
+#include <tqcombobox.h>
+#include <tqlabel.h>
 
 #ifdef COMPILE_INFO_TIPS
 	#include "kvi_tal_tooltip.h"
 #endif
 
-KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircoutput_options_widget")
+KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ircoutput_options_widget")
 {
 	createLayout(7,2);
 
-	QLabel * l =new QLabel(__tr2qs_ctx("Output verbosity","options"),this);
+	TQLabel * l =new TQLabel(__tr2qs_ctx("Output verbosity","options"),this);
 	addWidgetToLayout(l,0,0,0,0);
 
-	m_pVerbosityCombo = new QComboBox(false,this);
+	m_pVerbosityCombo = new TQComboBox(false,this);
 	addWidgetToLayout(m_pVerbosityCombo,1,0,1,0);
 	
 	m_pVerbosityCombo->insertItem(__tr2qs_ctx("Mute","options"));
diff --git a/src/modules/options/optw_ircoutput.h b/src/modules/options/optw_ircoutput.h
index 27e5c4c8..3c82add2 100644
--- a/src/modules/options/optw_ircoutput.h
+++ b/src/modules/options/optw_ircoutput.h
@@ -26,7 +26,7 @@
 #include "kvi_optionswidget.h"
 #include "kvi_tal_listview.h"
 
-class QComboBox;
+class TQComboBox;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcOutputOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcOutputOptionsWidget __tr2qs_no_lookup("Verbosity And Output")
@@ -37,11 +37,12 @@ class QComboBox;
 class KviIrcOutputOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIrcOutputOptionsWidget(QWidget * parent);
+	KviIrcOutputOptionsWidget(TQWidget * tqparent);
 	~KviIrcOutputOptionsWidget();
 protected:
-	QComboBox * m_pVerbosityCombo;
+	TQComboBox * m_pVerbosityCombo;
 protected:
 	virtual void commit();
 };
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 860f80c5..1c9e4a28 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -21,13 +21,13 @@
 //
 #include "optw_ircview.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
 //#warning "Info tips"
 
-KviIrcViewThemeOptionsWidget::KviIrcViewThemeOptionsWidget(QWidget * pParent)
+KviIrcViewThemeOptionsWidget::KviIrcViewThemeOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
@@ -38,8 +38,8 @@ KviIrcViewThemeOptionsWidget::~KviIrcViewThemeOptionsWidget()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircviewlook_options_widget")
+KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ircviewlook_options_widget")
 {
 	createLayout(6,2);
 
@@ -49,11 +49,11 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
 	addPixmapSelector(0,2,1,2,__tr2qs_ctx("Background image:","options"),KviOption_pixmapIrcViewBackground);
 
 	addLabel(0,3,0,3,__tr2qs_ctx("Horizontal align:","options"));
-	m_pHorizontalAlign=new QComboBox(this);
+	m_pHorizontalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pHorizontalAlign,1,3,1,3);
 	
 	addLabel(0,4,0,4,__tr2qs_ctx("Vertical align:","options"));
-	m_pVerticalAlign=new QComboBox(this);
+	m_pVerticalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,4,1,4);
 		
 	addColorSelector(0,5,1,5,__tr2qs_ctx("Mark Line:","options"),KviOption_colorIrcViewMarkLine);
@@ -68,37 +68,37 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Bottom","options"));
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Center","options"));
 	
-	switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & Qt::AlignHorizontal_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & TQt::AlignHorizontal_Mask)
 	{
-		case Qt::AlignLeft:
+		case TQt::AlignLeft:
 			m_pHorizontalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignRight:
+		case TQt::AlignRight:
 			m_pHorizontalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignHCenter:
+		case TQt::AlignHCenter:
 			m_pHorizontalAlign->setCurrentItem(3);
 			break;
 		default:
 			m_pHorizontalAlign->setCurrentItem(0);
 	}
 	
-	switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & Qt::AlignVertical_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & TQt::AlignVertical_Mask)
 	{
-		case Qt::AlignTop:
+		case TQt::AlignTop:
 			m_pVerticalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignBottom:
+		case TQt::AlignBottom:
 			m_pVerticalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignVCenter:
+		case TQt::AlignVCenter:
 			m_pVerticalAlign->setCurrentItem(3);
 			break;
 		default:
 			m_pVerticalAlign->setCurrentItem(0);
 	}
 	
-	layout()->setRowStretch(2,1);
+	tqlayout()->setRowStretch(2,1);
 }
 
 KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget()
@@ -111,25 +111,25 @@ void KviIrcViewLookOptionsWidget::commit()
 	switch(m_pHorizontalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignLeft;
+			iFlags|=TQt::AlignLeft;
 			break;
 		case 2:
-			iFlags|=Qt::AlignRight;
+			iFlags|=TQt::AlignRight;
 			break;
 		case 3:
-			iFlags|=Qt::AlignHCenter;
+			iFlags|=TQt::AlignHCenter;
 			break;
 	}
 	switch(m_pVerticalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignTop;
+			iFlags|=TQt::AlignTop;
 			break;
 		case 2:
-			iFlags|=Qt::AlignBottom;
+			iFlags|=TQt::AlignBottom;
 			break;
 		case 3:
-			iFlags|=Qt::AlignVCenter;
+			iFlags|=TQt::AlignVCenter;
 			break;
 	}
 	
@@ -139,8 +139,8 @@ void KviIrcViewLookOptionsWidget::commit()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircviewfeatures_options_widget")
+KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ircviewfeatures_options_widget")
 {
 	createLayout(14,1);
 
diff --git a/src/modules/options/optw_ircview.h b/src/modules/options/optw_ircview.h
index 3da03a5a..0f7fbfa7 100644
--- a/src/modules/options/optw_ircview.h
+++ b/src/modules/options/optw_ircview.h
@@ -27,7 +27,7 @@
 
 
 #include "kvi_optionswidget.h"
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcViewThemeOptionsWidget KVI_SMALLICON_IRCVIEW
@@ -39,8 +39,9 @@
 class KviIrcViewThemeOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIrcViewThemeOptionsWidget(QWidget * pParent);
+	KviIrcViewThemeOptionsWidget(TQWidget * pParent);
 	~KviIrcViewThemeOptionsWidget();
 };
 
@@ -54,11 +55,12 @@ public:
 class KviIrcViewLookOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 private:
-	QComboBox* m_pHorizontalAlign;
-	QComboBox* m_pVerticalAlign;
+	TQComboBox* m_pHorizontalAlign;
+	TQComboBox* m_pVerticalAlign;
 public:
-	KviIrcViewLookOptionsWidget(QWidget * parent);
+	KviIrcViewLookOptionsWidget(TQWidget * tqparent);
 	~KviIrcViewLookOptionsWidget();
 public:
 	virtual void commit();
@@ -73,8 +75,9 @@ public:
 class KviIrcViewFeaturesOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviIrcViewFeaturesOptionsWidget(QWidget * parent);
+	KviIrcViewFeaturesOptionsWidget(TQWidget * tqparent);
 	~KviIrcViewFeaturesOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 8c9cf201..89786184 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -23,7 +23,7 @@
 
 #include "optw_lag.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 #include "kvi_tal_tooltip.h"
 
 #include "kvi_options.h"
@@ -32,8 +32,8 @@
 //#warning "Info tips"
 
 
-KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"lag_options_widget")
+KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"lag_options_widget")
 {
 	createLayout(3,1);
 
@@ -53,7 +53,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
 			"the pings (if any) will be sent really less often. " \
 			"5000 is a reasonable value.</center>","options"));
 #endif
-    connect(pUse,SIGNAL(toggled(bool)),pInterval,SLOT(setEnabled(bool)));
+    connect(pUse,TQT_SIGNAL(toggled(bool)),pInterval,TQT_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(QWidget * 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,SIGNAL(toggled(bool)),pAlarm,SLOT(setEnabled(bool)));
+    connect(pUse,TQT_SIGNAL(toggled(bool)),pAlarm,TQT_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,SIGNAL(toggled(bool)),pShow,SLOT(setEnabled(bool)));
-    connect(pUse,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool)));
+    connect(pUse,TQT_SIGNAL(toggled(bool)),pShow,TQT_SLOT(setEnabled(bool)));
+    connect(pUse,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,2,0,2);
 
diff --git a/src/modules/options/optw_lag.h b/src/modules/options/optw_lag.h
index 7e49cafd..065c884f 100644
--- a/src/modules/options/optw_lag.h
+++ b/src/modules/options/optw_lag.h
@@ -32,8 +32,9 @@
 class KviLagOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviLagOptionsWidget(QWidget * parent);
+	KviLagOptionsWidget(TQWidget * tqparent);
 	~KviLagOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index 9d77836d..87b998a2 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -23,7 +23,7 @@
 
 #include "optw_logging.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
@@ -31,8 +31,8 @@
 //#warning "Info tips"
 
 
-KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"logging_options_widget")
+KviLoggingOptionsWidget::KviLoggingOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"logging_options_widget")
 {
 	createLayout(4,1);
 
diff --git a/src/modules/options/optw_logging.h b/src/modules/options/optw_logging.h
index f3f3e1c4..ede7d413 100644
--- a/src/modules/options/optw_logging.h
+++ b/src/modules/options/optw_logging.h
@@ -34,8 +34,9 @@
 class KviLoggingOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviLoggingOptionsWidget(QWidget * parent);
+	KviLoggingOptionsWidget(TQWidget * tqparent);
 	~KviLoggingOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index c798a4eb..0b0d7c5e 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -22,8 +22,8 @@
 
 #include "optw_mediatypes.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 #include "kvi_tal_tooltip.h"
 
 #include "kvi_options.h"
@@ -62,8 +62,8 @@ void KviMediaTypeListViewItem::copyData(KviMediaType * t)
 	setText(2,m_data.szDescription.ptr());	
 }
 
-KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"mediatypes_options_widget")
+KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"mediatypes_options_widget")
 {
 	createLayout(11,3);
 
@@ -75,74 +75,74 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 
 
 
-	connect(m_pListView,SIGNAL(currentChanged(KviTalListViewItem *)),this,SLOT(currentItemChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
 
-	layout()->addMultiCellWidget(m_pListView,0,0,0,2);
+	tqlayout()->addMultiCellWidget(m_pListView,0,0,0,2);
 
-	QLabel * l = new QLabel(__tr2qs_ctx("Description:","options"),this);
-	layout()->addWidget(l,1,0);
-	m_pDescription = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pDescription,1,1,1,2);
+	TQLabel * l = new TQLabel(__tr2qs_ctx("Description:","options"),this);
+	tqlayout()->addWidget(l,1,0);
+	m_pDescription = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pDescription,1,1,1,2);
 
-	l = new QLabel(__tr2qs_ctx("MIME type:","options"),this);
-	layout()->addWidget(l,2,0);
-	m_pIanaType = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
+	l = new TQLabel(__tr2qs_ctx("MIME type:","options"),this);
+	tqlayout()->addWidget(l,2,0);
+	m_pIanaType = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
 
-	l = new QLabel(__tr2qs_ctx("File pattern:","options"),this);
-	layout()->addWidget(l,3,0);
-	m_pFileMask = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
+	l = new TQLabel(__tr2qs_ctx("File pattern:","options"),this);
+	tqlayout()->addWidget(l,3,0);
+	m_pFileMask = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
 
-	l = new QLabel(__tr2qs_ctx("Magic bytes:","options"),this);
-	layout()->addWidget(l,4,0);
-	m_pMagicBytes = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
+	l = new TQLabel(__tr2qs_ctx("Magic bytes:","options"),this);
+	tqlayout()->addWidget(l,4,0);
+	m_pMagicBytes = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
 
-	l = new QLabel(__tr2qs_ctx("Save path:","options"),this);
-	layout()->addWidget(l,5,0);
-	m_pSavePath = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
+	l = new TQLabel(__tr2qs_ctx("Save path:","options"),this);
+	tqlayout()->addWidget(l,5,0);
+	m_pSavePath = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
 
-	l = new QLabel(__tr2qs_ctx("Local open command:","options"),this);
-	layout()->addWidget(l,6,0);
-	m_pCommandline = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
+	l = new TQLabel(__tr2qs_ctx("Local open command:","options"),this);
+	tqlayout()->addWidget(l,6,0);
+	m_pCommandline = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pCommandline,__tr2qs_ctx("<center>This field contains the command to execute to open a local file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Remote open command:","options"),this);
-	layout()->addWidget(l,7,0);
-	m_pRemoteExecCommandline = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
+	l = new TQLabel(__tr2qs_ctx("Remote open command:","options"),this);
+	tqlayout()->addWidget(l,7,0);
+	m_pRemoteExecCommandline = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Icon","options"),this);
-	layout()->addWidget(l,8,0);
-	m_pIcon = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pIcon,8,8,1,2);
+	l = new TQLabel(__tr2qs_ctx("Icon","options"),this);
+	tqlayout()->addWidget(l,8,0);
+	m_pIcon = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pIcon,8,8,1,2);
 
-	QFrame * f = new QFrame(this);
-	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
-	layout()->addMultiCellWidget(f,9,9,0,2);
+	TQFrame * f = new TQFrame(this);
+	f->setFrameStyle(TQFrame::Sunken | TQFrame::HLine);
+	tqlayout()->addMultiCellWidget(f,9,9,0,2);
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("&New","options"),this);
-	connect(b,SIGNAL(clicked()),this,SLOT(newMediaType()));
-	layout()->addWidget(b,10,1);
+	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this);
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType()));
+	tqlayout()->addWidget(b,10,1);
 
-	m_pDelete = new QPushButton(__tr2qs_ctx("Re&move","options"),this);
-	connect(m_pDelete,SIGNAL(clicked()),this,SLOT(delMediaType()));
-	layout()->addWidget(m_pDelete,10,2);
+	m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this);
+	connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType()));
+	tqlayout()->addWidget(m_pDelete,10,2);
 	
 
-	layout()->setColStretch(1,1);
-	layout()->setColStretch(2,1);
-	layout()->setRowStretch(0,1);
+	tqlayout()->setColStretch(1,1);
+	tqlayout()->setColStretch(2,1);
+	tqlayout()->setRowStretch(0,1);
 
 	m_pLastItem = 0;
 
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index 22fab930..06de7f7c 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -25,8 +25,8 @@
 
 #include "kvi_optionswidget.h"
 #include "kvi_tal_listview.h"
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
 
 #include "kvi_mediatype.h"
 
@@ -52,20 +52,21 @@ public:
 class KviMediaTypesOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviMediaTypesOptionsWidget(QWidget * parent);
+	KviMediaTypesOptionsWidget(TQWidget * tqparent);
 	~KviMediaTypesOptionsWidget();
 private:
 	KviTalListView   * m_pListView;
-	QLineEdit   * m_pDescription;
-	QLineEdit   * m_pIanaType;
-	QLineEdit   * m_pFileMask;
-	QLineEdit   * m_pSavePath;
-	QLineEdit   * m_pCommandline;
-	QLineEdit   * m_pMagicBytes;
-	QLineEdit   * m_pRemoteExecCommandline;
-	QLineEdit   * m_pIcon;
-	QPushButton * m_pDelete;
+	TQLineEdit   * m_pDescription;
+	TQLineEdit   * m_pIanaType;
+	TQLineEdit   * m_pFileMask;
+	TQLineEdit   * m_pSavePath;
+	TQLineEdit   * m_pCommandline;
+	TQLineEdit   * m_pMagicBytes;
+	TQLineEdit   * m_pRemoteExecCommandline;
+	TQLineEdit   * m_pIcon;
+	TQPushButton * m_pDelete;
 	KviMediaTypeListViewItem * m_pLastItem;
 private:
 	void fillListView();
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 54b4629a..9e79daa5 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -26,11 +26,11 @@
 
 #include "optw_messages.h"
 
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
 #include "kvi_tal_vbox.h"
-#include <qcursor.h>
-#include <qpainter.h>
+#include <tqcursor.h>
+#include <tqpainter.h>
 #include "kvi_styled_controls.h"
 
 #include "kvi_settings.h"
@@ -50,11 +50,11 @@
 //#warning "Info tips"
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
-	extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground;
+	extern KVIRC_API TQPixmap * g_pShadedChildGlobalDesktopBackground;
 #endif
 
 
-KviMessageOptionsWidget::KviMessageOptionsWidget(QWidget * pParent)
+KviMessageOptionsWidget::KviMessageOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
@@ -68,8 +68,8 @@ KviMessageOptionsWidget::~KviMessageOptionsWidget()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"privmsg_options_widget")
+KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"privmsg_options_widget")
 {
 	createLayout(4,1);
 
@@ -89,33 +89,33 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * 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,SIGNAL(toggled(bool)),b2,SLOT(setNotEnabled(bool)));
+	connect(b1,TQT_SIGNAL(toggled(bool)),b2,TQT_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);
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("User-defined prefix and postfix","options"),KviOption_boolUseExtendedPrivmsgView);
 
-	QLabel * l = addLabel(g,__tr2qs_ctx("[PREFIX]nickname[!user@host][POSTFIX] message","options"));
+	TQLabel * l = addLabel(g,__tr2qs_ctx("[PREFIX]nickname[!user@host][POSTFIX] message","options"));
 
 	l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView));
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		l,
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 
 	KviTalVBox * vb = new KviTalVBox(g);
 	vb->setSpacing(5);
 
 	connect(
 		b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addStringSelector(vb,__tr2qs_ctx("Prefix:","options"),KviOption_stringExtendedPrivmsgPrefix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 	connect(
 		b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addStringSelector(vb,__tr2qs_ctx("Postfix:","options"),KviOption_stringExtendedPrivmsgPostfix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 	addRowSpacer(0,3,0,3);
 }
 
@@ -124,30 +124,30 @@ KviPrivmsgOptionsWidget::~KviPrivmsgOptionsWidget()
 
 }
 
-KviTimestampOptionsWidget::KviTimestampOptionsWidget(QWidget * pParent)
+KviTimestampOptionsWidget::KviTimestampOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	createLayout(5,1);
 	m_pUseTimestampSelector = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp);
 	
-	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool)));
+	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),this,TQT_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,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool)));
+	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),b,TQT_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,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool)));
-	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,SLOT(setEnabled(bool)));
+	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)));
 	
 	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,SIGNAL(toggled(bool)),st,SLOT(setEnabled(bool)));
+	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),st,TQT_SLOT(setEnabled(bool)));
 
-	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,SLOT(setEnabled(bool)));
+	connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQT_SLOT(setEnabled(bool)));
 	addRowSpacer(0,4,0,4);
 }
 
@@ -162,8 +162,8 @@ void KviTimestampOptionsWidget::enableDisableTimestampSelector(bool)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"stdcolors")
+KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"stdcolors")
 {
 	createLayout(5,4);
 	
@@ -186,7 +186,7 @@ KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(QWidget * parent)
 
 	addRowSpacer(0,4,3,4);
 	
-	layout()->setRowStretch(4,1);
+	tqlayout()->setRowStretch(4,1);
 }
 
 KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget()
@@ -197,7 +197,7 @@ KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget()
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviMessageListView::KviMessageListView(QWidget * par)
+KviMessageListView::KviMessageListView(TQWidget * par)
 : KviTalListView(par)
 {
 	setItemMargin(2);
@@ -208,19 +208,19 @@ KviMessageListView::~KviMessageListView()
 }
 
 
-void KviMessageListView::paintEmptyAreaInternal(QPainter * p,const QRect &viewportRect,const QRect &painterRect)
+void KviMessageListView::paintEmptyAreaInternal(TQPainter * p,const TQRect &viewportRect,const TQRect &painterRect)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	if(g_pShadedChildGlobalDesktopBackground)
 	{
-		QPoint pnt = viewport()->mapToGlobal(viewportRect.topLeft());
+		TQPoint pnt = viewport()->mapToGlobal(viewportRect.topLeft());
 		p->drawTiledPixmap(painterRect.x(),painterRect.y(),painterRect.width(),painterRect.height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y());
 	} else {
 #endif
-		QPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap();
+		TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap();
 		if(pix)
 		{
-			QPoint pnt = viewportToContents(viewportRect.topLeft());
+			TQPoint pnt = viewportToContents(viewportRect.topLeft());
 			p->fillRect(painterRect.x(),painterRect.y(),painterRect.width(),painterRect.height(),KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
 			p->drawTiledPixmap(painterRect.x(),painterRect.y(),painterRect.width(),painterRect.height(),*pix,pnt.x(),pnt.y());
 		} else {
@@ -231,7 +231,7 @@ void KviMessageListView::paintEmptyAreaInternal(QPainter * p,const QRect &viewpo
 #endif
 }
 
-void KviMessageListView::paintEmptyArea(QPainter * p,const QRect &rct)
+void KviMessageListView::paintEmptyArea(TQPainter * p,const TQRect &rct)
 {
 	paintEmptyAreaInternal(p,rct,rct);
 	KviTalListView::paintEmptyArea(p,rct);
@@ -256,19 +256,19 @@ KviMessageListViewItem::~KviMessageListViewItem()
 	delete m_pMsgType;
 }
 
-void KviMessageListViewItem::paintCell(QPainter * p,const QColorGroup &,int,int w,int)
+void KviMessageListViewItem::paintCell(TQPainter * p,const TQColorGroup &,int,int w,int)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	if(g_pShadedChildGlobalDesktopBackground)
 	{
-		QPoint pnt = listView()->viewport()->mapToGlobal(QPoint(int(p->worldMatrix().dx()),int(p->worldMatrix().dy())));
+		TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(p->tqworldMatrix().dx()),int(p->tqworldMatrix().dy())));
 		p->drawTiledPixmap(0,0,w,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y());
 	} else {
 #endif
-		QPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap();
+		TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap();
 		if(pix)
 		{
-			QPoint pnt = listView()->viewportToContents(QPoint(int(p->worldMatrix().dx()),int(p->worldMatrix().dy())));
+			TQPoint pnt = listView()->viewportToContents(TQPoint(int(p->tqworldMatrix().dx()),int(p->tqworldMatrix().dy())));
 			p->fillRect(0,0,w,height(),KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
 			p->drawTiledPixmap(0,0,w,height(),*pix,pnt.x(),pnt.y());
 		} else {
@@ -283,23 +283,23 @@ void KviMessageListViewItem::paintCell(QPainter * p,const QColorGroup &,int,int
 	// draw the background
 	if(m_pMsgType->back() < 16)
 	{
-		QColor bColor = KVI_OPTION_MIRCCOLOR(m_pMsgType->back());
+		TQColor bColor = KVI_OPTION_MIRCCOLOR(m_pMsgType->back());
 		p->fillRect(22,listView()->itemMargin(),w - 24,height() - (listView()->itemMargin() * 2),bColor);
 	}
 	unsigned char ucFore = m_pMsgType->fore();
 	if(ucFore > 15)ucFore = 0;
-	p->setPen(QPen(KVI_OPTION_MIRCCOLOR(ucFore)));
+	p->setPen(TQPen(KVI_OPTION_MIRCCOLOR(ucFore)));
 	// skip the msgtype prefix
-	QString txt = (g_msgtypeOptionsTable[m_iOptId].name + 7);
+	TQString txt = (g_msgtypeOptionsTable[m_iOptId].name + 7);
 	txt += " (";
-	txt += __tr2qs_no_xgettext(QString::fromUtf8(m_pMsgType->type()));
+	txt += __tr2qs_no_xgettext(TQString::fromUtf8(m_pMsgType->type()));
 	txt += ")";
-	p->drawText(24,listView()->itemMargin(),w - 24,height() - (listView()->itemMargin() * 2),Qt::AlignLeft | Qt::AlignVCenter,txt);
+	p->drawText(24,listView()->itemMargin(),w - 24,height() - (listView()->itemMargin() * 2),TQt::AlignLeft | TQt::AlignVCenter,txt);
 	if(isSelected())
 	{
 #ifdef COMPILE_USE_QT4
-		QPen pen(KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
-		pen.setStyle(Qt::DashLine);
+		TQPen pen(KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
+		pen.setStyle(TQt::DashLine);
 		p->setPen( pen);
 		p->drawRect(0,0,w,height());
 		p->drawRect(1,1,w - 2,height() - 2);
@@ -312,8 +312,8 @@ void KviMessageListViewItem::paintCell(QPainter * p,const QColorGroup &,int,int
 }
 
 
-KviMessageColorListBoxItem::KviMessageColorListBoxItem(KviTalListBox * b,const QColor &clr,int idx)
-: KviTalListBoxText(b,QString::null)
+KviMessageColorListBoxItem::KviMessageColorListBoxItem(KviTalListBox * b,const TQColor &clr,int idx)
+: KviTalListBoxText(b,TQString())
 {
 	m_clr = clr;
 	m_iClrIdx = idx;
@@ -324,29 +324,25 @@ KviMessageColorListBoxItem::~KviMessageColorListBoxItem()
 {
 }
 
-void KviMessageColorListBoxItem::paint(QPainter * p)
+void KviMessageColorListBoxItem::paint(TQPainter * p)
 {
-	QColor clr;
+	TQColor clr;
 
 	const KviTalListBox * lb = (const KviTalListBox *)listBox();
 
 	if((m_iClrIdx >= 0) && (m_iClrIdx <= 15))
 	{
-		clr = lb->isEnabled() ? KVI_OPTION_MIRCCOLOR(m_iClrIdx) : Qt::gray;
+		clr = lb->isEnabled() ? KVI_OPTION_MIRCCOLOR(m_iClrIdx) : TQt::gray;
 		p->fillRect(0,0,width(lb),height(lb),clr);
 	} else {
-		clr = listBox()->colorGroup().background();
+		clr = listBox()->tqcolorGroup().background();
 		KviTalListBoxText::paint(p);
 	}
-#if QT_VERSION >= 300
 	if(isSelected())
-#else
-	if(selected())
-#endif
 	{
 #ifdef COMPILE_USE_QT4
-	QPen pen(clr);
-	pen.setStyle(Qt::DashLine);
+	TQPen pen(clr);
+	pen.setStyle(TQt::DashLine);
 	p->setPen( pen);
 	p->drawRect(0,0,width(lb),height(lb));
 	p->drawRect(1,1,width(lb) - 2,height(lb) - 2);
@@ -374,8 +370,8 @@ int KviMessageColorListBoxItem::height(const KviTalListBox *) const
 */
 
 /*
-KviIrcColorsOptionsWidget::KviIrcColorsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"irccolors","options")
+KviIrcColorsOptionsWidget::KviIrcColorsOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"irccolors","options")
 {
 	createLayout(5,4);
 
@@ -387,8 +383,8 @@ KviIrcColorsOptionsWidget::~KviIrcColorsOptionsWidget()
 }
 */
 
-KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"messages")
+KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"messages")
 {
 	int i;
 
@@ -404,9 +400,9 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	m_pListView->setFont(KVI_OPTION_FONT(KviOption_fontIrcView));
 	m_pListView->setStaticBackground(true);
 #ifdef COMPILE_USE_QT4
-	m_pListView->viewport()->setBackgroundMode(Qt::NoBackground);
+	m_pListView->viewport()->setBackgroundMode(TQt::NoBackground);
 #else
-	m_pListView->viewport()->setBackgroundMode(QWidget::NoBackground);
+	m_pListView->viewport()->setBackgroundMode(TQWidget::NoBackground);
 #endif
 
 	addWidgetToLayout(m_pListView,0,0,2,0);
@@ -414,16 +410,16 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	KviTalVBox * box = new KviTalVBox(this);
 	addWidgetToLayout(box,3,0,3,0);
 
-	QLabel * l = new QLabel(__tr2qs_ctx("Background:","options"),box);
+	TQLabel * l = new TQLabel(__tr2qs_ctx("Background:","options"),box);
 
 	m_pBackListBox = new KviTalListBox(box);
-	m_pBackItems[16] = new KviMessageColorListBoxItem(m_pBackListBox,Qt::gray,KVI_TRANSPARENT);
+	m_pBackItems[16] = new KviMessageColorListBoxItem(m_pBackListBox,TQt::gray,KVI_TRANSPARENT);
 	for(i=0;i<16;i++)
 	{
 		m_pBackItems[i] = new KviMessageColorListBoxItem(m_pBackListBox,KVI_OPTION_MIRCCOLOR(i),i);
 	}
 
-	l = new QLabel(__tr2qs_ctx("Foreground:","options"),box);
+	l = new TQLabel(__tr2qs_ctx("Foreground:","options"),box);
 
 	m_pForeListBox = new KviTalListBox(box);
 	for(i=0;i<16;i++)
@@ -431,23 +427,23 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 		m_pForeItems[i] = new KviMessageColorListBoxItem(m_pForeListBox,KVI_OPTION_MIRCCOLOR(i),i);
 	}
 
-	l = new QLabel(__tr2qs_ctx("Alert level:","options"),box);
+	l = new TQLabel(__tr2qs_ctx("Alert level:","options"),box);
 
 	m_pLevelListBox = new KviTalListBox(box);
 	KviTalListBoxText * lbt;
 	for(i=0;i<6;i++)
 	{
-		QString tmpn;
+		TQString tmpn;
 		tmpn.setNum(i);
 		lbt = new KviTalListBoxText(m_pLevelListBox,tmpn);
 	}
 
 	m_pIconButton = new KviStyledToolButton(box);
-	connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked()));
+	connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked()));
 
 	m_pIconPopup = new KviTalPopupMenu(this);
 	KviIconWidget * iw = new KviIconWidget(m_pIconPopup);
-	connect(iw,SIGNAL(selected(int)),this,SLOT(newIconSelected(int)));
+	connect(iw,TQT_SIGNAL(selected(int)),this,TQT_SLOT(newIconSelected(int)));
 	m_pIconPopup->insertItem(iw);
 
 
@@ -455,10 +451,10 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 
 	KviTalHBox * h = new KviTalHBox(this);
 	addWidgetToLayout(h,0,1,3,1);
-	QPushButton * b = new QPushButton(__tr2qs_ctx("Load From...","options"),h);
-	connect(b,SIGNAL(clicked()),this,SLOT(load()));
-	b = new QPushButton(__tr2qs_ctx("Save As...","options"),h);
-	connect(b,SIGNAL(clicked()),this,SLOT(save()));
+	TQPushButton * b = new TQPushButton(__tr2qs_ctx("Load From...","options"),h);
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(load()));
+	b = new TQPushButton(__tr2qs_ctx("Save As...","options"),h);
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(save()));
 
 
 	KviMessageListViewItem * it;
@@ -468,12 +464,12 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 		it = new KviMessageListViewItem(m_pListView,i);
 	}
 
-	layout()->setRowStretch(0,1);
-	layout()->setColStretch(0,1);
+	tqlayout()->setRowStretch(0,1);
+	tqlayout()->setColStretch(0,1);
 
-	connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(itemChanged(KviTalListViewItem *)));
-	connect(m_pForeListBox,SIGNAL(selectionChanged(KviTalListBoxItem *)),this,SLOT(colorChanged(KviTalListBoxItem *)));
-	connect(m_pBackListBox,SIGNAL(selectionChanged(KviTalListBoxItem *)),this,SLOT(colorChanged(KviTalListBoxItem *)));
+	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 *)));
 
 	itemChanged(0);
 }
@@ -488,7 +484,7 @@ void KviMessageColorsOptionsWidget::newIconSelected(int iconId)
 	if(iconId >= KVI_NUM_SMALL_ICONS)return;
 	m_pLastItem->msgType()->setPixId(iconId);
 	m_pIconButton->setIconSet(*(g_pIconManager->getSmallIcon(iconId)));
-	m_pListView->repaintItem(m_pLastItem);
+	m_pListView->tqrepaintItem(m_pLastItem);
 }
 
 void KviMessageColorsOptionsWidget::saveLastItem()
@@ -514,7 +510,7 @@ void KviMessageColorsOptionsWidget::saveLastItem()
 	curIt = m_pLevelListBox->currentItem();
 	if(curIt < 0 || curIt > 5)curIt = 1;
 	m_pLastItem->msgType()->setLevel(curIt);
-	m_pListView->repaintItem(m_pLastItem);
+	m_pListView->tqrepaintItem(m_pLastItem);
 }
 
 void KviMessageColorsOptionsWidget::itemChanged(KviTalListViewItem * it)
@@ -561,7 +557,7 @@ void KviMessageColorsOptionsWidget::colorChanged(KviTalListBoxItem *)
 
 void KviMessageColorsOptionsWidget::iconButtonClicked()
 {
-	m_pIconPopup->popup(QCursor::pos());
+	m_pIconPopup->popup(TQCursor::pos());
 }
 
 void KviMessageColorsOptionsWidget::commit()
@@ -582,8 +578,8 @@ void KviMessageColorsOptionsWidget::commit()
 
 void KviMessageColorsOptionsWidget::save()
 {
-	QString szName;
-	QString szInit;
+	TQString szName;
+	TQString szInit;
 	g_pApp->getLocalKvircDirectory(szInit,KviApp::MsgColors);
 
 	if(KviFileDialog::askForSaveFileName(szName,__tr2qs_ctx("Choose a Filename - KVIrc","options"),szInit))
@@ -623,18 +619,18 @@ void KviMessageColorsOptionsWidget::load()
 {
 
 	//KviStr szName;
-	QString szName;
+	TQString szName;
 	//KviStr szInit;
-	QString szInit;
+	TQString szInit;
 	g_pApp->getLocalKvircDirectory(szInit,KviApp::MsgColors);
 
 #ifndef COMPILE_ON_WINDOWS
 	// symlink local to global
 	//KviStr szGlobal;
-	QString szGlobal;
+	TQString szGlobal;
 	g_pApp->getGlobalKvircDirectory(szGlobal,KviApp::MsgColors);
 	//KviStr szLocal;
-	QString szLocal;
+	TQString szLocal;
 	g_pApp->getLocalKvircDirectory(szLocal,KviApp::MsgColors,"presets");
 	//debug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr());
 	//debug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr()));
@@ -654,7 +650,7 @@ void KviMessageColorsOptionsWidget::load()
 		cfg.setGroup("Messages");
 
 		//KviStr tmp;
-		QString tmp;
+		TQString tmp;
 		KviMessageListViewItem * it = (KviMessageListViewItem *)m_pListView->firstChild();
 
 		while(it)
@@ -682,7 +678,7 @@ void KviMessageColorsOptionsWidget::load()
 			int iLevel = cfg.readIntEntry(tmp,it->msgType()->level());
 			it->msgType()->setLevel(iLevel);
 
-			m_pListView->repaintItem(it);
+			m_pListView->tqrepaintItem(it);
 
 			it = (KviMessageListViewItem *)(it->nextSibling());
 		}
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index 7f82a145..e8ecb59a 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -29,8 +29,8 @@
 
 #include "kvi_tal_listview.h"
 #include "kvi_tal_listbox.h"
-#include <qcheckbox.h>
-#include <qtoolbutton.h>
+#include <tqcheckbox.h>
+#include <tqtoolbutton.h>
 #include "kvi_tal_popupmenu.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviMessageOptionsWidget KVI_SMALLICON_MESSAGES
@@ -42,8 +42,9 @@
 class KviMessageOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviMessageOptionsWidget(QWidget * pParent);
+	KviMessageOptionsWidget(TQWidget * pParent);
 	~KviMessageOptionsWidget();
 };
 
@@ -58,8 +59,9 @@ public:
 class KviPrivmsgOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviPrivmsgOptionsWidget(QWidget * parent);
+	KviPrivmsgOptionsWidget(TQWidget * tqparent);
 	~KviPrivmsgOptionsWidget();
 };
 
@@ -73,8 +75,9 @@ public:
 class KviTimestampOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTimestampOptionsWidget(QWidget * parent);
+	KviTimestampOptionsWidget(TQWidget * tqparent);
 	~KviTimestampOptionsWidget();
 public:
 	KviBoolSelector * m_pUseTimestampSelector;
@@ -94,13 +97,14 @@ protected slots:
 class KviMessageListView : public KviTalListView
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviMessageListView(QWidget * par);
+	KviMessageListView(TQWidget * par);
 	~KviMessageListView();
 protected:
-	void paintEmptyAreaInternal(QPainter * p,const QRect &viewportRect,const QRect &painterRect);
+	void paintEmptyAreaInternal(TQPainter * p,const TQRect &viewportRect,const TQRect &painterRect);
 public:
-	void paintEmptyArea(QPainter * p,const QRect &rct);
+	void paintEmptyArea(TQPainter * p,const TQRect &rct);
 };
 
 
@@ -115,20 +119,20 @@ private:
 public:
 	int optionId(){ return m_iOptId; };
 	KviMsgType * msgType(){ return m_pMsgType; };
-	virtual void paintCell(QPainter * p,const QColorGroup &,int,int,int);
+	virtual void paintCell(TQPainter * p,const TQColorGroup &,int,int,int);
 };
 
 
 class KviMessageColorListBoxItem : public KviTalListBoxText
 {
 public:
-	KviMessageColorListBoxItem(KviTalListBox * b,const QColor & clr,int idx);
+	KviMessageColorListBoxItem(KviTalListBox * b,const TQColor & clr,int idx);
 	~KviMessageColorListBoxItem();
 public:
 	int m_iClrIdx;
-	QColor m_clr;
+	TQColor m_clr;
 public:
-	virtual void paint(QPainter * p);
+	virtual void paint(TQPainter * p);
 	virtual int width(const KviTalListBox * lv) const { return 120; };
 };
 
@@ -138,8 +142,9 @@ public:
 class KviMessageColorsOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviMessageColorsOptionsWidget(QWidget * parent);
+	KviMessageColorsOptionsWidget(TQWidget * tqparent);
 	~KviMessageColorsOptionsWidget();
 public:
 	KviMessageListView         * m_pListView;
@@ -149,8 +154,8 @@ public:
 	KviMessageColorListBoxItem * m_pForeItems[16];
 	KviMessageColorListBoxItem * m_pBackItems[17];
 	KviMessageListViewItem     * m_pLastItem;
-	QCheckBox                  * m_pEnableLogging;
-	QToolButton                * m_pIconButton;
+	TQCheckBox                  * m_pEnableLogging;
+	TQToolButton                * m_pIconButton;
 	KviTalPopupMenu                 * m_pIconPopup;
 public:
 	void saveLastItem();
@@ -174,8 +179,9 @@ protected slots:
 class KviStandardColorsOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviStandardColorsOptionsWidget(QWidget * par);
+	KviStandardColorsOptionsWidget(TQWidget * par);
 	~KviStandardColorsOptionsWidget();
 	
 };
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index f182dc32..92d17036 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -24,13 +24,13 @@
 
 #include "optw_nickserv.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 #include "kvi_tal_tooltip.h"
 #include "kvi_tal_listview.h"
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qmessagebox.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqmessagebox.h>
 
 #include "kvi_qstring.h"
 #include "kvi_options.h"
@@ -42,43 +42,43 @@
 extern KVIRC_API KviNickServRuleSet * g_pNickServRuleSet;
 
 
-KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskField)
-: QDialog(par)
+KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskField)
+: TQDialog(par)
 {
 	setCaption(__tr2qs_ctx("NickServ Authentication Rule","options"));
 
-	QString html_center_begin = "<center>";
-	QString html_center_end = "</center>";
+	TQString html_center_begin = "<center>";
+	TQString html_center_end = "</center>";
 
-	QGridLayout * gl = new QGridLayout(this,bUseServerMaskField ? 7 : 6,4,10,5);
+	TQGridLayout * gl = new TQGridLayout(this,bUseServerMaskField ? 7 : 6,4,10,5);
 	
-	QLabel * l = new QLabel(__tr2qs_ctx("Registered NickName","options"),this);
+	TQLabel * l = new TQLabel(__tr2qs_ctx("Registered NickName","options"),this);
 	gl->addWidget(l,0,0);
 	
-	m_pRegisteredNickEdit = new QLineEdit(this);
+	m_pRegisteredNickEdit = new TQLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pRegisteredNickEdit,html_center_begin + __tr2qs_ctx("Put here the nickname that you have registered with NickServ","options") + html_center_end);
 #endif
 	gl->addMultiCellWidget(m_pRegisteredNickEdit,0,0,1,3);
 	
-	l = new QLabel(__tr2qs_ctx("NickServ Mask","options"),this);
+	l = new TQLabel(__tr2qs_ctx("NickServ Mask","options"),this);
 	gl->addWidget(l,1,0);
 	
-	m_pNickServMaskEdit = new QLineEdit(this);
+	m_pNickServMaskEdit = new TQLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pNickServMaskEdit,
-		html_center_begin + __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. "  \
+		html_center_begin + __tr2qs_ctx("This is the tqmask that NickServ must match to be correctly identified as the NickServ service. "  \
 			"This usually will be something like <b>NickServ!service@services.dalnet</b>.<br>" \
 			"You can use wildcards for this field, but generally it is a security flaw. " \
 			"If you're 100%% sure that NO user on the network can use the nickname \"NickServ\", " \
-			"the mask <b>NickServ!*@*</b> may be safe to use in this field.","options") + html_center_end);
+			"the tqmask <b>NickServ!*@*</b> may be safe to use in this field.","options") + html_center_end);
 #endif
 	gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3);
 	
-	l = new QLabel(__tr2qs_ctx("Message Regexp","options"),this);
+	l = new TQLabel(__tr2qs_ctx("Message Regexp","options"),this);
 	gl->addWidget(l,2,0);
 
-	m_pMessageRegexpEdit = new QLineEdit(this);
+	m_pMessageRegexpEdit = new TQLineEdit(this);
 	gl->addMultiCellWidget(m_pMessageRegexpEdit,2,2,1,3);
 
 #ifdef COMPILE_INFO_TIPS
@@ -89,14 +89,14 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 			"and it is sent when the NickServ wants you to authenticate yourself. " \
 			"You can use the * and ? wildcards.","options") + html_center_end);
 #endif
-	l = new QLabel(__tr2qs_ctx("Identify Command","options"),this);
+	l = new TQLabel(__tr2qs_ctx("Identify Command","options"),this);
 	gl->addWidget(l,3,0);
 
-	m_pIdentifyCommandEdit = new QLineEdit(this);
+	m_pIdentifyCommandEdit = new TQLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pIdentifyCommandEdit,
 		html_center_begin + __tr2qs_ctx("This is the command that will be executed when NickServ requests authentication " \
-			"for the nickname described in this rule (if the both server and NickServ mask are matched). " \
+			"for the nickname described in this rule (if the both server and NickServ tqmask are matched). " \
 			"This usually will be something like <b>msg NickServ identify &lt;yourpassword&gt;</b>.<br>" \
 			"You can use <b>msg -q</b> if you don't want the password echoed on the screen. " \
 			"Please note that there is no leading slash in this command.","options") + html_center_end);
@@ -108,13 +108,13 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 
 	if(bUseServerMaskField)
 	{
-		l = new QLabel(__tr2qs_ctx("Server mask","options"),this);
+		l = new TQLabel(__tr2qs_ctx("Server tqmask","options"),this);
 		gl->addWidget(l,4,0);
 		
-		m_pServerMaskEdit = new QLineEdit(this);
+		m_pServerMaskEdit = new TQLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
 		KviTalToolTip::add(m_pServerMaskEdit,
-			html_center_begin + __tr2qs_ctx("This is the mask that the current server must match in order " \
+			html_center_begin + __tr2qs_ctx("This is the tqmask that the current server must match in order " \
 			"for this rule to apply. It can contain * and ? wildcards.<br>Do NOT use simply \"*\" here...","options") + html_center_end);
 #endif
 		gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3);
@@ -125,24 +125,24 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 
 
 #ifdef COMPILE_INFO_TIPS
-	l = new QLabel(html_center_begin + __tr2qs_ctx("Hint: Move the mouse cursor over the fields to get help","options") + html_center_end,this);
+	l = new TQLabel(html_center_begin + __tr2qs_ctx("Hint: Move the mouse cursor over the fields to get help","options") + html_center_end,this);
 #else
-	l = new QLabel("",this);
+	l = new TQLabel("",this);
 #endif
 	l->setMargin(10);
 	gl->addMultiCellWidget(l,iNextLine,iNextLine,0,3);
 
 	iNextLine++;
 
-	QPushButton * p = new QPushButton(__tr2qs_ctx("Cancel","options"),this);
+	TQPushButton * p = new TQPushButton(__tr2qs_ctx("Cancel","options"),this);
 	p->setMinimumWidth(100);
-	connect(p,SIGNAL(clicked()),this,SLOT(reject()));
+	connect(p,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
 	gl->addWidget(p,iNextLine,2);
 
-	m_pOkButton = new QPushButton(__tr2qs_ctx("OK","options"),this);
+	m_pOkButton = new TQPushButton(__tr2qs_ctx("OK","options"),this);
 	m_pOkButton->setMinimumWidth(100);
 	m_pOkButton->setDefault(true);
-	connect(m_pOkButton,SIGNAL(clicked()),this,SLOT(okPressed()));
+	connect(m_pOkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(okPressed()));
 	gl->addWidget(m_pOkButton,iNextLine,3);
 
 	gl->setColStretch(1,1);
@@ -159,20 +159,20 @@ KviNickServRuleEditor::~KviNickServRuleEditor()
 
 bool KviNickServRuleEditor::validate()
 {
-	QString s = m_pRegisteredNickEdit->text();
+	TQString s = m_pRegisteredNickEdit->text();
 	
-	QString m = __tr2qs_ctx("Invalid NickServ Rule","options");
-	QString o = __tr2qs_ctx("OK","options");
+	TQString m = __tr2qs_ctx("Invalid NickServ Rule","options");
+	TQString o = __tr2qs_ctx("OK","options");
 	
 	if(s.isEmpty())
 	{
-		QMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't be empty!","options"),o);
+		TQMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't be empty!","options"),o);
 		return false;
 	}
 	
-	if(s.find(QChar(' ')) != -1)
+	if(s.tqfind(TQChar(' ')) != -1)
 	{
-		QMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't contain spaces!","options"),o);
+		TQMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't contain spaces!","options"),o);
 		return false;
 	}
 	
@@ -180,7 +180,7 @@ bool KviNickServRuleEditor::validate()
 	
 	if(s.isEmpty())
 	{
-		QMessageBox::warning(this,m,__tr2qs_ctx("The NickServ mask can't be empty!<br>You must put at least * there.","options"),o);
+		TQMessageBox::warning(this,m,__tr2qs_ctx("The NickServ tqmask can't be empty!<br>You must put at least * there.","options"),o);
 		return false;
 	}
 
@@ -188,7 +188,7 @@ bool KviNickServRuleEditor::validate()
 	
 	if(s.isEmpty())
 	{
-		QMessageBox::warning(this,m,__tr2qs_ctx("The Message Regexp can't be empty!<br>You must put at least * there.","options"),o);
+		TQMessageBox::warning(this,m,__tr2qs_ctx("The Message Regexp can't be empty!<br>You must put at least * there.","options"),o);
 		return false;
 	}
 
@@ -196,7 +196,7 @@ bool KviNickServRuleEditor::validate()
 	
 	if(s.isEmpty())
 	{
-		QMessageBox::warning(this,m,__tr2qs_ctx("The Identify Command can't be empty!","options"),o);
+		TQMessageBox::warning(this,m,__tr2qs_ctx("The Identify Command can't be empty!","options"),o);
 		return false;
 	}
 	
@@ -212,14 +212,14 @@ void KviNickServRuleEditor::okPressed()
 
 bool KviNickServRuleEditor::editRule(KviNickServRule * r)
 {
-	m_pRegisteredNickEdit->setText(r->registeredNick().isEmpty() ? QString("MyNick") : r->registeredNick());
-	m_pNickServMaskEdit->setText(r->nickServMask().isEmpty() ? QString("NickServ!*@*") : r->nickServMask());
-	m_pMessageRegexpEdit->setText(r->messageRegexp().isEmpty() ? QString("*IDENTIFY*") : r->messageRegexp());
-	m_pIdentifyCommandEdit->setText(r->identifyCommand().isEmpty() ? QString("msg -q NickServ IDENTIFY <password>") : r->identifyCommand());
+	m_pRegisteredNickEdit->setText(r->registeredNick().isEmpty() ? TQString("MyNick") : r->registeredNick());
+	m_pNickServMaskEdit->setText(r->nickServMask().isEmpty() ? TQString("NickServ!*@*") : r->nickServMask());
+	m_pMessageRegexpEdit->setText(r->messageRegexp().isEmpty() ? TQString("*IDENTIFY*") : r->messageRegexp());
+	m_pIdentifyCommandEdit->setText(r->identifyCommand().isEmpty() ? TQString("msg -q NickServ IDENTIFY <password>") : r->identifyCommand());
 	if(m_pServerMaskEdit)
-		m_pServerMaskEdit->setText(r->serverMask().isEmpty() ? QString("irc.yourserver.org") : r->serverMask());
+		m_pServerMaskEdit->setText(r->serverMask().isEmpty() ? TQString("irc.yourserver.org") : r->serverMask());
 	m_pRegisteredNickEdit->selectAll();
-	if(exec() != QDialog::Accepted)return false;
+	if(exec() != TQDialog::Accepted)return false;
 	r->setRegisteredNick(m_pRegisteredNickEdit->text());
 	r->setNickServMask(m_pNickServMaskEdit->text());
 	r->setMessageRegexp(m_pMessageRegexpEdit->text());
@@ -231,12 +231,12 @@ bool KviNickServRuleEditor::editRule(KviNickServRule * r)
 
 
 
-KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"nickserv_options_widget")
+KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"nickserv_options_widget")
 {
 	createLayout(3,3);
 	
-	QGridLayout * gl = layout();
+	TQGridLayout * gl = tqlayout();
 
 	KviNickServRuleSet * rs = g_pNickServRuleSet;
 	bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false;
@@ -253,11 +253,11 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 	m_pNickServListView->setSelectionMode(KviTalListView::Single);
 	m_pNickServListView->setAllColumnsShowFocus(true);
 	m_pNickServListView->addColumn(__tr2qs_ctx("Nickname","options"));
-	m_pNickServListView->addColumn(__tr2qs_ctx("Server mask","options"));
+	m_pNickServListView->addColumn(__tr2qs_ctx("Server tqmask","options"));
 	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
@@ -273,19 +273,19 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 			"</center>","options"));
 #endif
 
-	m_pAddRuleButton = new QPushButton(__tr2qs_ctx("Add Rule","options"),this);
-	connect(m_pAddRuleButton,SIGNAL(clicked()),this,SLOT(addNickServRule()));
+	m_pAddRuleButton = new TQPushButton(__tr2qs_ctx("Add Rule","options"),this);
+	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"),this);
-	connect(m_pEditRuleButton,SIGNAL(clicked()),this,SLOT(editNickServRule()));
+	m_pEditRuleButton = new TQPushButton(__tr2qs_ctx("Edit Rule","options"),this);
+	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"),this);
-	connect(m_pDelRuleButton,SIGNAL(clicked()),this,SLOT(delNickServRule()));
+	m_pDelRuleButton = new TQPushButton(__tr2qs_ctx("Delete Rule","options"),this);
+	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())
 	{
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h
index b9e41e90..9fb6bfc0 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/optw_nickserv.h
@@ -29,7 +29,7 @@
 #include "kvi_settings.h"
 #include "kvi_optionswidget.h"
 
-#include <qdialog.h>
+#include <tqdialog.h>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviNickServOptionsWidget KVI_SMALLICON_NICKSERV
 #define KVI_OPTIONS_WIDGET_NAME_KviNickServOptionsWidget __tr2qs_no_lookup("NickServ")
@@ -38,25 +38,26 @@
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviNickServOptionsWidget 10000
 //#define KVI_OPTIONS_WIDGET_HIDDEN_KviNickServOptionsWidget true
 
-class QLineEdit;
-class QPushButton;
+class TQLineEdit;
+class TQPushButton;
 class KviNickServRule;
 class KviTalListView;
-class QCheckBox;
+class TQCheckBox;
 
-class KviNickServRuleEditor : public QDialog
+class KviNickServRuleEditor : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviNickServRuleEditor(QWidget * par,bool bUseServerMaskField = false);
+	KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskField = false);
 	~KviNickServRuleEditor();
 protected:
-	QLineEdit * m_pRegisteredNickEdit;
-	QLineEdit * m_pNickServMaskEdit;
-	QLineEdit * m_pMessageRegexpEdit;
-	QLineEdit * m_pIdentifyCommandEdit;
-	QLineEdit * m_pServerMaskEdit;
-	QPushButton * m_pOkButton;
+	TQLineEdit * m_pRegisteredNickEdit;
+	TQLineEdit * m_pNickServMaskEdit;
+	TQLineEdit * m_pMessageRegexpEdit;
+	TQLineEdit * m_pIdentifyCommandEdit;
+	TQLineEdit * m_pServerMaskEdit;
+	TQPushButton * m_pOkButton;
 public:
 	bool editRule(KviNickServRule * r);
 protected:
@@ -68,15 +69,16 @@ protected slots:
 class KviNickServOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviNickServOptionsWidget(QWidget * parent);
+	KviNickServOptionsWidget(TQWidget * tqparent);
 	~KviNickServOptionsWidget();
 protected:
 	KviTalListView             * m_pNickServListView;
-	QCheckBox             * m_pNickServCheck;
-	QPushButton           * m_pAddRuleButton;
-	QPushButton           * m_pDelRuleButton;
-	QPushButton           * m_pEditRuleButton;
+	TQCheckBox             * m_pNickServCheck;
+	TQPushButton           * m_pAddRuleButton;
+	TQPushButton           * m_pDelRuleButton;
+	TQPushButton           * m_pEditRuleButton;
 protected slots:
 	void enableDisableNickServControls();
 	void addNickServRule();
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index 6ee5dc05..c8d3f9b0 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -22,7 +22,7 @@
 
 #include "optw_notify.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 #include "kvi_settings.h"
 #include "kvi_options.h"
 #include "kvi_locale.h"
@@ -31,67 +31,67 @@
 //#warning "Info tips"
 
 
-KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"notify_options_widget")
+KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"notify_options_widget")
 {
 	createLayout(5,1);
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList);
 	KviTalGroupBox *g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options"));
-	connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool)));
 
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Show notifications in active window","options"),
 				KviOption_boolNotifyListChangesToActiveWindow,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Flash window when users are going online","options"),
 				KviOption_boolFlashWindowOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Popup notifier when users are going online","options"),
 				KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 
 	g = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("Advanced configuration","options"));
-	connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool)));
 
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Check USERHOST for online users","options"),
 				KviOption_boolNotifyListSendUserhostForOnlineUsers,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Use \"smart\" notify list manager","options"),
 				KviOption_boolUseIntelligentNotifyListManager,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addBoolSelector(g,__tr2qs_ctx("Use the WATCH method if available","options"),
 				KviOption_boolUseWatchListIfAvailable,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addUIntSelector(g,__tr2qs_ctx("Check interval (in seconds)","options"),
 				KviOption_uintNotifyListCheckTimeInSecs,
 				5,3600,180,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addUIntSelector(g,__tr2qs_ctx("ISON delay (in seconds)","options"),
 				KviOption_uintNotifyListIsOnDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		SLOT(setEnabled(bool)));
+		TQT_SLOT(setEnabled(bool)));
 	connect(b,
-		SIGNAL(toggled(bool)),
+		TQT_SIGNAL(toggled(bool)),
 		addUIntSelector(g,__tr2qs_ctx("USERHOST delay (in seconds)","options"),
 				KviOption_uintNotifyListUserhostDelayTimeInSecs,
 				5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
-		SLOT(setEnabled(bool)));
+		TQT_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);
@@ -104,14 +104,14 @@ KviNotifyOptionsWidget::~KviNotifyOptionsWidget()
 
 
 
-KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"notifier_options_widget")
+KviNotifierOptionsWidget::KviNotifierOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"notifier_options_widget")
 {
 	createLayout(3,1);
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Forcibly and completely disable the notifier","options"),KviOption_boolForciblyDisableNotifier);
 #ifdef COMPILE_INFO_TIPS
-	QString tip = "<center>";
+	TQString tip = "<center>";
 	tip += __tr2qs_ctx("This is an option for the impatient: it allows to forcibly and permanently disable " \
 					"the notifier window. Please note that if this option is activated then " \
 					"the notifier will NOT popup even if all the other options around specify " \
diff --git a/src/modules/options/optw_notify.h b/src/modules/options/optw_notify.h
index 374ddc21..be771b84 100644
--- a/src/modules/options/optw_notify.h
+++ b/src/modules/options/optw_notify.h
@@ -33,8 +33,9 @@
 class KviNotifyOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviNotifyOptionsWidget(QWidget * parent);
+	KviNotifyOptionsWidget(TQWidget * tqparent);
 	~KviNotifyOptionsWidget();
 };
 
@@ -46,8 +47,9 @@ public:
 class KviNotifierOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviNotifierOptionsWidget(QWidget * parent);
+	KviNotifierOptionsWidget(TQWidget * tqparent);
 	~KviNotifierOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp
index 27a0f4b1..dc8fa0ee 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/optw_protection.cpp
@@ -24,19 +24,19 @@
 
 #include "optw_protection.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_settings.h"
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-KviProtectionOptionsWidget::KviProtectionOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"protection_options_widget")
+KviProtectionOptionsWidget::KviProtectionOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"protection_options_widget")
 {
 	
 	createLayout(1,1);
 
-	QLabel * l;
+	TQLabel * l;
 	l = addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc protection tools<br>"\
 		"<p>like<b> flood, ignore, antispam. </b> " \
 		"</p>","options"));
diff --git a/src/modules/options/optw_protection.h b/src/modules/options/optw_protection.h
index 5ac37e43..1837f591 100644
--- a/src/modules/options/optw_protection.h
+++ b/src/modules/options/optw_protection.h
@@ -40,8 +40,9 @@
 class KviProtectionOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviProtectionOptionsWidget(QWidget * parent);
+	KviProtectionOptionsWidget(TQWidget * tqparent);
 	~KviProtectionOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 523d3c79..98acb0a5 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -30,19 +30,19 @@
 #include "kvi_options.h"
 #include "kvi_styled_controls.h"
 
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqcheckbox.h>
 #include <kvi_tal_groupbox.h>
 #include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
+#include <tqcursor.h>
 #include "kvi_tal_tooltip.h"
-#include <qtoolbutton.h>
+#include <tqtoolbutton.h>
 
 
-KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,KviProxy * prx)
-: KviTalListViewItem(parent,prx->m_szHostname.ptr())
+KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,KviProxy * prx)
+: KviTalListViewItem(tqparent,prx->m_szHostname.ptr())
 {
 	setPixmap(0,pm);
 	m_pProxyData = new KviProxy(*prx);
@@ -53,8 +53,8 @@ KviProxyOptionsListViewItem::~KviProxyOptionsListViewItem()
 	delete m_pProxyData;
 }
 
-KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"proxy_options_widget")
+KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"proxy_options_widget")
 {
 	createLayout(3,2);
 
@@ -67,13 +67,13 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	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,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)));
 
 #ifdef COMPILE_INFO_TIPS
-  QString tiptxt = __tr2qs_ctx("<center>This is the list of available proxy servers.<br>" \
+  TQString tiptxt = __tr2qs_ctx("<center>This is the list of available proxy servers.<br>" \
                            "Right-click on the list to add or remove proxies.</center>","options");
   mergeTip(m_pListView,tiptxt);
   mergeTip(m_pListView->viewport(),tiptxt);
@@ -82,10 +82,10 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
   KviTalVBox * vbox = new KviTalVBox(this);
   addWidgetToLayout(vbox,1,1,1,1);
 
-  QToolButton * tb = new KviStyledToolButton(vbox);
+  TQToolButton * tb = new KviStyledToolButton(vbox);
   tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)));
   tb->setAutoRaise(true);
-  connect(tb,SIGNAL(clicked()),this,SLOT(newProxy()));
+  connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(newProxy()));
 #ifdef COMPILE_INFO_TIPS
   mergeTip(tb,__tr2qs_ctx("New Proxy","options"));
 #endif
@@ -94,51 +94,51 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
   tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)));
   //tb->setEnabled(false);
   tb->setAutoRaise(true);
-  connect(tb,SIGNAL(clicked()),this,SLOT(removeCurrent()));
+  connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeCurrent()));
 #ifdef COMPILE_INFO_TIPS
   mergeTip(tb,__tr2qs_ctx("Remove Proxy","options"));
 #endif
 
-  QFrame * lll = new QFrame(vbox);
+  TQFrame * lll = new TQFrame(vbox);
   vbox->setStretchFactor(lll,100);
 
 
 	KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),this);
-	//QGridLayout * gl = new QGridLayout(gbox->layout());
+	//TQGridLayout * gl = new TQGridLayout(gbox->tqlayout());
 	//gl->setMargin(2);
 	//gl->setSpacing(4);
 
-	m_pProxyLabel = new QLabel(__tr2qs_ctx("Proxy:","options"),gbox);
+	m_pProxyLabel = new TQLabel(__tr2qs_ctx("Proxy:","options"),gbox);
 
-	m_pProxyEdit = new QLineEdit(gbox);
+	m_pProxyEdit = new TQLineEdit(gbox);
 
-	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);
 
-	m_pIpLabel = new QLabel(__tr2qs_ctx("IP address:","options"),gbox);
+	m_pIpLabel = new TQLabel(__tr2qs_ctx("IP address:","options"),gbox);
 
 	m_pIpEditor = new KviIpEditor(gbox,KviIpEditor::IpV4);
 
-	m_pUserLabel = new QLabel(__tr2qs_ctx("Username:","options"),gbox);
+	m_pUserLabel = new TQLabel(__tr2qs_ctx("Username:","options"),gbox);
 
-	m_pUserEdit = new QLineEdit(gbox);
+	m_pUserEdit = new TQLineEdit(gbox);
 
-	m_pPassLabel = new QLabel(__tr2qs_ctx("Password:","options"),gbox);
+	m_pPassLabel = new TQLabel(__tr2qs_ctx("Password:","options"),gbox);
 
-	m_pPassEdit = new QLineEdit(gbox);
+	m_pPassEdit = new TQLineEdit(gbox);
 
-	m_pProtocolLabel = new QLabel(__tr2qs_ctx("Protocol:","options"),gbox);
+	m_pProtocolLabel = new TQLabel(__tr2qs_ctx("Protocol:","options"),gbox);
 
-	m_pProtocolBox = new QComboBox(false,gbox);
+	m_pProtocolBox = new TQComboBox(false,gbox);
 
-	QStringList l;
+	TQStringList l;
 	KviProxy::getSupportedProtocolNames(l);
 
 	m_pProtocolBox->insertStringList(l);
 
 	m_pIpV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
-	connect(m_pIpV6Check,SIGNAL(toggled(bool)),this,SLOT(ipV6CheckToggled(bool)));
+	connect(m_pIpV6Check,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(ipV6CheckToggled(bool)));
 #ifndef COMPILE_IPV6_SUPPORT
 	m_pIpV6Check->setEnabled(false);
 #endif
@@ -147,8 +147,8 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 
 	fillProxyList();
 
-	layout()->setRowStretch(0,1);
-	layout()->setColStretch(0,1);
+	tqlayout()->setRowStretch(0,1);
+	tqlayout()->setColStretch(0,1);
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 
@@ -330,12 +330,12 @@ void KviProxyOptionsWidget::commit()
 	KviOptionsWidget::commit();
 }
 
-void KviProxyOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col)
+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,SLOT(newProxy()));
-	m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent())),it);
-	m_pContextPopup->popup(QCursor::pos());
+	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->popup(TQCursor::pos());
 }
 
 void KviProxyOptionsWidget::newProxy()
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index a6f18ada..73b4f78a 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -35,18 +35,18 @@ extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 class KviProxyOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviProxyOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,KviProxy * prx);
+	KviProxyOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,KviProxy * prx);
 	~KviProxyOptionsListViewItem();
 public:
 	KviProxy * m_pProxyData;
 };
 
-class QLabel;
-class QLineEdit;
+class TQLabel;
+class TQLineEdit;
 class KviIpEditor;
-class QCheckBox;
+class TQCheckBox;
 class KviTalPopupMenu;
-class QComboBox;
+class TQComboBox;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviProxyOptionsWidget KVI_SMALLICON_PROXY
 #define KVI_OPTIONS_WIDGET_NAME_KviProxyOptionsWidget __tr2qs_no_lookup("Proxy Hosts")
@@ -57,25 +57,26 @@ class QComboBox;
 class KviProxyOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviProxyOptionsWidget(QWidget * parent);
+	KviProxyOptionsWidget(TQWidget * tqparent);
 	~KviProxyOptionsWidget();
 protected:
 	KviTalListView    * m_pListView;
-	QLabel       * m_pProxyLabel;
-	QLineEdit    * m_pProxyEdit;
-	QLabel       * m_pIpLabel;
+	TQLabel       * m_pProxyLabel;
+	TQLineEdit    * m_pProxyEdit;
+	TQLabel       * m_pIpLabel;
 	KviIpEditor  * m_pIpEditor;
-	QLabel       * m_pUserLabel;
-	QLineEdit    * m_pUserEdit;
-	QLabel       * m_pPassLabel;
-	QLineEdit    * m_pPassEdit;
-	QLabel       * m_pPortLabel;
-	QLineEdit    * m_pPortEdit;
-	QLabel       * m_pProtocolLabel;
-	QComboBox    * m_pProtocolBox;
+	TQLabel       * m_pUserLabel;
+	TQLineEdit    * m_pUserEdit;
+	TQLabel       * m_pPassLabel;
+	TQLineEdit    * m_pPassEdit;
+	TQLabel       * m_pPortLabel;
+	TQLineEdit    * m_pPortEdit;
+	TQLabel       * m_pProtocolLabel;
+	TQComboBox    * m_pProtocolBox;
 	KviTalPopupMenu   * m_pContextPopup;
-	QCheckBox    * m_pIpV6Check;
+	TQCheckBox    * m_pIpV6Check;
 	KviProxyOptionsListViewItem * m_pLastEditedItem;
 private:
 
@@ -83,7 +84,7 @@ private:
 	void saveLastItem();
 protected slots:
 	void listViewItemSelectionChanged(KviTalListViewItem *it);
-	void listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col);
+	void listViewRightButtonPressed(KviTalListViewItem *it,const TQPoint &pnt,int col);
 	void newProxy();
 	void removeCurrent();
 	void ipV6CheckToggled(bool bEnabled);
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index d0026c6e..a97ce83f 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -23,7 +23,7 @@
 
 #include "optw_query.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
@@ -34,8 +34,8 @@
 	#include <kdeversion.h>
 #endif
 
-KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"query_options_widget")
+KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"query_options_widget")
 {
 	createLayout(8,1);
 
diff --git a/src/modules/options/optw_query.h b/src/modules/options/optw_query.h
index bae1c7bc..6e6b96ff 100644
--- a/src/modules/options/optw_query.h
+++ b/src/modules/options/optw_query.h
@@ -1,5 +1,5 @@
-#ifndef _OPTW_QUERY_H_
-#define _OPTW_QUERY_H_
+#ifndef _OPTW_TQUERY_H_
+#define _OPTW_TQUERY_H_
 //
 //   File : optw_query.h
 //   Creation date : Tue Mar 05 22:31:18 2002 GMT by Szymon Stefanek
@@ -24,7 +24,7 @@
 
 #include "kvi_optionswidget.h"
 
-#define KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget KVI_SMALLICON_QUERY
+#define KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget KVI_SMALLICON_TQUERY
 #define KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget __tr2qs_no_lookup("Query")
 #define KVI_OPTIONS_WIDGET_PARENT_KviQueryOptionsWidget KviIrcOptionsWidget
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviQueryOptionsWidget __tr2qs_no_lookup("chat")
@@ -34,8 +34,9 @@
 class KviQueryOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviQueryOptionsWidget(QWidget * parent);
+	KviQueryOptionsWidget(TQWidget * tqparent);
 	~KviQueryOptionsWidget();
 protected: 
 };
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)
 			{
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index ea71c6d3..d03f8246 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -27,9 +27,9 @@
 
 #include "kvi_optionswidget.h"
 #include "kvi_tal_listview.h"
-#include <qdialog.h>
-#include <qbuttongroup.h>
-#include <qtabwidget.h>
+#include <tqdialog.h>
+#include <tqbuttongroup.h>
+#include <tqtabwidget.h>
 
 class KviIrcServer;
 class KviIrcNetwork;
@@ -41,8 +41,8 @@ class KviMexServerImport;
 class KviServerOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviServerOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,const KviIrcNetwork *n);
-	KviServerOptionsListViewItem(KviTalListViewItem *parent,const QPixmap &pm,const KviIrcServer *s);
+	KviServerOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,const KviIrcNetwork *n);
+	KviServerOptionsListViewItem(KviTalListViewItem *tqparent,const TQPixmap &pm,const KviIrcServer *s);
 	~KviServerOptionsListViewItem();
 public:
 	KviIrcServer * m_pServerData;
@@ -51,47 +51,48 @@ public:
 	void updateVisibleStrings();
 };
 
-class QLabel;
-class QLineEdit;
+class TQLabel;
+class TQLineEdit;
 class KviIpEditor;
 class KviIrcServer;
-class QCheckBox;
+class TQCheckBox;
 class KviTalPopupMenu;
 class KviScriptEditor;
-class QComboBox;
-class QPushButton;
-class QToolButton;
+class TQComboBox;
+class TQPushButton;
+class TQToolButton;
 class KviNickServRule;
 class KviNickServRuleEditor;
 
 
-class KviNetworkDetailsWidget : public QDialog
+class KviNetworkDetailsWidget : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d);
+	KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * d);
 	~KviNetworkDetailsWidget();
 protected:
 	KviScriptEditor       * m_pOnConnectEditor;
 	KviScriptEditor       * m_pOnLoginEditor;
 
-	QLineEdit             * m_pUserEditor;
-	QLineEdit             * m_pPassEditor;
-	QLineEdit             * m_pNickEditor;
-	QLineEdit             * m_pRealEditor;
-	QLineEdit             * m_pDescEditor;
+	TQLineEdit             * m_pUserEditor;
+	TQLineEdit             * m_pPassEditor;
+	TQLineEdit             * m_pNickEditor;
+	TQLineEdit             * m_pRealEditor;
+	TQLineEdit             * m_pDescEditor;
 
-	QComboBox             * m_pEncodingEditor;
+	TQComboBox             * m_pEncodingEditor;
 	
-	QCheckBox             * m_pAutoConnectCheck;
+	TQCheckBox             * m_pAutoConnectCheck;
 	
 	KviTalListView             * m_pNickServListView;
-	QCheckBox             * m_pNickServCheck;
-	QPushButton           * m_pAddRuleButton;
-	QPushButton           * m_pDelRuleButton;
-	QPushButton           * m_pEditRuleButton;
+	TQCheckBox             * m_pNickServCheck;
+	TQPushButton           * m_pAddRuleButton;
+	TQPushButton           * m_pDelRuleButton;
+	TQPushButton           * m_pEditRuleButton;
 
-	QStringList             m_lstChannels;
+	TQStringList             m_lstChannels;
 	KviCahnnelListSelector * m_pChannelListSelector;
 public:
 	void fillData(KviIrcNetwork * d);
@@ -102,42 +103,43 @@ protected slots:
 	void editNickServRule();
 };
 
-class KviServerDetailsWidget : public QDialog
+class KviServerDetailsWidget : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviServerDetailsWidget(QWidget * par,KviIrcServer * s);
+	KviServerDetailsWidget(TQWidget * par,KviIrcServer * s);
 	~KviServerDetailsWidget();
 protected:
-	QString                 m_szHostname;
-	QLabel                * m_pHeaderLabel;
+	TQString                 m_szHostname;
+	TQLabel                * m_pHeaderLabel;
 	KviScriptEditor       * m_pOnConnectEditor;
 	KviScriptEditor       * m_pOnLoginEditor;
-	QLineEdit             * m_pUserEditor;
-	QLineEdit             * m_pPassEditor;
-	QLineEdit             * m_pNickEditor;
-	QLineEdit             * m_pRealEditor;
-	QLineEdit             * m_pDescEditor;
-	QLineEdit             * m_pIdEditor;
-	QComboBox             * m_pLinkFilterEditor;
-	QComboBox             * m_pEncodingEditor;
+	TQLineEdit             * m_pUserEditor;
+	TQLineEdit             * m_pPassEditor;
+	TQLineEdit             * m_pNickEditor;
+	TQLineEdit             * m_pRealEditor;
+	TQLineEdit             * m_pDescEditor;
+	TQLineEdit             * m_pIdEditor;
+	TQComboBox             * m_pLinkFilterEditor;
+	TQComboBox             * m_pEncodingEditor;
 	KviIpEditor           * m_pIpEditor;
-	QCheckBox             * m_pCacheIpCheck;
-	QCheckBox             * m_pUseSSLCheck;
-	QCheckBox             * m_pUseDefaultInitUMode;
-	QCheckBox             * m_pIMode;
-	QCheckBox             * m_pWMode;
-	QCheckBox             * m_pSMode;
-	QCheckBox             * m_pUseAutoConnect;
-	QCheckBox             * m_pUseIPV6Check;
-	QLineEdit             * m_pPortEditor;
-	QStringList             m_lstChannels;
+	TQCheckBox             * m_pCacheIpCheck;
+	TQCheckBox             * m_pUseSSLCheck;
+	TQCheckBox             * m_pUseDefaultInitUMode;
+	TQCheckBox             * m_pIMode;
+	TQCheckBox             * m_pWMode;
+	TQCheckBox             * m_pSMode;
+	TQCheckBox             * m_pUseAutoConnect;
+	TQCheckBox             * m_pUseIPV6Check;
+	TQLineEdit             * m_pPortEditor;
+	TQStringList             m_lstChannels;
 	KviCahnnelListSelector * m_pChannelListSelector;
 	
-	QComboBox             * m_pProxyEditor;
+	TQComboBox             * m_pProxyEditor;
 protected slots:
 	void useDefaultInitUModeToggled(bool);
-	void portEditorTextChanged(const QString &);
+	void portEditorTextChanged(const TQString &);
 	void useIPV6CheckToggled(bool);
 public:
 	void setHeaderLabelText();
@@ -154,34 +156,35 @@ public:
 class KviServerOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviServerOptionsWidget(QWidget * parent);
+	KviServerOptionsWidget(TQWidget * tqparent);
 	~KviServerOptionsWidget();
 protected:
 	KviTalListView                    * m_pListView;
-	QLabel                       * m_pSrvNetLabel;
-	QLineEdit                    * m_pSrvNetEdit;
-	//QLabel                       * m_pPortLabel;
-	//QLineEdit                    * m_pPortEdit;
-	QPushButton                  * m_pDetailsButton;
+	TQLabel                       * m_pSrvNetLabel;
+	TQLineEdit                    * m_pSrvNetEdit;
+	//TQLabel                       * m_pPortLabel;
+	//TQLineEdit                    * m_pPortEdit;
+	TQPushButton                  * m_pDetailsButton;
 	KviTalPopupMenu                   * m_pRecentPopup;
 	KviTalPopupMenu                   * m_pContextPopup;
 	KviTalPopupMenu                   * m_pImportPopup;
 	KviIrcServer                 * m_pClipboard;
-	//QCheckBox                    * m_pIpV6Check;
-	QPushButton                  * m_pConnectCurrent;
-	QPushButton                  * m_pConnectNew;
+	//TQCheckBox                    * m_pIpV6Check;
+	TQPushButton                  * m_pConnectCurrent;
+	TQPushButton                  * m_pConnectNew;
 	KviServerOptionsListViewItem * m_pLastEditedItem;
 	KviServerDetailsWidget       * m_pServerDetailsDialog;
 	KviNetworkDetailsWidget      * m_pNetworkDetailsDialog;
 	KviMexServerImport           * m_pImportFilter;
 
-	QToolButton                  * m_pNewServerButton;
-	QToolButton                  * m_pNewNetworkButton;
-	QToolButton                  * m_pRemoveButton;
-	QToolButton                  * m_pCopyServerButton;
-	QToolButton                  * m_pPasteServerButton;
-	QToolButton                  * m_pImportButton;
+	TQToolButton                  * m_pNewServerButton;
+	TQToolButton                  * m_pNewNetworkButton;
+	TQToolButton                  * m_pRemoveButton;
+	TQToolButton                  * m_pCopyServerButton;
+	TQToolButton                  * m_pPasteServerButton;
+	TQToolButton                  * m_pImportButton;
 private:
 	void fillServerList();
 	void saveLastItem();
@@ -191,7 +194,7 @@ protected slots:
 	void importServer(const KviIrcServer & s,const char * network);
 	void importPopupAboutToShow();
 	void listViewItemSelectionChanged(KviTalListViewItem *it);
-	void listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col);
+	void listViewRightButtonPressed(KviTalListViewItem *it,const TQPoint &pnt,int col);
 	void newNetwork();
 	void removeCurrent();
 	void newServer();
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 9fec0a0c..569d4aee 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -31,8 +31,8 @@
 #include "kvi_pointerlist.h"
 #include "kvi_string.h"
 
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
 #include "kvi_tal_hbox.h"
 
 #ifdef COMPILE_INFO_TIPS
@@ -43,7 +43,7 @@
 
 
 
-KviSoundOptionsWidget::KviSoundOptionsWidget(QWidget * pParent)
+KviSoundOptionsWidget::KviSoundOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
@@ -53,8 +53,8 @@ KviSoundOptionsWidget::~KviSoundOptionsWidget()
 }
 
 
-KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"sound_system_options_widget")
+KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"sound_system_options_widget")
 {
 #ifdef COMPILE_ON_WINDOWS
 	createLayout(4,1);
@@ -67,13 +67,13 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	KviTalHBox * h = new KviTalHBox(g);
 
-	m_pSoundSystemBox = new QComboBox(false,h);
+	m_pSoundSystemBox = new TQComboBox(false,h);
 
-	m_pSoundAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect","options"),h);
-	connect(m_pSoundAutoDetectButton,SIGNAL(clicked()),this,SLOT(soundAutoDetect()));
+	m_pSoundAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h);
+	connect(m_pSoundAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundAutoDetect()));
 
-	m_pSoundTestButton = new QPushButton(__tr2qs_ctx("Test","options"),h);
-	connect(m_pSoundTestButton,SIGNAL(clicked()),this,SLOT(soundTest()));
+	m_pSoundTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h);
+	connect(m_pSoundTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundTest()));
 
 
 	g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Media Player","options"),true);
@@ -83,13 +83,13 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	h = new KviTalHBox(g);
 
-	m_pMediaPlayerBox = new QComboBox(false,h);
+	m_pMediaPlayerBox = new TQComboBox(false,h);
 
-	m_pMediaAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect","options"),h);
-	connect(m_pMediaAutoDetectButton,SIGNAL(clicked()),this,SLOT(mediaAutoDetect()));
+	m_pMediaAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h);
+	connect(m_pMediaAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaAutoDetect()));
 
-	m_pMediaTestButton = new QPushButton(__tr2qs_ctx("Test","options"),h);
-	connect(m_pMediaTestButton,SIGNAL(clicked()),this,SLOT(mediaTest()));
+	m_pMediaTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h);
+	connect(m_pMediaTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaTest()));
 
 	addRowSpacer(0,2,0,2);
 
@@ -105,7 +105,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	h = new KviTalHBox(g);
 
-	m_pTagsEncodingCombo = new QComboBox(false,h);
+	m_pTagsEncodingCombo = new TQComboBox(false,h);
 	m_pTagsEncodingCombo->insertItem(__tr2qs_ctx("Use Language Encoding","options"));
 
 	int i = 0;
@@ -114,7 +114,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i);
 	while(d->szName)
 	{
-		if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding)))iMatch = i + 1;
+		if(KviTQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding)))iMatch = i + 1;
 		m_pTagsEncodingCombo->insertItem(d->szName);
 		i++;
 		d = KviLocale::encodingDescription(i);
@@ -128,7 +128,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	h = new KviTalHBox(g);
 
-	m_pWinampEncodingCombo = new QComboBox(false,h);
+	m_pWinampEncodingCombo = new TQComboBox(false,h);
 	
 	m_pWinampEncodingCombo->insertItem(__tr2qs_ctx("Use Language Encoding","options"));
 	i = 0;
@@ -137,7 +137,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	d = KviLocale::encodingDescription(i);
 	while(d->szName)
 	{
-		if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringWinampTextEncoding)))iMatch = i + 1;
+		if(KviTQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringWinampTextEncoding)))iMatch = i + 1;
 		m_pWinampEncodingCombo->insertItem(d->szName);
 		i++;
 		d = KviLocale::encodingDescription(i);
@@ -180,8 +180,8 @@ void KviSoundGeneralOptionsWidget::mediaAutoDetect()
 void KviSoundGeneralOptionsWidget::soundFillBox()
 {
 
-	QStringList l;
-	QStringList::Iterator it;
+	TQStringList l;
+	TQStringList::Iterator it;
 	int cnt;
 	int i;
 	KviModule * m = g_pModuleManager->getModule("snd");
@@ -203,8 +203,8 @@ void KviSoundGeneralOptionsWidget::soundFillBox()
 
 	for(i=0;i<cnt;i++)
 	{
-		QString t = m_pSoundSystemBox->text(i);
-		if(KviQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringSoundSystem)))
+		TQString t = m_pSoundSystemBox->text(i);
+		if(KviTQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringSoundSystem)))
 		{
 			m_pSoundSystemBox->setCurrentItem(i);
 			break;
@@ -221,8 +221,8 @@ disable:
 
 void KviSoundGeneralOptionsWidget::mediaFillBox()
 {
-	QStringList l;
-	QStringList::Iterator it;
+	TQStringList l;
+	TQStringList::Iterator it;
 	int cnt;
 	int i;
 	KviModule * m = g_pModuleManager->getModule("mediaplayer");
@@ -238,8 +238,8 @@ void KviSoundGeneralOptionsWidget::mediaFillBox()
 
 	for(i=0;i<cnt;i++)
 	{
-		QString t = m_pMediaPlayerBox->text(i);
-		if(KviQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer)))
+		TQString t = m_pMediaPlayerBox->text(i);
+		if(KviTQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer)))
 		{
 			m_pMediaPlayerBox->setCurrentItem(i);
 			break;
@@ -283,8 +283,8 @@ void KviSoundGeneralOptionsWidget::commit()
 #endif
 }
 
-KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"sound_options_widget")
+KviSoundsOptionsWidget::KviSoundsOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"sound_options_widget")
 {
 	createLayout(5,2);
 	addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options"));
diff --git a/src/modules/options/optw_sound.h b/src/modules/options/optw_sound.h
index 37b3c0ed..3c2128f3 100644
--- a/src/modules/options/optw_sound.h
+++ b/src/modules/options/optw_sound.h
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_optionswidget.h"
-#include <qcombobox.h>
-#include <qpushbutton.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSoundOptionsWidget KVI_SMALLICON_SOUND
 #define KVI_OPTIONS_WIDGET_NAME_KviSoundOptionsWidget __tr2qs_no_lookup("Sound")
@@ -37,8 +37,9 @@
 class KviSoundOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviSoundOptionsWidget(QWidget * parent);
+	KviSoundOptionsWidget(TQWidget * tqparent);
 	~KviSoundOptionsWidget();
 };
 
@@ -51,21 +52,22 @@ public:
 class KviSoundGeneralOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviSoundGeneralOptionsWidget(QWidget * parent);
+	KviSoundGeneralOptionsWidget(TQWidget * tqparent);
 	~KviSoundGeneralOptionsWidget();
 protected:
-	QComboBox * m_pSoundSystemBox;
-	QPushButton * m_pSoundTestButton;
-	QPushButton * m_pSoundAutoDetectButton;
-	QComboBox * m_pMediaPlayerBox;
-	QPushButton * m_pMediaTestButton;
-	QPushButton * m_pMediaAutoDetectButton;
+	TQComboBox * m_pSoundSystemBox;
+	TQPushButton * m_pSoundTestButton;
+	TQPushButton * m_pSoundAutoDetectButton;
+	TQComboBox * m_pMediaPlayerBox;
+	TQPushButton * m_pMediaTestButton;
+	TQPushButton * m_pMediaAutoDetectButton;
 
 #ifdef COMPILE_ON_WINDOWS
-	QComboBox * m_pWinampEncodingCombo;
+	TQComboBox * m_pWinampEncodingCombo;
 #endif
-	QComboBox * m_pTagsEncodingCombo;
+	TQComboBox * m_pTagsEncodingCombo;
 protected:
 	void soundFillBox();
 	void mediaFillBox();
@@ -86,8 +88,9 @@ protected slots:
 class KviSoundsOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviSoundsOptionsWidget(QWidget * parent);
+	KviSoundsOptionsWidget(TQWidget * tqparent);
 	~KviSoundsOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp
index bf3ef46a..54135f69 100644
--- a/src/modules/options/optw_ssl.cpp
+++ b/src/modules/options/optw_ssl.cpp
@@ -22,7 +22,7 @@
 
 #include "optw_ssl.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 #include <kvi_tal_groupbox.h>
 
 #include "kvi_options.h"
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index 1b146d39..dae204e3 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -27,8 +27,8 @@
 #include "kvi_options.h"
 
 
-KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"taskbar_options_widget")
+KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"taskbar_options_widget")
 {
 
 	createLayout(7,1);
@@ -60,8 +60,8 @@ KviTaskBarOptionsWidget::~KviTaskBarOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"treetaskbar_options_widget")
+KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
 {
 }
 
@@ -72,8 +72,8 @@ KviTreeTaskBarOptionsWidget::~KviTreeTaskBarOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"treetaskbar_options_widget")
+KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
 {
 	createLayout(3,1);
 	
@@ -102,8 +102,8 @@ KviTreeTaskBarForegroundOptionsWidget::~KviTreeTaskBarForegroundOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"treetaskbar_options_widget")
+KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
 {
 	createLayout(4,2);
 	
@@ -114,11 +114,11 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWi
 	addPixmapSelector(0,1,1,1,__tr2qs_ctx("Background image:","options"),KviOption_pixmapTreeTaskBarBackground);
 
 	addLabel(0,2,0,2,__tr2qs_ctx("Horizontal align:","options"));
-	m_pHorizontalAlign=new QComboBox(this);
+	m_pHorizontalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pHorizontalAlign,1,2,1,2);
 	
 	addLabel(0,3,0,3,__tr2qs_ctx("Vertical align:","options"));
-	m_pVerticalAlign=new QComboBox(this);
+	m_pVerticalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,3,1,3);
 	
 	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Tile","options"));
@@ -131,37 +131,37 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWi
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Bottom","options"));
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Center","options"));
 	
-	switch( KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign) & Qt::AlignHorizontal_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign) & TQt::AlignHorizontal_Mask)
 	{
-		case Qt::AlignLeft:
+		case TQt::AlignLeft:
 			m_pHorizontalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignRight:
+		case TQt::AlignRight:
 			m_pHorizontalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignHCenter:
+		case TQt::AlignHCenter:
 			m_pHorizontalAlign->setCurrentItem(3);
 			break;
 		default:
 			m_pHorizontalAlign->setCurrentItem(0);
 	}
 	
-	switch( KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign) & Qt::AlignVertical_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign) & TQt::AlignVertical_Mask)
 	{
-		case Qt::AlignTop:
+		case TQt::AlignTop:
 			m_pVerticalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignBottom:
+		case TQt::AlignBottom:
 			m_pVerticalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignVCenter:
+		case TQt::AlignVCenter:
 			m_pVerticalAlign->setCurrentItem(3);
 			break;
 		default:
 			m_pVerticalAlign->setCurrentItem(0);
 	}
 
-	layout()->setRowStretch(1,1);
+	tqlayout()->setRowStretch(1,1);
 }
 
 
@@ -177,25 +177,25 @@ void KviTreeTaskBarBackgroundOptionsWidget::commit()
 	switch(m_pHorizontalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignLeft;
+			iFlags|=TQt::AlignLeft;
 			break;
 		case 2:
-			iFlags|=Qt::AlignRight;
+			iFlags|=TQt::AlignRight;
 			break;
 		case 3:
-			iFlags|=Qt::AlignHCenter;
+			iFlags|=TQt::AlignHCenter;
 			break;
 	}
 	switch(m_pVerticalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignTop;
+			iFlags|=TQt::AlignTop;
 			break;
 		case 2:
-			iFlags|=Qt::AlignBottom;
+			iFlags|=TQt::AlignBottom;
 			break;
 		case 3:
-			iFlags|=Qt::AlignVCenter;
+			iFlags|=TQt::AlignVCenter;
 			break;
 	}
 	
@@ -204,8 +204,8 @@ void KviTreeTaskBarBackgroundOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"treetaskbar_options_widget")
+KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
 {
 	createLayout(4,1);
 
@@ -225,8 +225,8 @@ KviTreeTaskBarFeaturesOptionsWidget::~KviTreeTaskBarFeaturesOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"classictaskbar_options_widget")
+KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"classictaskbar_options_widget")
 {
 	createLayout(8,1);
 	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar);
diff --git a/src/modules/options/optw_taskbar.h b/src/modules/options/optw_taskbar.h
index 66990c26..84a0633d 100644
--- a/src/modules/options/optw_taskbar.h
+++ b/src/modules/options/optw_taskbar.h
@@ -27,7 +27,7 @@
 
 
 #include "kvi_optionswidget.h"
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTaskBarOptionsWidget KVI_SMALLICON_CLASSICTASKBAR
 #define KVI_OPTIONS_WIDGET_NAME_KviTaskBarOptionsWidget __tr2qs_no_lookup("Taskbar")
@@ -38,8 +38,9 @@
 class KviTaskBarOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTaskBarOptionsWidget(QWidget * parent);
+	KviTaskBarOptionsWidget(TQWidget * tqparent);
 	~KviTaskBarOptionsWidget();
 };
 
@@ -53,8 +54,9 @@ public:
 class KviTreeTaskBarOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTreeTaskBarOptionsWidget(QWidget * pParent);
+	KviTreeTaskBarOptionsWidget(TQWidget * pParent);
 	~KviTreeTaskBarOptionsWidget();
 };
 
@@ -68,8 +70,9 @@ public:
 class KviTreeTaskBarForegroundOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTreeTaskBarForegroundOptionsWidget(QWidget * parent);
+	KviTreeTaskBarForegroundOptionsWidget(TQWidget * tqparent);
 	~KviTreeTaskBarForegroundOptionsWidget();
 };
 
@@ -83,11 +86,12 @@ public:
 class KviTreeTaskBarBackgroundOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 private:
-	QComboBox* m_pHorizontalAlign;
-	QComboBox* m_pVerticalAlign;
+	TQComboBox* m_pHorizontalAlign;
+	TQComboBox* m_pVerticalAlign;
 public:
-	KviTreeTaskBarBackgroundOptionsWidget(QWidget * parent);
+	KviTreeTaskBarBackgroundOptionsWidget(TQWidget * tqparent);
 	~KviTreeTaskBarBackgroundOptionsWidget();
 	
 	virtual void commit();
@@ -102,8 +106,9 @@ public:
 class KviTreeTaskBarFeaturesOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTreeTaskBarFeaturesOptionsWidget(QWidget * parent);
+	KviTreeTaskBarFeaturesOptionsWidget(TQWidget * tqparent);
 	~KviTreeTaskBarFeaturesOptionsWidget();
 };
 
@@ -117,8 +122,9 @@ public:
 class KviClassicTaskBarOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviClassicTaskBarOptionsWidget(QWidget * parent);
+	KviClassicTaskBarOptionsWidget(TQWidget * tqparent);
 	~KviClassicTaskBarOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index 431cdad0..1b44f803 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -27,19 +27,19 @@
 #include "kvi_app.h"
 #include "kvi_fileutils.h"
 
-#include <qdir.h>
-#include <qmessagebox.h>
+#include <tqdir.h>
+#include <tqmessagebox.h>
 
-QString g_szPrevSettedLocale;
+TQString g_szPrevSettedLocale;
 
-KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"textencoding_options_widget")
+KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"textencoding_options_widget")
 {
 	createLayout(5,2);
 
 	addLabel(0,0,0,0,__tr2qs_ctx("Default text encoding:","options"));
 
-	m_pTextEncodingCombo = new QComboBox(this);
+	m_pTextEncodingCombo = new TQComboBox(this);
 	addWidgetToLayout(m_pTextEncodingCombo,1,0,1,0);
 
 	m_pTextEncodingCombo->insertItem(__tr2qs_ctx("Use Language Encoding","options"));
@@ -48,7 +48,7 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 	KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i);
 	while(d->szName)
 	{
-		if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding)))iMatch = i + 1;
+		if(KviTQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding)))iMatch = i + 1;
 		m_pTextEncodingCombo->insertItem(d->szName);
 		i++;
 		d = KviLocale::encodingDescription(i);
@@ -58,17 +58,17 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 	
  	addLabel(0,1,0,1,__tr2qs_ctx("Force language:","options"));
 	
-	m_pForcedLocaleCombo = new QComboBox(this);
+	m_pForcedLocaleCombo = new TQComboBox(this);
 	
 	addWidgetToLayout(m_pForcedLocaleCombo,1,1,1,1);
 	
-	QLabel * l = new QLabel(__tr2qs_ctx("<b>Note:</b> You need to restart KVirc to apply a language changing","options"),this);
+	TQLabel * l = new TQLabel(__tr2qs_ctx("<b>Note:</b> You need to restart KVirc to apply a language changing","options"),this);
 	addWidgetToLayout(l,0,2,1,2);
 	
 	m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("Automatic detection","options"));
 	m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("en","options"));
 	
-	QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homeDirPath());
+	TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath());
 
 	bool bIsDefaultLocale = !KviFileUtils::fileExists(szLangFile);
 	//We Have setted locale, but not restarted kvirc
@@ -79,26 +79,26 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 		m_szLanguage=KviLocale::localeName();
 	}
 	
-	QString szLocaleDir;
+	TQString szLocaleDir;
 	g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApp::Locale);
 
-	QStringList list=QDir(szLocaleDir).entryList("kvirc_*.mo",QDir::Files);
+	TQStringList list=TQDir(szLocaleDir).entryList("kvirc_*.mo",TQDir::Files);
 	
 	i = 0;
 	iMatch = 0;
 	
-	for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
-		QString szTmp=*it;
-		szTmp.replace("kvirc_","");
-		szTmp.replace(".mo","");
+	for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+		TQString szTmp=*it;
+		szTmp.tqreplace("kvirc_","");
+		szTmp.tqreplace(".mo","");
 		m_pForcedLocaleCombo->insertItem(szTmp);
-		if(KviQString::equalCI(szTmp,m_szLanguage))
+		if(KviTQString::equalCI(szTmp,m_szLanguage))
 			iMatch = i + 2;
 		i++;
 	}
 	if(bIsDefaultLocale)
 		m_pForcedLocaleCombo->setCurrentItem(0);
-	else if(KviQString::equalCI(m_szLanguage,"en"))
+	else if(KviTQString::equalCI(m_szLanguage,"en"))
 		m_pForcedLocaleCombo->setCurrentItem(1);
 	else
 		m_pForcedLocaleCombo->setCurrentItem(iMatch);
@@ -121,7 +121,7 @@ void KviTextEncodingOptionsWidget::commit()
 	}
 	
 	idx=m_pForcedLocaleCombo->currentItem();
-	QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homeDirPath());
+	TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath());
 	if(idx==0) {
 		if(KviFileUtils::fileExists(szLangFile))
 			KviFileUtils::removeFile(szLangFile);
@@ -129,11 +129,11 @@ void KviTextEncodingOptionsWidget::commit()
 		g_szPrevSettedLocale=m_pForcedLocaleCombo->text(idx);
 		if(!KviFileUtils::writeFile(szLangFile,m_pForcedLocaleCombo->text(idx)))
 		{
-			QMessageBox::critical(this,"KVIrc",__tr2qs_ctx("Unable to write language information to","options")+"\n"+szLangFile,__tr2qs_ctx("Ok","options"));
+			TQMessageBox::critical(this,"KVIrc",__tr2qs_ctx("Unable to write language information to","options")+"\n"+szLangFile,__tr2qs_ctx("Ok","options"));
 		}
 	}
-/*	if(!KviQString::equalCI(m_pForcedLocaleCombo->text(idx),m_szLanguage))
-		QMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVirc to apply a language changing","options"),QMessageBox::Ok);*/
+/*	if(!KviTQString::equalCI(m_pForcedLocaleCombo->text(idx),m_szLanguage))
+		TQMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVirc to apply a language changing","options"),TQMessageBox::Ok);*/
 }
 
 #include "m_optw_textencoding.moc"
diff --git a/src/modules/options/optw_textencoding.h b/src/modules/options/optw_textencoding.h
index 75bdeb75..9b0e1864 100644
--- a/src/modules/options/optw_textencoding.h
+++ b/src/modules/options/optw_textencoding.h
@@ -25,7 +25,7 @@
 
 #include "kvi_optionswidget.h"
 
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTextEncodingOptionsWidget KVI_SMALLICON_TEXTENCODING
 #define KVI_OPTIONS_WIDGET_NAME_KviTextEncodingOptionsWidget __tr2qs_no_lookup("Language")
@@ -36,13 +36,14 @@
 class KviTextEncodingOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTextEncodingOptionsWidget(QWidget * parent);
+	KviTextEncodingOptionsWidget(TQWidget * tqparent);
 	~KviTextEncodingOptionsWidget();
 protected:
-	QString     m_szLanguage;
-	QComboBox * m_pTextEncodingCombo;
-	QComboBox * m_pForcedLocaleCombo;
+	TQString     m_szLanguage;
+	TQComboBox * m_pTextEncodingCombo;
+	TQComboBox * m_pForcedLocaleCombo;
 public:
 	virtual void commit();
 };
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index d1752c0f..257689c1 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -27,23 +27,23 @@
 #include "kvi_locale.h"
 #include "kvi_filedialog.h"
 
-#include <qlayout.h>
-#include <qcursor.h>
+#include <tqlayout.h>
+#include <tqcursor.h>
 #include "kvi_tal_hbox.h"
 
 
-KviTextIconEditor::KviTextIconEditor(QWidget * par,KviTextIcon * icon,KviTextIconTableItem* item)
+KviTextIconEditor::KviTextIconEditor(TQWidget * par,KviTextIcon * icon,KviTextIconTableItem* item)
 : KviTalHBox(par),m_pTableItem(item)
 {
-	m_pIconButton=new QToolButton(this);
-	m_pBrowseButton=new QToolButton(this);
-	m_pBrowseButton->setSizePolicy(QSizePolicy(QSizePolicy::Maximum,QSizePolicy::Maximum));
+	m_pIconButton=new TQToolButton(this);
+	m_pBrowseButton=new TQToolButton(this);
+	m_pBrowseButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,TQSizePolicy::Maximum));
 	m_pBrowseButton->setText("...");
 	m_pIcon = icon;
 	m_pPopup = 0;
 	updateIcon();
-	connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(doPopup()));
-	connect(m_pBrowseButton,SIGNAL(clicked()),this,SLOT(chooseFromFile()));
+	connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(doPopup()));
+	connect(m_pBrowseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFromFile()));
 }
 
 
@@ -58,10 +58,10 @@ void KviTextIconEditor::doPopup()
 	{
 		m_pPopup = new KviTalPopupMenu(this);
 		KviIconWidget * iw = new KviIconWidget(m_pPopup);
-		connect(iw,SIGNAL(selected(int)),this,SLOT(iconSelected(int)));
+		connect(iw,TQT_SIGNAL(selected(int)),this,TQT_SLOT(iconSelected(int)));
 		m_pPopup->insertItem(iw);
 	}
-	m_pPopup->popup(QCursor::pos());
+	m_pPopup->popup(TQCursor::pos());
 }
 
 void KviTextIconEditor::iconSelected(int id)
@@ -72,8 +72,8 @@ void KviTextIconEditor::iconSelected(int id)
 
 void KviTextIconEditor::chooseFromFile()
 {
-	QString szFile;
-	KviFileDialog::askForOpenFileName(szFile,"Choose icon filename",QString::null,"*.png","options");
+	TQString szFile;
+	KviFileDialog::askForOpenFileName(szFile,"Choose icon filename",TQString(),"*.png","options");
 	if(!szFile.isEmpty())
 	{
 		if(g_pIconManager->getPixmap(szFile))
@@ -89,20 +89,20 @@ void KviTextIconEditor::updateIcon()
 {
 	if(m_pIcon)
 	{
-		QPixmap* pix=m_pIcon->pixmap();
+		TQPixmap* pix=m_pIcon->pixmap();
 		if(pix)
 			m_pIconButton->setPixmap(*pix);
 	}
 }
 
 KviTextIconTableItem::KviTextIconTableItem(KviTalTable * t,KviTextIcon * icon)
-: KviTalTableItem(t,KviTalTableItem::WhenCurrent,QString::null)
+: KviTalTableItem(t,KviTalTableItem::WhenCurrent,TQString())
 {
 	if(icon)
 		m_pIcon=icon;
 	else
 		m_pIcon=new KviTextIcon(0);
-	QPixmap* pix=m_pIcon->pixmap();
+	TQPixmap* pix=m_pIcon->pixmap();
 	if(pix)
 		setPixmap(*pix);
 }
@@ -115,33 +115,33 @@ KviTextIconTableItem::~KviTextIconTableItem()
 void KviTextIconTableItem::setId(int id)
 {
 	m_pIcon->setId(id);
-	QPixmap* pix=m_pIcon->pixmap();
+	TQPixmap* pix=m_pIcon->pixmap();
 	if(pix)
 		setPixmap(*pix);
 }
 
-QWidget * KviTextIconTableItem::createEditor() const
+TQWidget * KviTextIconTableItem::createEditor() const
 {
 	return new KviTextIconEditor(table()->viewport(),m_pIcon,(KviTextIconTableItem*)this);
 }
 
 
-void KviTextIconTableItem::setContentFromEditor(QWidget * w)
+void KviTextIconTableItem::setContentFromEditor(TQWidget * w)
 {
 	if(w->inherits("KviTextIconEditor"))
 	{
-		QPixmap* pix=m_pIcon->pixmap();
+		TQPixmap* pix=m_pIcon->pixmap();
 		if(pix)
 			setPixmap(*pix);
 	}
 }
 
-KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"texticons_options_widget")
+KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"texticons_options_widget")
 {
 	createLayout(2,2);
 
-	KviPointerHashTableIterator<QString,KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
+	KviPointerHashTableIterator<TQString,KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
 
 	m_pTable = new KviTalTable(g_pTextIconManager->textIconDict()->count(),2,this);
 
@@ -160,19 +160,19 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
 		++it;
 	}
 
-	layout()->addMultiCellWidget(m_pTable,0,0,0,1);
+	tqlayout()->addMultiCellWidget(m_pTable,0,0,0,1);
 
-	m_pAdd = new QPushButton(__tr2qs_ctx("Add","options"),this);
-	layout()->addWidget(m_pAdd,1,0);
-	connect(m_pAdd,SIGNAL(clicked()),this,SLOT(addClicked()));
+	m_pAdd = new TQPushButton(__tr2qs_ctx("Add","options"),this);
+	tqlayout()->addWidget(m_pAdd,1,0);
+	connect(m_pAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
 
-	m_pDel = new QPushButton(__tr2qs_ctx("Delete","options"),this);
-	layout()->addWidget(m_pDel,1,1);
-	connect(m_pDel,SIGNAL(clicked()),this,SLOT(delClicked()));
+	m_pDel = new TQPushButton(__tr2qs_ctx("Delete","options"),this);
+	tqlayout()->addWidget(m_pDel,1,1);
+	connect(m_pDel,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked()));
 
 	m_pDel->setEnabled(false);
 
-	connect(m_pTable,SIGNAL(selectionChanged()),this,SLOT(selectionChanged()));
+	connect(m_pTable,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged()));
 }
 
 KviTextIconsOptionsWidget::~KviTextIconsOptionsWidget()
@@ -222,7 +222,7 @@ void KviTextIconsOptionsWidget::commit()
 	int n = m_pTable->numRows();
 	for(int i=0;i < n;i++)
 	{
-		QString szVal = m_pTable->text(i,0);
+		TQString szVal = m_pTable->text(i,0);
 		if(!szVal.isEmpty())
 		{
 			KviTextIconTableItem * it = (KviTextIconTableItem *)m_pTable->item(i,1);
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h
index 652c7da9..fe4e2f12 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/optw_texticons.h
@@ -32,18 +32,18 @@
 
 
 
-#include <qtoolbutton.h>
+#include <tqtoolbutton.h>
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_hbox.h" 
 
 #ifdef COMPILE_USE_QT4
-#include <q3table.h>
+#include <tq3table.h>
 #define KviTalTable Q3Table
 #define KviTalTableItem Q3TableItem
 #else
-#include <qtable.h>
-#define KviTalTable QTable
-#define KviTalTableItem QTableItem
+#include <tqtable.h>
+#define KviTalTable TQTable
+#define KviTalTableItem TQTableItem
 #endif
 
 class KviTextIconTableItem;
@@ -51,15 +51,16 @@ class KviTextIconTableItem;
 class KviTextIconEditor : public KviTalHBox
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTextIconEditor(QWidget * par,KviTextIcon * icon,KviTextIconTableItem* item);
+	KviTextIconEditor(TQWidget * par,KviTextIcon * icon,KviTextIconTableItem* item);
 	~KviTextIconEditor();
 protected:
 	KviTextIconTableItem *m_pTableItem;
 	KviTextIcon     *m_pIcon;
 	KviTalPopupMenu      *m_pPopup;
-	QToolButton     *m_pIconButton;
-	QToolButton     *m_pBrowseButton;
+	TQToolButton     *m_pIconButton;
+	TQToolButton     *m_pBrowseButton;
 public:
 	void updateIcon();
 	KviTextIcon*	icon() { return m_pIcon; };
@@ -80,20 +81,21 @@ protected:
 public:
 	KviTextIcon * icon() { return m_pIcon; };
 	void setId(int id);
-	virtual QWidget * createEditor() const;
-	virtual void setContentFromEditor(QWidget * w);
+	virtual TQWidget * createEditor() const;
+	virtual void setContentFromEditor(TQWidget * w);
 };
 
 class KviTextIconsOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTextIconsOptionsWidget(QWidget * parent);
+	KviTextIconsOptionsWidget(TQWidget * tqparent);
 	~KviTextIconsOptionsWidget();
 protected:
 	KviTalTable     * m_pTable;
-	QPushButton * m_pAdd;
-	QPushButton * m_pDel;
+	TQPushButton * m_pAdd;
+	TQPushButton * m_pDel;
 public:
     virtual void commit();
 protected slots:
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp
index b46b9a01..bbbac049 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/optw_tools.cpp
@@ -24,19 +24,19 @@
 
 #include "optw_tools.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_settings.h"
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"tools_options_widget")
+KviToolsOptionsWidget::KviToolsOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"tools_options_widget")
 {
 	
 	createLayout(1,1);
 
-	QLabel * l;
+	TQLabel * l;
 	l = addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc tools<br>"\
 		"<p>like<b> away, lag and logging system. </b> " \
 		"</p>","options"));
diff --git a/src/modules/options/optw_tools.h b/src/modules/options/optw_tools.h
index 9ebf35e8..c0f9fe40 100644
--- a/src/modules/options/optw_tools.h
+++ b/src/modules/options/optw_tools.h
@@ -38,8 +38,9 @@
 class KviToolsOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviToolsOptionsWidget(QWidget * parent);
+	KviToolsOptionsWidget(TQWidget * tqparent);
 	~KviToolsOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp
index 71bc2b64..ec076dac 100644
--- a/src/modules/options/optw_topiclabel.cpp
+++ b/src/modules/options/optw_topiclabel.cpp
@@ -24,7 +24,7 @@
 #include "kvi_locale.h"
 #include "optw_topiclabel.h"
 
-KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOptionsWidget(p, "topic_label_look_options_widget")
+KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(TQWidget *p):KviOptionsWidget(p, "topic_label_look_options_widget")
 {
 	createLayout(4, 1);
 
@@ -33,7 +33,7 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOp
 	addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground);
 	addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground);
 	
-	layout()->setRowStretch(3, 1);
+	tqlayout()->setRowStretch(3, 1);
 }
 
 KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget()
diff --git a/src/modules/options/optw_topiclabel.h b/src/modules/options/optw_topiclabel.h
index 1185fae6..58e0be93 100644
--- a/src/modules/options/optw_topiclabel.h
+++ b/src/modules/options/optw_topiclabel.h
@@ -33,8 +33,9 @@
 class KviTopicLabelLookOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTopicLabelLookOptionsWidget(QWidget *);
+	KviTopicLabelLookOptionsWidget(TQWidget *);
 	~KviTopicLabelLookOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index e988ba54..0e833ec5 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -23,7 +23,7 @@
 
 #include "optw_tray.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 #include "kvi_tal_tooltip.h"
 
 #include "kvi_options.h"
@@ -32,8 +32,8 @@
 //#warning "Info tips"
 
 
-KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"tray_options_widget")
+KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"tray_options_widget")
 {
 	createLayout(7,1);
 	
@@ -56,8 +56,8 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
 	
 	addRowSpacer(0,6,0,6);
 	
-	connect(m_pEnable,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool)));
-	connect(m_pLevelBasedNotify,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool)));
+	connect(m_pEnable,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabled(bool)));
+	connect(m_pLevelBasedNotify,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabled(bool)));
 	setEnabled(true);
 }
 
diff --git a/src/modules/options/optw_tray.h b/src/modules/options/optw_tray.h
index 5be68f36..5fc4ba78 100644
--- a/src/modules/options/optw_tray.h
+++ b/src/modules/options/optw_tray.h
@@ -23,7 +23,7 @@
 //
 
 #include "kvi_optionswidget.h"
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTrayOptionsWidget KVI_SMALLICON_DOCKWIDGET
 #define KVI_OPTIONS_WIDGET_NAME_KviTrayOptionsWidget __tr2qs_no_lookup("Tray icon")
@@ -33,8 +33,9 @@
 class KviTrayOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTrayOptionsWidget(QWidget * parent);
+	KviTrayOptionsWidget(TQWidget * tqparent);
 	~KviTrayOptionsWidget();
 protected:
 	KviBoolSelector * m_pEnable;
diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp
index 01036fb6..6b05d46a 100644
--- a/src/modules/options/optw_uparser.cpp
+++ b/src/modules/options/optw_uparser.cpp
@@ -23,16 +23,16 @@
 
 #include "optw_uparser.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-#include <qlabel.h>
+#include <tqlabel.h>
 
 
-KviUParserOptionsWidget::KviUParserOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"uparser_options_widget")
+KviUParserOptionsWidget::KviUParserOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"uparser_options_widget")
 {
 	createLayout(11,1);
 
diff --git a/src/modules/options/optw_uparser.h b/src/modules/options/optw_uparser.h
index 1e35fe92..8b538a76 100644
--- a/src/modules/options/optw_uparser.h
+++ b/src/modules/options/optw_uparser.h
@@ -32,8 +32,9 @@
 class KviUParserOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviUParserOptionsWidget(QWidget * parent);
+	KviUParserOptionsWidget(TQWidget * tqparent);
 	~KviUParserOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index 48ea2297..efe00321 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -24,16 +24,16 @@
 
 #include "optw_urlhandlers.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-#include <qlabel.h>
+#include <tqlabel.h>
 
 
-KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"urlhandlers_options_widget")
+KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"urlhandlers_options_widget")
 {
 #ifdef COMPILE_ON_WINDOWS
 	#define START_ROW 1
@@ -62,7 +62,7 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent)
 	m_pMailtoHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers));
 	m_pOtherHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers));
 
-	connect(b,SIGNAL(toggled(bool)),this,SLOT(toggleEditors(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleEditors(bool)));
 
 #endif
 
@@ -88,37 +88,37 @@ void KviUrlHandlersOptionsWidget::commit()
 	KviOptionsWidget::commit();
 
 #ifdef COMPILE_ON_WINDOWS
-	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("@MAGIC@","\\\\","options");
 	
 	//Check for escaped " in url handler ( \" )
-        KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("\\\\\"","\\\"","options");
 #endif
 }
 
diff --git a/src/modules/options/optw_urlhandlers.h b/src/modules/options/optw_urlhandlers.h
index 9ed6c188..611ed509 100644
--- a/src/modules/options/optw_urlhandlers.h
+++ b/src/modules/options/optw_urlhandlers.h
@@ -33,8 +33,9 @@
 class KviUrlHandlersOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviUrlHandlersOptionsWidget(QWidget * parent);
+	KviUrlHandlersOptionsWidget(TQWidget * tqparent);
 	~KviUrlHandlersOptionsWidget();
 private:
 	KviStringSelector*   m_pHttpHandler;
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 07b39d0d..90695e2a 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -21,7 +21,7 @@
 //
 #include "optw_userlist.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
@@ -29,8 +29,8 @@
 
 //#warning "Info tips"
 
-KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"userlistlook_options_widget")
+KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"userlistlook_options_widget")
 {
 }
 
@@ -43,8 +43,8 @@ KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"userlistlook_foreground_options_widget")
+KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"userlistlook_foreground_options_widget")
 {
 	createLayout(2,2);
 
@@ -65,7 +65,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q
 	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,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,3,0,3);
 }
@@ -74,30 +74,30 @@ KviUserListLookForegroundOptionsWidget::~KviUserListLookForegroundOptionsWidget(
 {
 }
 
-KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 	createLayout(5,1);
 	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,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
 
 	KviTalHBox* hb = new KviTalHBox(this);
 	addWidgetToLayout(hb,0,2,0,2);
 	hb->setSpacing(4);
 
-	QLabel * l = new QLabel(__tr2qs_ctx("Grid type:","options"),hb);
+	TQLabel * l = new TQLabel(__tr2qs_ctx("Grid type:","options"),hb);
 	l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,SIGNAL(toggled(bool)),l,SLOT(setEnabled(bool)));
-	m_pGridTypeCombo = new QComboBox(false,hb);
+	connect(b,TQT_SIGNAL(toggled(bool)),l,TQT_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"));
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("Plain Grid","options"));
 	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,SIGNAL(toggled(bool)),m_pGridTypeCombo,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),m_pGridTypeCombo,TQT_SLOT(setEnabled(bool)));
 	addRowSpacer(0,3,0,3);
 }
 
@@ -116,8 +116,8 @@ void KviUserListGridOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"userlistlook_background_options_widget")
+KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"userlistlook_background_options_widget")
 {
 	createLayout(3,2);
 
@@ -129,11 +129,11 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 	addPixmapSelector(0,1,1,1,__tr2qs_ctx("Background image:","options"),KviOption_pixmapUserListViewBackground);
 
 	addLabel(0,2,0,2,__tr2qs_ctx("Horizontal Alignment:","options"));
-	m_pHorizontalAlign=new QComboBox(this);
+	m_pHorizontalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pHorizontalAlign,1,2,1,2);
 	
 	addLabel(0,3,0,3,__tr2qs_ctx("Vertical Alignment:","options"));
-	m_pVerticalAlign=new QComboBox(this);
+	m_pVerticalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,3,1,3);
 	
 	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Tile","options"));
@@ -146,30 +146,30 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Bottom","options"));
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Center","options"));
 	
-	switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & Qt::AlignHorizontal_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & TQt::AlignHorizontal_Mask)
 	{
-		case Qt::AlignLeft:
+		case TQt::AlignLeft:
 			m_pHorizontalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignRight:
+		case TQt::AlignRight:
 			m_pHorizontalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignHCenter:
+		case TQt::AlignHCenter:
 			m_pHorizontalAlign->setCurrentItem(3);
 			break;
 		default:
 			m_pHorizontalAlign->setCurrentItem(0);
 	}
 	
-	switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & Qt::AlignVertical_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & TQt::AlignVertical_Mask)
 	{
-		case Qt::AlignTop:
+		case TQt::AlignTop:
 			m_pVerticalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignBottom:
+		case TQt::AlignBottom:
 			m_pVerticalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignVCenter:
+		case TQt::AlignVCenter:
 			m_pVerticalAlign->setCurrentItem(3);
 			break;
 		default:
@@ -178,8 +178,8 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 
 
 
-	//layout()->setColStretch(0,1);
-	layout()->setRowStretch(1,1);
+	//tqlayout()->setColStretch(0,1);
+	tqlayout()->setRowStretch(1,1);
 }
 
 KviUserListLookBackgroundOptionsWidget::~KviUserListLookBackgroundOptionsWidget()
@@ -195,25 +195,25 @@ void KviUserListLookBackgroundOptionsWidget::commit()
 	switch(m_pHorizontalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignLeft;
+			iFlags|=TQt::AlignLeft;
 			break;
 		case 2:
-			iFlags|=Qt::AlignRight;
+			iFlags|=TQt::AlignRight;
 			break;
 		case 3:
-			iFlags|=Qt::AlignHCenter;
+			iFlags|=TQt::AlignHCenter;
 			break;
 	}
 	switch(m_pVerticalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignTop;
+			iFlags|=TQt::AlignTop;
 			break;
 		case 2:
-			iFlags|=Qt::AlignBottom;
+			iFlags|=TQt::AlignBottom;
 			break;
 		case 3:
-			iFlags|=Qt::AlignVCenter;
+			iFlags|=TQt::AlignVCenter;
 			break;
 	}
 	
@@ -223,8 +223,8 @@ void KviUserListLookBackgroundOptionsWidget::commit()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"userlistfeatures_options_widget")
+KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"userlistfeatures_options_widget")
 {
 	createLayout(7,1);
 
diff --git a/src/modules/options/optw_userlist.h b/src/modules/options/optw_userlist.h
index d5fd4c12..8c4eaee1 100644
--- a/src/modules/options/optw_userlist.h
+++ b/src/modules/options/optw_userlist.h
@@ -24,7 +24,7 @@
 //
 
 #include "kvi_optionswidget.h"
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviUserListLookOptionsWidget KVI_SMALLICON_USERLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviUserListLookOptionsWidget __tr2qs_no_lookup("Userlist")
@@ -35,8 +35,9 @@
 class KviUserListLookOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviUserListLookOptionsWidget(QWidget * parent);
+	KviUserListLookOptionsWidget(TQWidget * tqparent);
 	~KviUserListLookOptionsWidget();
 };
 
@@ -51,12 +52,13 @@ public:
 class KviUserListLookBackgroundOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviUserListLookBackgroundOptionsWidget(QWidget * parent);
+	KviUserListLookBackgroundOptionsWidget(TQWidget * tqparent);
 	~KviUserListLookBackgroundOptionsWidget();
 protected:
-	QComboBox* m_pHorizontalAlign;
-	QComboBox* m_pVerticalAlign;
+	TQComboBox* m_pHorizontalAlign;
+	TQComboBox* m_pVerticalAlign;
 public:
 	virtual void commit();
 };
@@ -72,8 +74,9 @@ public:
 class KviUserListLookForegroundOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviUserListLookForegroundOptionsWidget(QWidget * parent);
+	KviUserListLookForegroundOptionsWidget(TQWidget * tqparent);
 	~KviUserListLookForegroundOptionsWidget();
 };
 
@@ -88,11 +91,12 @@ public:
 class KviUserListGridOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviUserListGridOptionsWidget(QWidget * parent);
+	KviUserListGridOptionsWidget(TQWidget * tqparent);
 	~KviUserListGridOptionsWidget();
 protected:
-	QComboBox * m_pGridTypeCombo;
+	TQComboBox * m_pGridTypeCombo;
 public:
 	virtual void commit();
 };
@@ -106,8 +110,9 @@ public:
 class KviUserListFeaturesOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviUserListFeaturesOptionsWidget(QWidget * parent);
+	KviUserListFeaturesOptionsWidget(TQWidget * tqparent);
 	~KviUserListFeaturesOptionsWidget();
 };