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

2 files changed, 148 insertions, 144 deletions

diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index dd7cf391..a40b9b8f 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -25,20 +25,20 @@
 
 #include "libkvidialog.h"
 
-#include <qmessagebox.h>
-#include <qlayout.h>
+#include <tqmessagebox.h>
+#include <tqlayout.h>
 #include "kvi_tal_hbox.h"
-#include <qlineedit.h>
+#include <tqlineedit.h>
 #ifdef COMPILE_USE_QT4
-	#include <q3multilineedit.h>
-	#define QMultiLineEdit Q3MultiLineEdit
-	#include <qdesktopwidget.h>
+	#include <tq3multilineedit.h>
+	#define TQMultiLineEdit Q3MultiLineEdit
+	#include <tqdesktopwidget.h>
 #else
-	#include <qmultilineedit.h>
+	#include <tqmultilineedit.h>
 #endif
-#include <qevent.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqevent.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
 
 #include "kvi_locale.h"
 #include "kvi_module.h"
@@ -51,25 +51,25 @@
 #include "kvi_kvs_script.h"
 #include "kvi_msgbox.h"
 
-static KviPointerList<QWidget> * g_pDialogModuleDialogList;
+static KviPointerList<TQWidget> * g_pDialogModuleDialogList;
 
 KviKvsCallbackMessageBox::KviKvsCallbackMessageBox(
-	const QString &szCaption,
-	const QString &szText,
-	const QString &szIcon,
-	const QString &szButton0,
-	const QString &szButton1,
-	const QString &szButton2,
-	const QString &szCode,
+	const TQString &szCaption,
+	const TQString &szText,
+	const TQString &szIcon,
+	const TQString &szButton0,
+	const TQString &szButton1,
+	const TQString &szButton2,
+	const TQString &szCode,
 	KviKvsVariantList * pMagicParams,
 	KviWindow * pWindow,bool modal)
-: QMessageBox(
+: TQMessageBox(
 	szCaption,
 	szText,
-	QMessageBox::NoIcon,
-	szButton0.isEmpty() ? QMessageBox::NoButton : QMessageBox::Ok | QMessageBox::Default,
-	szButton1.isEmpty() ? QMessageBox::NoButton : (szButton2.isEmpty() ? QMessageBox::No | QMessageBox::Escape : QMessageBox::No),
-	szButton2.isEmpty() ? QMessageBox::NoButton : QMessageBox::Cancel | QMessageBox::Escape,
+	TQMessageBox::NoIcon,
+	szButton0.isEmpty() ? TQMessageBox::NoButton : TQMessageBox::Ok | TQMessageBox::Default,
+	szButton1.isEmpty() ? TQMessageBox::NoButton : (szButton2.isEmpty() ? TQMessageBox::No | TQMessageBox::Escape : TQMessageBox::No),
+	szButton2.isEmpty() ? TQMessageBox::NoButton : TQMessageBox::Cancel | TQMessageBox::Escape,
 	0,0,modal) ,
 	KviKvsCallbackObject("dialog.message",pWindow,szCode,pMagicParams,0)
 {
@@ -78,17 +78,17 @@ KviKvsCallbackMessageBox::KviKvsCallbackMessageBox(
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)));
 #endif
 
-	QPixmap * pix = g_pIconManager->getImage(szIcon);
+	TQPixmap * pix = g_pIconManager->getImage(szIcon);
 
 	if(pix)setIconPixmap(*pix);
 	else {
-		if(KviQString::equalCI(szIcon,"information"))setIcon(QMessageBox::Information);
-		else if(KviQString::equalCI(szIcon,"warning"))setIcon(QMessageBox::Warning);
-		else if(KviQString::equalCI(szIcon,"critical"))setIcon(QMessageBox::Critical);
+		if(KviTQString::equalCI(szIcon,"information"))setIcon(TQMessageBox::Information);
+		else if(KviTQString::equalCI(szIcon,"warning"))setIcon(TQMessageBox::Warning);
+		else if(KviTQString::equalCI(szIcon,"critical"))setIcon(TQMessageBox::Critical);
 	}
