11 files changed, 113 insertions, 108 deletions

diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp
index 292e016..e80cd19 100644
--- a/lilo-config/kde-qt-common/EditWidget.cpp
+++ b/lilo-config/kde-qt-common/EditWidget.cpp
@@ -28,7 +28,7 @@
 */
 #include "EditWidget.moc"
 #include "ui.h"
-EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, TQWidget *parent, const char *name, WFlags f, bool allowLines):TQHBox(allowLines, parent, name, f)
+EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, TQWidget *tqparent, const char *name, WFlags f, bool allowLines):TQHBox(allowLines, tqparent, name, f)
 {
 	setMargin(SPACE_MARGIN);
 	setSpacing(SPACE_INSIDE);
@@ -42,40 +42,40 @@ EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, T
 	if(isFile) {
 		select=new TQPushButton(_("Select..."), this);
 		connect(select, TQT_SIGNAL(clicked()), TQT_SLOT(selectFileClicked()));
-		select->resize(select->minimumSizeHint());
+		select->resize(select->tqminimumSizeHint());
 		setStretchFactor(select, 0);
 	} else
 		select=0;
 }
 void EditWidget::selectFileClicked()
 {
-    TQString filename=FileDlg::getOpenFileName(TQString::null, TQString::null, this);
+    TQString filename=FileDlg::getOpenFileName(TQString(), TQString(), this);
     if(!filename.isEmpty())
 	line->setText(filename);
 }
-TQSize EditWidget::sizeHint() const
+TQSize EditWidget::tqsizeHint() const
 {
-	int w=2*SPACE_MARGIN+lbl->sizeHint().width()+SPACE_INSIDE+line->sizeHint().width();
-	int h=lbl->sizeHint().height();
-	if(h<line->sizeHint().height())
-		h=line->sizeHint().height();
+	int w=2*SPACE_MARGIN+lbl->tqsizeHint().width()+SPACE_INSIDE+line->tqsizeHint().width();
+	int h=lbl->tqsizeHint().height();
+	if(h<line->tqsizeHint().height())
+		h=line->tqsizeHint().height();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->sizeHint().width();
-		if(h<select->sizeHint().height())
-			h=select->sizeHint().height();
+		w+=SPACE_INSIDE+select->tqsizeHint().width();
+		if(h<select->tqsizeHint().height())
+			h=select->tqsizeHint().height();
 	}
 	return TQSize(w, h);
 }
-TQSize EditWidget::minimumSizeHint() const
+TQSize EditWidget::tqminimumSizeHint() const
 {
-	int w=2*SPACE_MARGIN+lbl->minimumSizeHint().width()+SPACE_INSIDE+line->minimumSizeHint().width();
-	int h=lbl->minimumSizeHint().height();
-	if(h<line->minimumSizeHint().height())
-		h=line->minimumSizeHint().height();
+	int w=2*SPACE_MARGIN+lbl->tqminimumSizeHint().width()+SPACE_INSIDE+line->tqminimumSizeHint().width();
+	int h=lbl->tqminimumSizeHint().height();
+	if(h<line->tqminimumSizeHint().height())
+		h=line->tqminimumSizeHint().height();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->minimumSizeHint().width();
-		if(h<select->minimumSizeHint().height())
-			h=select->minimumSizeHint().height();
+		w+=SPACE_INSIDE+select->tqminimumSizeHint().width();
+		if(h<select->tqminimumSizeHint().height())
+			h=select->tqminimumSizeHint().height();
 	}
 	return TQSize(w, h);
 }
diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h
index 0a64750..0c0c97d 100644
--- a/lilo-config/kde-qt-common/EditWidget.h
+++ b/lilo-config/kde-qt-common/EditWidget.h
@@ -32,11 +32,12 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-class EditWidget:public QHBox
+class EditWidget:public TQHBox
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *parent=0, const char *name=0, WFlags f=0, bool allowLines=true);
+	EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *tqparent=0, const char *name=0, WFlags f=0, bool allowLines=true);
 	void setLabel(TQString const &label) { lbl->setText(label); };
 	TQString text() const { return line->text(); };
 	TQString displayText() const { return line->displayText(); };