-	if(!szButton0.isEmpty())setButtonText(QMessageBox::Ok,szButton0);
-	if(!szButton1.isEmpty())setButtonText(QMessageBox::No,szButton1);
-	if(!szButton2.isEmpty())setButtonText(QMessageBox::Cancel,szButton2);
+	if(!szButton0.isEmpty())setButtonText(TQMessageBox::Ok,szButton0);
+	if(!szButton1.isEmpty())setButtonText(TQMessageBox::No,szButton1);
+	if(!szButton2.isEmpty())setButtonText(TQMessageBox::Cancel,szButton2);
 }
 
 KviKvsCallbackMessageBox::~KviKvsCallbackMessageBox()
@@ -98,14 +98,14 @@ KviKvsCallbackMessageBox::~KviKvsCallbackMessageBox()
 
 void KviKvsCallbackMessageBox::done(int code)
 {
-	QMessageBox::done(code);
+	TQMessageBox::done(code);
 
 	kvs_int_t iVal = 0;
 	
 	switch(code)
 	{
-		case QMessageBox::No: iVal = 1; break;
-		case QMessageBox::Cancel: iVal = 2; break;
+		case TQMessageBox::No: iVal = 1; break;
+		case TQMessageBox::Cancel: iVal = 2; break;
 	}
 
 	KviKvsVariantList params;
@@ -147,7 +147,7 @@ void KviKvsCallbackMessageBox::done(int code)
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
 		to the <callback_command> as positional parameters.[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its parent widget and block its input until it's closed.[br] 
+		it will appear above its tqparent widget and block its input until it's closed.[br] 
 		Once the dialog has been shown , the user will click one of the buttons. At this point the dialog
 		is hidden and the <callback_command> is executed passing the number of the button clicked
 		as $0 and the magic parameters as positional parameters $1 , $2 , $3....[br]
@@ -169,7 +169,7 @@ void KviKvsCallbackMessageBox::done(int code)
 
 static bool dialog_kvs_cmd_message(KviKvsModuleCallbackCommandCall * c)
 {
-	QString szCaption,szMessage,szIcon,szButton0,szButton1,szButton2;
+	TQString szCaption,szMessage,szIcon,szButton0,szButton1,szButton2;
 	KviKvsVariantList params;
 
 	KVSM_PARAMETERS_BEGIN(c)
@@ -184,7 +184,7 @@ static bool dialog_kvs_cmd_message(KviKvsModuleCallbackCommandCall * c)
 	bool modal;
 	if(c->hasSwitch('b',"modal")) modal=true;
 	else modal=false;
-	QString szCmd = c->callback()->code();
+	TQString szCmd = c->callback()->code();
 
 	KviKvsCallbackMessageBox * box = new KviKvsCallbackMessageBox(
 			szCaption,szMessage,szIcon,szButton0,szButton1,szButton2,szCmd,&params,c->window(),modal);
@@ -196,38 +196,38 @@ static bool dialog_kvs_cmd_message(KviKvsModuleCallbackCommandCall * c)
 
 
 KviKvsCallbackTextInput::KviKvsCallbackTextInput(
-		const QString &szCaption,
-		const QString &szLabel,
-		const QString &szDefaultText,
-		const QString &szIcon,
+		const TQString &szCaption,
+		const TQString &szLabel,
+		const TQString &szDefaultText,
+		const TQString &szIcon,
 		bool bMultiLine,
-		const QString &szButton0,
-		const QString &szButton1,
-		const QString &szButton2,
-		const QString &szCode,
+		const TQString &szButton0,
+		const TQString &szButton1,
+		const TQString &szButton2,
+		const TQString &szCode,
 		KviKvsVariantList * pMagicParams,
 		KviWindow * pWindow,bool modal)
-	: QDialog(), KviKvsCallbackObject("dialog.textinput",pWindow,szCode,pMagicParams,0)
+	: TQDialog(), KviKvsCallbackObject("dialog.textinput",pWindow,szCode,pMagicParams,0)
 {
 	g_pDialogModuleDialogList->append(this);
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)));
 	setModal(modal);
 	setCaption(szCaption);
 
-	QGridLayout * g = new QGridLayout(this,2,3,5,5);
+	TQGridLayout * g = new TQGridLayout(this,2,3,5,5);
 
-	QPixmap * pix = g_pIconManager->getImage(szIcon);
+	TQPixmap * pix = g_pIconManager->getImage(szIcon);
 
 	if(pix)
 	{
-		QLabel * il = new QLabel(this);
+		TQLabel * il = new TQLabel(this);
 		il->setPixmap(*pix);
-		il->setAlignment(Qt::AlignCenter);
+		il->tqsetAlignment(TQt::AlignCenter);
 		g->addWidget(il,0,0);
-		QLabel * tl = new QLabel(szLabel,this);
+		TQLabel * tl = new TQLabel(szLabel,this);
 		g->addWidget(tl,0,1);
 	} else {
-		QLabel * tl = new QLabel(szLabel,this);
+		TQLabel * tl = new TQLabel(szLabel,this);
 		g->addMultiCellWidget(tl,0,0,0,1);
 	}
 
@@ -237,11 +237,11 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput(
 
 	if(m_bMultiLine)
 	{
-		m_pEdit = new QMultiLineEdit(this);
-		((QMultiLineEdit *)m_pEdit)->setText(szDefaultText);
+		m_pEdit = new TQMultiLineEdit(this);
+		((TQMultiLineEdit *)m_pEdit)->setText(szDefaultText);
 	} else {
-		m_pEdit = new QLineEdit(this);
-		((QLineEdit *)m_pEdit)->setText(szDefaultText);
+		m_pEdit = new TQLineEdit(this);
+		((TQLineEdit *)m_pEdit)->setText(szDefaultText);
 	}
 
 	g->addMultiCellWidget(m_pEdit,1,1,0,1);
@@ -254,59 +254,59 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput(
 
 	if(!szButton0.isEmpty())
 	{
-		QString szB = szButton0;
+		TQString szB = szButton0;
 		bool bDef = false;
-		if(KviQString::equalCIN(szB,"default=",8))
+		if(KviTQString::equalCIN(szB,"default=",8))
 		{
 			bDef = true;
 			szB.remove(0,8);
 			m_iDefaultButton = 0;
-		} else if(KviQString::equalCIN(szB,"escape=",7))
+		} else if(KviTQString::equalCIN(szB,"escape=",7))
 		{
 			szB.remove(0,7);
 			m_iEscapeButton = 0;
 		}
-		QPushButton * pb1 = new QPushButton(szB,box);
+		TQPushButton * pb1 = new TQPushButton(szB,box);
 		if(bDef)pb1->setDefault(true);
-		connect(pb1,SIGNAL(clicked()),this,SLOT(b0Clicked()));
+		connect(pb1,TQT_SIGNAL(clicked()),this,TQT_SLOT(b0Clicked()));
 	}
 
 	if(!szButton1.isEmpty())
 	{
-		QString szB = szButton1;
+		TQString szB = szButton1;
 		bool bDef = false;
-		if(KviQString::equalCIN(szB,"default=",8))
+		if(KviTQString::equalCIN(szB,"default=",8))
 		{
 			bDef = true;
 			szB.remove(0,8);
 			m_iDefaultButton = 1;
-		} else if(KviQString::equalCIN(szB,"escape=",7))
+		} else if(KviTQString::equalCIN(szB,"escape=",7))
 		{
 			szB.remove(0,7);
 			m_iEscapeButton = 1;
 		}
-		QPushButton * pb2 = new QPushButton(szB,box);
+		TQPushButton * pb2 = new TQPushButton(szB,box);
 		if(bDef)pb2->setDefault(true);
-		connect(pb2,SIGNAL(clicked()),this,SLOT(b1Clicked()));
+		connect(pb2,TQT_SIGNAL(clicked()),this,TQT_SLOT(b1Clicked()));
 	}
 
 	if(!szButton2.isEmpty())
 	{
-		QString szB = szButton2;
+		TQString szB = szButton2;
 		bool bDef = false;
-		if(KviQString::equalCIN(szB,"default=",8))
+		if(KviTQString::equalCIN(szB,"default=",8))
 		{
 			bDef = true;
 			szB.remove(0,8);
 			m_iDefaultButton = 2;
-		} else if(KviQString::equalCIN(szB,"escape=",7))
+		} else if(KviTQString::equalCIN(szB,"escape=",7))
 		{
 			szB.remove(0,7);
 			m_iEscapeButton = 2;
 		}
-		QPushButton * pb3 = new QPushButton(szB,box);
+		TQPushButton * pb3 = new TQPushButton(szB,box);
 		if(bDef)pb3->setDefault(true);
-		connect(pb3,SIGNAL(clicked()),this,SLOT(b2Clicked()));
+		connect(pb3,TQT_SIGNAL(clicked()),this,TQT_SLOT(b2Clicked()));
 	}
 
 }
@@ -331,7 +331,7 @@ void KviKvsCallbackTextInput::b2Clicked()
 	done(2+10);
 }
 
-void KviKvsCallbackTextInput::closeEvent(QCloseEvent *e)
+void KviKvsCallbackTextInput::closeEvent(TQCloseEvent *e)
 {
 	e->ignore();
 	done(m_iEscapeButton+10);
@@ -345,7 +345,7 @@ void KviKvsCallbackTextInput::done(int code)
 	} else {
 		switch(code)
 		{
-			case QDialog::Accepted:
+			case TQDialog::Accepted:
 				code = m_iDefaultButton;
 			break;
 			default:
@@ -354,13 +354,13 @@ void KviKvsCallbackTextInput::done(int code)
 		}
 	}
 
-	QString txt;
+	TQString txt;
 	
 	if(m_bMultiLine)
 	{
-		txt = ((QMultiLineEdit *)m_pEdit)->text();
+		txt = ((TQMultiLineEdit *)m_pEdit)->text();
 	} else {
-		txt = ((QLineEdit *)m_pEdit)->text();
+		txt = ((TQLineEdit *)m_pEdit)->text();
 	}
 
 	KviKvsVariantList params;
@@ -369,15 +369,15 @@ void KviKvsCallbackTextInput::done(int code)
 
 	execute(&params);
 