@@ -57,8 +58,8 @@ public:
 	void cut() { line->cut(); };
 	void copy() const { line->copy(); };
 	void paste() { line->paste(); };
-	void setAlignment(int flag) { line->setAlignment(flag); };
-	int alignment() const { return line->alignment(); };
+	void tqsetAlignment(int flag) { line->tqsetAlignment(flag); };
+	int tqalignment() const { return line->tqalignment(); };
 	void cursorLeft(bool mark, int steps=1) { line->cursorLeft(mark, steps); };
 	void cursorRight(bool mark, int steps=1) { line->cursorRight(mark, steps); };
 	void cursorWordForward(bool mark) { line->cursorWordForward(mark); };
@@ -71,8 +72,8 @@ public:
 	bool edited() const { return line->edited(); };
 	bool hasMarkedText() const { return line->hasMarkedText(); };
 	TQString markedText() const { return line->markedText(); };
-	virtual TQSize sizeHint() const;
-	virtual TQSize minimumSizeHint() const;
+	virtual TQSize tqsizeHint() const;
+	virtual TQSize tqminimumSizeHint() const;
 public slots:
 	virtual void setText(const TQString &text) { line->setText(text); };
 	void selectAll() { line->selectAll(); };
@@ -85,8 +86,8 @@ signals:
 	void textChanged(const TQString &);
 	void returnPressed();
 private:
-	QLabel		*lbl;
-	QLineEdit	*line;
-	QPushButton	*select;
+	TQLabel		*lbl;
+	TQLineEdit	*line;
+	TQPushButton	*select;
 };
 #endif
diff --git a/lilo-config/kde-qt-common/expert.cpp b/lilo-config/kde-qt-common/expert.cpp
index d74b6b6..d9e65e5 100644
--- a/lilo-config/kde-qt-common/expert.cpp
+++ b/lilo-config/kde-qt-common/expert.cpp
@@ -31,12 +31,12 @@
 #include <tqwhatsthis.h>
 #include <String.h>
 #include <strstream>