-	//QDialog::done(code);
+	//TQDialog::done(code);
 
 	delete this;
 }
 
-void KviKvsCallbackTextInput::showEvent(QShowEvent *e)
+void KviKvsCallbackTextInput::showEvent(TQShowEvent *e)
 {
 	move((g_pApp->desktop()->width() - width())/2,(g_pApp->desktop()->height() - height()) / 2);
-	QDialog::showEvent(e);
+	TQDialog::showEvent(e);
 }
 
 
@@ -417,7 +417,7 @@ void KviKvsCallbackTextInput::showEvent(QShowEvent *e)
 		If the -d switch is used , the initial text input value is set to <default text>.[br]
 		If the -i switch is used , the dialog displays also the icon <icon> , just on the left ot the <info_text>[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its parent widget and block its input until it's closed.[br] 
+		it will appear above its tqparent widget and block its input until it's closed.[br] 
 		In that case <icon> is an [doc:image_id]image identifier[/doc] (can be a relative or absolute
 		path to an image file or a signed number (in that case it defines an internal KVIrc image).[br]
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.textinput call time and passed
@@ -447,7 +447,7 @@ void KviKvsCallbackTextInput::showEvent(QShowEvent *e)
 
 static bool dialog_kvs_cmd_textinput(KviKvsModuleCallbackCommandCall * c)
 {
-	QString szCaption,szInfoText,szIcon,szDefaultText,szButton0,szButton1,szButton2;
+	TQString szCaption,szInfoText,szIcon,szDefaultText,szButton0,szButton1,szButton2;
 	KviKvsVariantList params;
 
 	KVSM_PARAMETERS_BEGIN(c)
@@ -459,7 +459,7 @@ static bool dialog_kvs_cmd_textinput(KviKvsModuleCallbackCommandCall * c)
 		KVSM_PARAMETER("magic",KVS_PT_VARIANTLIST,KVS_PF_OPTIONAL,params)
 	KVSM_PARAMETERS_END(c)
 
-	QString szCmd = c->callback()->code();
+	TQString szCmd = c->callback()->code();
 
 	c->switches()->getAsStringIfExisting('i',"icon",szIcon);
 	c->switches()->getAsStringIfExisting('d',"default",szDefaultText);
@@ -467,7 +467,7 @@ static bool dialog_kvs_cmd_textinput(KviKvsModuleCallbackCommandCall * c)
 	if(c->hasSwitch('b',"modal")) modal=true;
 	else modal=false;
 	KviKvsCallbackTextInput * box = new KviKvsCallbackTextInput(
-			szCaption,szInfoText,szDefaultText,szIcon,c->switches()->find('m',"multiline"),
+			szCaption,szInfoText,szDefaultText,szIcon,c->switches()->tqfind('m',"multiline"),
 			szButton0,szButton1,szButton2,szCmd,&params,c->window(),modal);
 	box->show();
 
@@ -481,10 +481,10 @@ static bool dialog_kvs_cmd_textinput(KviKvsModuleCallbackCommandCall * c)
 
 // New KVS
 KviKvsCallbackFileDialog::KviKvsCallbackFileDialog(
-		const QString &szCaption,
-		const QString &szInitialSelection,
-		const QString &szFilter,
-		const QString &szCode,
+		const TQString &szCaption,
+		const TQString &szInitialSelection,
+		const TQString &szFilter,
+		const TQString &szCode,
 		KviKvsVariantList * pMagicParams,
 		KviWindow * pWindow,bool modal)
 	: KviFileDialog(szInitialSelection,szFilter,0,0,modal), KviKvsCallbackObject("dialog.file",pWindow,szCode,pMagicParams,0)
@@ -503,18 +503,18 @@ void KviKvsCallbackFileDialog::done(int code)
 	KviFileDialog::done(code);
 	KviKvsVariantList params;
 
-	if(code == QDialog::Accepted)
+	if(code == TQDialog::Accepted)
 	{
 #ifdef COMPILE_KDE_SUPPORT
 		if(mode() == KFile::ExistingOnly)
 #else
-		if(mode() == QFileDialog::ExistingFiles)
+		if(mode() == TQFileDialog::ExistingFiles)
 #endif
 		{
 			KviKvsArray * a = new KviKvsArray();
-			QStringList sl = selectedFiles();
+			TQStringList sl = selectedFiles();
 			int idx = 0;
-			for(QStringList::Iterator it = sl.begin();it != sl.end();++it)
+			for(TQStringList::Iterator it = sl.begin();it != sl.end();++it)
 			{
 				a->set(idx,new KviKvsVariant(*it));
 				idx++;
@@ -524,17 +524,17 @@ void KviKvsCallbackFileDialog::done(int code)
 			params.append(new KviKvsVariant(selectedFile()));
 		}
 	} else {
-		params.append(new KviKvsVariant(QString("")));
+		params.append(new KviKvsVariant(TQString("")));
 	}
 
 	hide(); // ensure we're hidden
 
-	// ugly workaround for the Qt filedialog "destructive accept() before this reference" bug
+	// ugly workaround for the TQt filedialog "destructive accept() before this reference" bug
 	// we can't delete ourselves in this moment.... :(((
 	// ...so skip out of this call stack and ask KviApp to destroy us just
 	// when the control returns to the main loop.
 	// If the module is unloaded then , KviApp will notice it and will NOT delete the dialog
-	g_pApp->collectGarbage(this);
+	g_pApp->collectGarbage(TQT_TQOBJECT(this));
 
 	// calling dialog.unload here WILL lead to a sigsegv (this is SURE
 	// with a lot of qt versions that have the ugly file dialog "accept before this reference" bug)
@@ -573,7 +573,7 @@ void KviKvsCallbackFileDialog::done(int code)
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
 		to the <callback_command> as positional parameters.[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its parent widget and block its input until it's closed.[br] 
+		it will appear above its tqparent widget and block its input until it's closed.[br] 
 		Once the dialog has been shown , the user will select an EXISTING file and click either
 		Ok or Cancel. At this point the dialog is hidden and the <callback_command> is executed passing the selected file(s) as $0
 		and the magic parameters as positional parameters $1 , $2 , $3....[br]
@@ -592,7 +592,7 @@ void KviKvsCallbackFileDialog::done(int code)
 
 static bool dialog_kvs_cmd_file(KviKvsModuleCallbackCommandCall * c)
 {
-	QString szMode,szCaption,szInitialSelection,szFilter;
+	TQString szMode,szCaption,szInitialSelection,szFilter;
 	KviKvsVariantList params;
 
 	KVSM_PARAMETERS_BEGIN(c)
@@ -605,15 +605,15 @@ static bool dialog_kvs_cmd_file(KviKvsModuleCallbackCommandCall * c)
 	bool modal;
 	if(c->hasSwitch('b',"modal")) modal=true;
 	else modal=false;
-	QString szCmd = c->callback()->code();
+	TQString szCmd = c->callback()->code();
 
 	KviKvsCallbackFileDialog * box = new KviKvsCallbackFileDialog(szCaption,szInitialSelection,szFilter,szCmd,&params,c->window(),modal);
 
 	KviFileDialog::FileMode md = KviFileDialog::ExistingFile;
 
-	if(KviQString::equalCI(szMode,"openm"))md = KviFileDialog::ExistingFiles;
-	else if(KviQString::equalCI(szMode,"save"))md = KviFileDialog::AnyFile;
-	else if(KviQString::equalCI(szMode,"dir"))md = KviFileDialog::DirectoryOnly;
+	if(KviTQString::equalCI(szMode,"openm"))md = KviFileDialog::ExistingFiles;
+	else if(KviTQString::equalCI(szMode,"save"))md = KviFileDialog::AnyFile;
+	else if(KviTQString::equalCI(szMode,"dir"))md = KviFileDialog::DirectoryOnly;
 
 	box->setFileMode(md);
 
@@ -629,11 +629,11 @@ static bool dialog_kvs_cmd_file(KviKvsModuleCallbackCommandCall * c)
 
 // New KVS
 KviKvsCallbackImageDialog::KviKvsCallbackImageDialog(
-		const QString &szCaption,
-		const QString &szInitialSelection,
+		const TQString &szCaption,
+		const TQString &szInitialSelection,
 		int iType,
 		int iMaxSize,
-		const QString &szCode,
+		const TQString &szCode,
 		KviKvsVariantList * pMagicParams,
 		KviWindow * pWindow,bool modal)
 	: KviImageDialog(0,szCaption,iType,0,szInitialSelection,iMaxSize,modal), KviKvsCallbackObject("dialog.image",pWindow,szCode,pMagicParams,0)
@@ -651,21 +651,21 @@ void KviKvsCallbackImageDialog::done(int code)
 	KviImageDialog::done(code);
 	KviKvsVariantList params;
 
-	if(code == QDialog::Accepted)
+	if(code == TQDialog::Accepted)
 	{
 		params.append(new KviKvsVariant(selectedImage()));
 	} else {
-		params.append(new KviKvsVariant(QString("")));
+		params.append(new KviKvsVariant(TQString("")));
 	}
 
 	hide(); // ensure we're hidden
 
-	// ugly workaround for the Qt filedialog "destructive accept() before this reference" bug
+	// ugly workaround for the TQt filedialog "destructive accept() before this reference" bug
 	// we can't delete ourselves in this moment.... :(((
 	// ...so skip out of this call stack and ask KviApp to destroy us just
 	// when the control returns to the main loop.
 	// If the module is unloaded then , KviApp will notice it and will NOT delete the dialog
-	g_pApp->collectGarbage(this);
+	g_pApp->collectGarbage(TQT_TQOBJECT(this));
 
 	// calling dialog.unload here WILL lead to a sigsegv (this is SURE
 	// with a lot of qt versions that have the ugly file dialog "accept before this reference" bug)
@@ -704,7 +704,7 @@ void KviKvsCallbackImageDialog::done(int code)
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.image call time and passed
 		to the <callback_command> as positional parameters.[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its parent widget and block its input until it's closed.[br] 
+		it will appear above its tqparent widget and block its input until it's closed.[br] 
 		Once the dialog has been shown , the user will select an EXISTING file and click either
 		Ok or Cancel. At this point the dialog is hidden and the <callback_command> is executed passing the selected file(s) as $0
 		and the magic parameters as positional parameters $1 , $2 , $3....[br]
@@ -723,7 +723,7 @@ void KviKvsCallbackImageDialog::done(int code)
 
 static bool dialog_kvs_cmd_image(KviKvsModuleCallbackCommandCall * c)
 {
-	QString szType,szCaption,szInitialSelection;
+	TQString szType,szCaption,szInitialSelection;
 	kvs_uint_t iMaxSize;
 	KviKvsVariantList params;
 
@@ -737,12 +737,12 @@ static bool dialog_kvs_cmd_image(KviKvsModuleCallbackCommandCall * c)
 	bool modal;
 	if(c->hasSwitch('b',"modal")) modal=true;
 	else modal=false;
-	QString szCmd = c->callback()->code();
+	TQString szCmd = c->callback()->code();
 
 	int iType = 0;
 
-	if(szType.contains('s'))iType |= KID_TYPE_BUILTIN_IMAGES_SMALL;
-	if(szType.contains('f'))iType |= KID_TYPE_FULL_PATH;
+	if(szType.tqcontains('s'))iType |= KID_TYPE_BUILTIN_IMAGES_SMALL;
+	if(szType.tqcontains('f'))iType |= KID_TYPE_FULL_PATH;
 	if(szType.isEmpty())iType = KID_TYPE_ALL;
 
 	if(iMaxSize < 1)iMaxSize = 256000;
@@ -774,8 +774,8 @@ static bool dialog_kvs_cmd_image(KviKvsModuleCallbackCommandCall * c)
 
 static bool dialog_kvs_fnc_yesno(KviKvsModuleFunctionCall * c)
 {
-	QString szCaption;
-	QString szText;
+	TQString szCaption;
+	TQString szText;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("caption",KVS_PT_STRING,0,szCaption)
 		KVSM_PARAMETER("text",KVS_PT_STRING,0,szText)
@@ -823,7 +823,7 @@ static bool dialog_module_fnc_textline(KviModule *m,KviCommand *c,KviParameterLi
 	KviStr initial = parms->safeNextParam();
 
 	dialog_module_entering_local_loop(m);
-	QMessageBox::information(0,caption.ptr(),info.ptr(),QMessageBox::Ok);
+	TQMessageBox::information(0,caption.ptr(),info.ptr(),TQMessageBox::Ok);
 	dialog_module_exiting_local_loop(m);
 
 	// It might be that the current window is no longer available!!!
@@ -878,7 +878,7 @@ static bool dialog_module_fnc_textline(KviModule *m,KviCommand *c,KviParameterLi
 
 static bool dialog_module_init(KviModule * m)
 {
-	g_pDialogModuleDialogList = new KviPointerList<QWidget>;
+	g_pDialogModuleDialogList = new KviPointerList<TQWidget>;
 	g_pDialogModuleDialogList->setAutoDelete(false);
 
 	KVSM_REGISTER_CALLBACK_COMMAND(m,"message",dialog_kvs_cmd_message);
diff --git a/src/modules/dialog/libkvidialog.h b/src/modules/dialog/libkvidialog.h
index 43b1510f..6763646a 100644
--- a/src/modules/dialog/libkvidialog.h
+++ b/src/modules/dialog/libkvidialog.h
@@ -31,24 +31,25 @@
 
 #include "kvi_kvs_callbackobject.h"
 
-#include <qmessagebox.h>
-#include <qdialog.h>
+#include <tqmessagebox.h>
+#include <tqdialog.h>
 
 
 
 // New KVS
-class KviKvsCallbackMessageBox : public QMessageBox, public KviKvsCallbackObject
+class KviKvsCallbackMessageBox : public TQMessageBox, public KviKvsCallbackObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviKvsCallbackMessageBox(
-		const QString &szCaption,
-		const QString &szText,
-		const QString &szIcon,
-		const QString &szButton0,
-		const QString &szButton1,
-		const QString &szButton2,
-		const QString &szCode,
+		const TQString &szCaption,
+		const TQString &szText,
+		const TQString &szIcon,
+		const TQString &szButton0,
+		const TQString &szButton1,
+		const TQString &szButton2,
+		const TQString &szCode,
 		KviKvsVariantList * pMagicParams,
 		KviWindow * pWindow, bool modal=false);
 	~KviKvsCallbackMessageBox();
@@ -60,31 +61,32 @@ protected slots:
 
 
 // New KVS
-class KviKvsCallbackTextInput : public QDialog, public KviKvsCallbackObject
+class KviKvsCallbackTextInput : public TQDialog, public KviKvsCallbackObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviKvsCallbackTextInput(
-		const QString &szCaption,
-		const QString &szLabel,
-		const QString &szDefaultText,
-		const QString &szIcon,
+		const TQString &szCaption,
+		const TQString &szLabel,
+		const TQString &szDefaultText,
+		const TQString &szIcon,
 		bool bMultiLine,
-		const QString &szButton0,
-		const QString &szButton1,
-		const QString &szButton2,
-		const QString &szCode,
+		const TQString &szButton0,
+		const TQString &szButton1,
+		const TQString &szButton2,
+		const TQString &szCode,
 		KviKvsVariantList * pMagicParams,
 		KviWindow * pWindow, bool modal=false);
 	~KviKvsCallbackTextInput();
 protected:
 	bool      m_bMultiLine;
-	QWidget * m_pEdit;
+	TQWidget * m_pEdit;
 	int       m_iEscapeButton;
 	int       m_iDefaultButton;
 protected:
-	virtual void closeEvent(QCloseEvent *e);
-	virtual void showEvent(QShowEvent *e);
+	virtual void closeEvent(TQCloseEvent *e);
+	virtual void showEvent(TQShowEvent *e);
 protected slots:
 	void b0Clicked();
 	void b1Clicked();
@@ -98,12 +100,13 @@ protected slots:
 class KviKvsCallbackFileDialog : public KviFileDialog, public KviKvsCallbackObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviKvsCallbackFileDialog(
-		const QString &szCaption,
-		const QString &szInitialSelection,
-		const QString &szFilter,
-		const QString &szCode,
+		const TQString &szCaption,
+		const TQString &szInitialSelection,
+		const TQString &szFilter,
+		const TQString &szCode,
 		KviKvsVariantList * pMagicParams,
 		KviWindow * pWindow, bool modal=false);
 	~KviKvsCallbackFileDialog();
@@ -116,13 +119,14 @@ protected:
 class KviKvsCallbackImageDialog : public KviImageDialog, public KviKvsCallbackObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KviKvsCallbackImageDialog(
-		const QString &szCaption,
-		const QString &szInitialSelection,
+		const TQString &szCaption,
+		const TQString &szInitialSelection,
 		int iType,
 		int iMaxSize,
-		const QString &szCode,
+		const TQString &szCode,
 		KviKvsVariantList * pMagicParams,
 		KviWindow * pWindow,bool modal=false);
 	~KviKvsCallbackImageDialog();