-Expert::Expert(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
+Expert::Expert(liloconf *l, TQWidget *tqparent, const char *name):TQWidget(tqparent, name)
 {
 	lilo=l;
-	layout=new TQHBoxLayout(this);
+	tqlayout=new TQHBoxLayout(this);
 	edit=new TQMultiLineEdit(this);
-	layout->addWidget(edit);
+	tqlayout->addWidget(edit);
 	connect(edit, TQT_SIGNAL(textChanged()), TQT_SIGNAL(configChanged()));
 	TQWhatsThis::add(edit, _("You can edit the lilo.conf file directly here. All changes you make here are automatically transferred to the graphical interface."));
 	update();
diff --git a/lilo-config/kde-qt-common/expert.h b/lilo-config/kde-qt-common/expert.h
index e2fec97..7b39530 100644
--- a/lilo-config/kde-qt-common/expert.h
+++ b/lilo-config/kde-qt-common/expert.h
@@ -32,11 +32,12 @@
 #include <tqwidget.h>
 #include <tqmultilineedit.h>
 #include <tqlayout.h>
-class Expert:public QWidget
+class Expert:public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	Expert(liloconf *l=0, TQWidget *parent=0, const char *name=0);
+	Expert(liloconf *l=0, TQWidget *tqparent=0, const char *name=0);
 	~Expert();
 	void setCfg(liloconf *l) { lilo=l; };
     void makeReadOnly();
@@ -47,7 +48,7 @@ signals:
 	void configChanged();
 private:
 	liloconf	*lilo;
-	QHBoxLayout	*layout;
-	QMultiLineEdit	*edit;
+	TQHBoxLayout	*tqlayout;
+	TQMultiLineEdit	*edit;
 };
 #endif
diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp
index 2040025..858ba9c 100644
--- a/lilo-config/kde-qt-common/general.cpp
+++ b/lilo-config/kde-qt-common/general.cpp
@@ -35,12 +35,12 @@
 
 #include <stdlib.h>
 
-General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
+General::General(liloconf *l, TQWidget *tqparent, const char *name):TQWidget(tqparent, name)
 {
 	lilo=l;
-	TQVBoxLayout *layout=new TQVBoxLayout(this);
-	layout->setMargin(SPACE_MARGIN);
-	layout->setSpacing(SPACE_INSIDE);
+	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
+	tqlayout->setMargin(SPACE_MARGIN);
+	tqlayout->setSpacing(SPACE_INSIDE);
 	TQHBox *drv=new TQHBox(this);
 	TQLabel *drive_lbl=new TQLabel(_("Install &boot record to drive/partition:"), drv);
 	drive=new TQComboBox(false, drv);
@@ -51,7 +51,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	for(StringList::const_iterator it=p.begin(); it!=p.end(); it++)
 		drive->insertItem((*it).cstr());
 	connect(drive, TQT_SIGNAL(activated(int)), TQT_SIGNAL(configChanged()));
-	layout->addWidget(drv);
+	tqlayout->addWidget(drv);
 	TQWhatsThis::add(drv, _("Select the drive or partition you want to install the LILO boot loader to here. Unless you intend to use other boot managers in addition to LILO, this should be the MBR (master boot record) of your boot drive.<br>In this case, you should probably select <i>/dev/hda</i> if your boot drive is an IDE drive or <i>/dev/sda</i> if your boot drive is SCSI."));
 
 	TQHBox *to=new TQHBox(this);
@@ -60,7 +60,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	timeout->setSuffix(_("/10 seconds"));
 	connect(timeout, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(configChanged()));
 	to_lbl->setBuddy(timeout);
-	layout->addWidget(to);
+	tqlayout->addWidget(to);
 	TQWhatsThis::add(to, _("LILO will wait the amount of time specified here before booting the kernel (or OS) marked as <i>default</i> in the <b>Images</b> tab."));
 
 	TQHBox *modes=new TQHBox(this);
@@ -70,7 +70,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	compact=new TQCheckBox(_("Use &compact mode"), modes);
 	connect(compact, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
 	TQWhatsThis::add(compact, _("Check this box if you want to use the compact mode.<br>The compact mode tries to merge read requests for adjacent sectors into a single read request. This reduces load time and keeps the boot map smaller, but will not work on all systems."));
-	layout->addWidget(modes);
+	tqlayout->addWidget(modes);
 
 	TQHBox *opts=new TQHBox(this);
 	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
@@ -80,7 +80,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	connect(restricted, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
 	connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
 	TQWhatsThis::add(restricted, _("If this box is checked, a password (entered below) is required only if any parameters are changed (i.e. the user can boot <i>linux</i>, but not <i>linux single</i> or <i>linux init=/bin/sh</i>).\nThis sets the <b>restricted</b> option in lilo.conf.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>."));
-	layout->addWidget(opts);
+	tqlayout->addWidget(opts);
 
 	TQHBox *pw=new TQHBox(this);
 	use_password=new TQCheckBox(_("Require &password:"), pw);
@@ -91,7 +91,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	password->setEchoMode(TQLineEdit::Password);
 	connect(password, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(configChanged()));
 	TQWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, you probably don't want to use your normal/root password here.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>."));
-	layout->addWidget(pw);
+	tqlayout->addWidget(pw);
 
 	TQHBox *vgab=new TQHBox(this);
 	TQLabel *vlbl=new TQLabel(_("&Default graphics mode on text console:"), vgab);
@@ -125,13 +125,13 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	vga->insertItem(_("VGA 1280x1024, 65536 colors (794)"));
 	vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
         connect( vga, TQT_SIGNAL(activated ( int )), TQT_SIGNAL(configChanged()));
-	layout->addWidget(vgab);
+	tqlayout->addWidget(vgab);
 
 	prompt=new TQCheckBox(_("Enter LILO &prompt automatically"), this);
 	TQWhatsThis::add(prompt, _("If this box is checked, LILO goes to the LILO prompt whether or not a key is pressed. If it is turned off, LILO boots the default operating system unless shift is pressed (in that case, it goes to the LILO prompt).<br>This sets the <i>prompt</i> option in lilo.conf."));
         connect(prompt, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
 
-	layout->addWidget(prompt);
+	tqlayout->addWidget(prompt);
 
 	update();
 }
@@ -168,7 +168,7 @@ void General::saveChanges()
 	} else {
 		TQString mode=vga->currentText();
 		if(mode!="ask") {
-			mode=mode.mid(mode.find('(')+1);
+			mode=mode.mid(mode.tqfind('(')+1);
 			mode=mode.left(mode.length()-1);
 		}
 		lilo->defaults.set("vga", mode.latin1());
@@ -201,7 +201,7 @@ void General::update()
 		vga->setCurrentItem(1);
 	else
 		for(int i=0; i<vga->count(); i++) {
-			if(vga->text(i).contains("(" + mode + ")")) {
+			if(vga->text(i).tqcontains("(" + mode + ")")) {
 				vga->setCurrentItem(i);
 				break;
 			}
diff --git a/lilo-config/kde-qt-common/general.h b/lilo-config/kde-qt-common/general.h
index d925ad1..01d090b 100644
--- a/lilo-config/kde-qt-common/general.h
+++ b/lilo-config/kde-qt-common/general.h
@@ -33,11 +33,12 @@
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
-class General:public QWidget
+class General:public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	General(liloconf *l=0, TQWidget *parent=0, const char *name=0);
+	General(liloconf *l=0, TQWidget *tqparent=0, const char *name=0);
     void makeReadOnly();
 signals:
 	void configChanged();
@@ -48,15 +49,15 @@ private slots:
 	void check_pw();
 private:
 	liloconf	*lilo;
-	QComboBox	*drive;
-	QSpinBox	*timeout;
-	QCheckBox	*linear;
-	QCheckBox	*compact;
-	QCheckBox	*lock;
-	QCheckBox	*restricted;
-	QCheckBox	*use_password;
-	QLineEdit	*password;
-	QComboBox	*vga;
-	QCheckBox	*prompt;
+	TQComboBox	*drive;
+	TQSpinBox	*timeout;
+	TQCheckBox	*linear;
+	TQCheckBox	*compact;
+	TQCheckBox	*lock;
+	TQCheckBox	*restricted;
+	TQCheckBox	*use_password;
+	TQLineEdit	*password;
+	TQComboBox	*vga;
+	TQCheckBox	*prompt;
 };
 #endif
diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp
index 9159d97..bdbdac4 100644
--- a/lilo-config/kde-qt-common/images.cpp
+++ b/lilo-config/kde-qt-common/images.cpp
@@ -36,26 +36,26 @@
 #include "kde/InputBox.h"
 #include "kde/Details.h"
 #else
-#include "qt/InputBox.h"
-#include "qt/Details.h"
+#include "tqt/InputBox.h"
+#include "tqt/Details.h"
 #endif
 
-Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
+Images::Images(liloconf *l, TQWidget *tqparent, const char *name):TQWidget(tqparent, name)
 {
-	current=""; previous=""; // Using TQString::null gives problems!
+	current=""; previous=""; // Using TQString() gives problems!
 	lilo=l;
-	layout=new TQHBoxLayout(this);
-	layout->setMargin(SPACE_MARGIN);
-	layout->setSpacing(SPACE_INSIDE);
+	tqlayout=new TQHBoxLayout(this);
+	tqlayout->setMargin(SPACE_MARGIN);
+	tqlayout->setSpacing(SPACE_INSIDE);
 	images=new TQListBox(this);
-	layout->addWidget(images, 1);
+	tqlayout->addWidget(images, 1);
 	connect(images, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(imageSelected(const TQString &)));
 	TQWhatsThis::add(images, _("This is the list of kernels and operating systems you can currently boot. Select which one you want to edit here."));
 
 	parameters=new TQVBox(this);
 	parameters->setMargin(SPACE_MARGIN);
 	parameters->setSpacing(SPACE_INSIDE);
-	layout->addWidget(parameters, 2);
+	tqlayout->addWidget(parameters, 2);
 	image=new EditWidget(_("&Kernel:"), "", true, parameters);
 	TQWhatsThis::add(image, _("Enter the filename of the kernel you want to boot here."));
 	connect(image, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged()));
@@ -75,7 +75,7 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 	actions=new TQVBox(this);
 	actions->setMargin(SPACE_MARGIN);
 	actions->setSpacing(SPACE_INSIDE);
-	layout->addWidget(actions);
+	tqlayout->addWidget(actions);
 	dflt=new TQPushButton(_("Set &Default"), actions);
 	TQWhatsThis::add(dflt, _("Boot this kernel/OS if the user doesn't make a different choice"));
 	connect(dflt, TQT_SIGNAL(clicked()), TQT_SLOT(dfltClicked()));
@@ -131,7 +131,7 @@ void Images::probeClicked() // SLOT
 void Images::dfltClicked() // SLOT
 {
 	if (images->currentItem() < 0) return;
-	lilo->setDefault(images->currentText().replace(TQRegExp(" (default)", true, true), "").latin1());
+	lilo->setDefault(images->currentText().tqreplace(TQRegExp(" (default)", true, true), "").latin1());
 	update();
 	emit configChanged();
 }
@@ -246,7 +246,7 @@ void Images::removeClicked() // SLOT
 
 TQString value(TQString const &s)
 {
-	TQString r=s.mid(s.find('=')+1).simplifyWhiteSpace();
+	TQString r=s.mid(s.tqfind('=')+1).simplifyWhiteSpace();
 	if(r.left(1)=="\"")
 		r=r.mid(1);
 	if(r.right(1)=="\"")
diff --git a/lilo-config/kde-qt-common/images.h b/lilo-config/kde-qt-common/images.h
index 6a089f4..8e8060d 100644
--- a/lilo-config/kde-qt-common/images.h
+++ b/lilo-config/kde-qt-common/images.h
@@ -36,11 +36,12 @@
 #include <tqlistbox.h>
 #include <tqvbox.h>
 #include "EditWidget.h"
-class Images:public QWidget
+class Images:public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	Images(liloconf *l=0, TQWidget *parent=0, const char *name=0);
+	Images(liloconf *l=0, TQWidget *tqparent=0, const char *name=0);
 	~Images();
 	void setCfg(liloconf *l) { lilo=l; };
     void makeReadOnly();
@@ -60,23 +61,23 @@ signals:
 	void configChanged();
 private:
 	liloconf	*lilo;
-	QString		previous;
-	QString		current;
-	QHBoxLayout	*layout;
-	QListBox	*images;
-	QVBox		*parameters;
+	TQString		previous;
+	TQString		current;
+	TQHBoxLayout	*tqlayout;
+	TQListBox	*images;
+	TQVBox		*parameters;
 	EditWidget	*image;
 	EditWidget	*label;
 	EditWidget	*root;
 	EditWidget	*initrd;
 	EditWidget	*append;
-	QVBox		*actions;
-	QPushButton	*dflt;
-	QPushButton	*details;
-	QPushButton	*probe;
-	QPushButton	*check;
-	QPushButton	*addKrnl;
-	QPushButton	*addOS;
-	QPushButton	*remove;
+	TQVBox		*actions;
+	TQPushButton	*dflt;
+	TQPushButton	*details;
+	TQPushButton	*probe;
+	TQPushButton	*check;
+	TQPushButton	*addKrnl;
+	TQPushButton	*addOS;
+	TQPushButton	*remove;
 };
 #endif
diff --git a/lilo-config/kde-qt-common/mainwidget.cpp b/lilo-config/kde-qt-common/mainwidget.cpp
index bb966f2..7ea74a1 100644
--- a/lilo-config/kde-qt-common/mainwidget.cpp
+++ b/lilo-config/kde-qt-common/mainwidget.cpp
@@ -29,8 +29,8 @@
 #include "mainwidget.moc"
 #include "ui.h"
 
-MainWidget::MainWidget(TQWidget *parent, const char *name)
-  : TQTabWidget(parent, name)
+MainWidget::MainWidget(TQWidget *tqparent, const char *name)
+  : TQTabWidget(tqparent, name)
 {
 	l=new liloconf();
 	general=new General(l, this);
diff --git a/lilo-config/kde-qt-common/mainwidget.h b/lilo-config/kde-qt-common/mainwidget.h
index 716931d..28cc37d 100644
--- a/lilo-config/kde-qt-common/mainwidget.h
+++ b/lilo-config/kde-qt-common/mainwidget.h
@@ -38,8 +38,9 @@
 
 class MainWidget: public TQTabWidget {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	MainWidget(TQWidget *parent, const char *name=0);
+	MainWidget(TQWidget *tqparent, const char *name=0);
 	void arrangeWidgets();
     void makeReadOnly();
 public slots:
diff --git a/lilo-config/kde-qt-common/ui.h b/lilo-config/kde-qt-common/ui.h
index 4454bde..9df62ae 100644
--- a/lilo-config/kde-qt-common/ui.h
+++ b/lilo-config/kde-qt-common/ui.h
@@ -39,14 +39,14 @@
 #include <kdialog.h>
 #include <kfiledialog.h>
 #define _(x) i18n(x)
-#define WarningYesNo(parent, caption, text) \
-	KMessageBox::warningYesNo(parent, text, caption)
-#define ErrorOK(parent, caption, text) \
-	KMessageBox::sorry(parent, text, caption)
-#define InformationOK(parent, text, caption, dontShowAgainName) \
-	KMessageBox::information(parent, text, caption, dontShowAgainName)
-#define CriticalErrorOK(parent, text, caption) \
-	KMessageBox::error(parent, text, caption)
+#define WarningYesNo(tqparent, caption, text) \
+	KMessageBox::warningYesNo(tqparent, text, caption)
+#define ErrorOK(tqparent, caption, text) \
+	KMessageBox::sorry(tqparent, text, caption)
+#define InformationOK(tqparent, text, caption, dontShowAgainName) \
+	KMessageBox::information(tqparent, text, caption, dontShowAgainName)
+#define CriticalErrorOK(tqparent, text, caption) \
+	KMessageBox::error(tqparent, text, caption)
 #define TabBar KTabCtl
 #define FileDlg KFileDialog
 #define SPACE_MARGIN KDialog::marginHint()
@@ -57,16 +57,16 @@
 #include <tqdialog.h>
 #include <tqfiledialog.h>
 #define _(x) tr(x)
-#define WarningYesNo(parent, caption, text) \
-	TQMessageBox::warning(parent, caption, text, TQMessageBox::Yes, TQMessageBox::No)
-#define ErrorOK(parent, caption, text) \
-	TQMessageBox::information(parent, caption, text)
-#define InformationOK(parent, text, caption, dontShowAgainName) \
-	TQMessageBox::information(parent, caption, text)
-#define CriticalErrorOK(parent, text, caption) \
-	TQMessageBox::critical(parent, caption, text)
-#define TabBar QTabWidget
-#define FileDlg QFileDialog
+#define WarningYesNo(tqparent, caption, text) \
+	TQMessageBox::warning(tqparent, caption, text, TQMessageBox::Yes, TQMessageBox::No)
+#define ErrorOK(tqparent, caption, text) \
+	TQMessageBox::information(tqparent, caption, text)
+#define InformationOK(tqparent, text, caption, dontShowAgainName) \
+	TQMessageBox::information(tqparent, caption, text)
+#define CriticalErrorOK(tqparent, text, caption) \
+	TQMessageBox::critical(tqparent, caption, text)
+#define TabBar TQTabWidget
+#define FileDlg TQFileDialog
 #define SPACE_MARGIN 5
 #define SPACE_INSIDE 5
 #endif