Trinity Qt initial conversion

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

11 files changed, 185 insertions, 185 deletions

diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp
index fad957a..292e016 100644
--- a/lilo-config/kde-qt-common/EditWidget.cpp
+++ b/lilo-config/kde-qt-common/EditWidget.cpp
@@ -28,20 +28,20 @@
 */
 #include "EditWidget.moc"
 #include "ui.h"
-EditWidget::EditWidget(QString const label, QString const text, bool isFile, QWidget *parent, const char *name, WFlags f, bool allowLines):QHBox(allowLines, parent, name, f)
+EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, TQWidget *parent, const char *name, WFlags f, bool allowLines):TQHBox(allowLines, parent, name, f)
 {
 	setMargin(SPACE_MARGIN);
 	setSpacing(SPACE_INSIDE);
-	lbl=new QLabel(label, this);
+	lbl=new TQLabel(label, this);
 	setStretchFactor(lbl, 0);
-	line=new QLineEdit(text, this);
+	line=new TQLineEdit(text, this);
 	setStretchFactor(line, 1);
-	connect(line, SIGNAL(textChanged(const QString &)), SIGNAL(textChanged(const QString &)));
-	connect(line, SIGNAL(returnPressed()), SIGNAL(returnPressed()));
+	connect(line, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(textChanged(const TQString &)));
+	connect(line, TQT_SIGNAL(returnPressed()), TQT_SIGNAL(returnPressed()));
 	lbl->setBuddy(line);
 	if(isFile) {
-		select=new QPushButton(_("Select..."), this);
-		connect(select, SIGNAL(clicked()), SLOT(selectFileClicked()));
+		select=new TQPushButton(_("Select..."), this);
+		connect(select, TQT_SIGNAL(clicked()), TQT_SLOT(selectFileClicked()));
 		select->resize(select->minimumSizeHint());
 		setStretchFactor(select, 0);
 	} else
@@ -49,11 +49,11 @@ EditWidget::EditWidget(QString const label, QString const text, bool isFile, QWi
 }
 void EditWidget::selectFileClicked()
 {
-    QString filename=FileDlg::getOpenFileName(QString::null, QString::null, this);
+    TQString filename=FileDlg::getOpenFileName(TQString::null, TQString::null, this);
     if(!filename.isEmpty())
 	line->setText(filename);
 }
-QSize EditWidget::sizeHint() const
+TQSize EditWidget::sizeHint() const
 {
 	int w=2*SPACE_MARGIN+lbl->sizeHint().width()+SPACE_INSIDE+line->sizeHint().width();
 	int h=lbl->sizeHint().height();
@@ -64,9 +64,9 @@ QSize EditWidget::sizeHint() const
 		if(h<select->sizeHint().height())
 			h=select->sizeHint().height();
 	}
-	return QSize(w, h);
+	return TQSize(w, h);
 }
-QSize EditWidget::minimumSizeHint() const
+TQSize EditWidget::minimumSizeHint() const
 {
 	int w=2*SPACE_MARGIN+lbl->minimumSizeHint().width()+SPACE_INSIDE+line->minimumSizeHint().width();
 	int h=lbl->minimumSizeHint().height();
@@ -77,5 +77,5 @@ QSize EditWidget::minimumSizeHint() const
 		if(h<select->minimumSizeHint().height())
 			h=select->minimumSizeHint().height();
 	}
-	return QSize(w, h);
+	return TQSize(w, h);
 }
diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h
index 515c65e..0a64750 100644
--- a/lilo-config/kde-qt-common/EditWidget.h
+++ b/lilo-config/kde-qt-common/EditWidget.h
@@ -28,32 +28,32 @@
 */
 #ifndef _EDITWIDGET_H_
 #define _EDITWIDGET_H_ 1
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
 class EditWidget:public QHBox
 {
 	Q_OBJECT
 public:
-	EditWidget(QString const label="", QString const text="", bool isFile=false, QWidget *parent=0, const char *name=0, WFlags f=0, bool allowLines=true);
-	void setLabel(QString const &label) { lbl->setText(label); };
-	QString text() const { return line->text(); };
-	QString displayText() const { return line->displayText(); };
+	EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *parent=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(); };
 	int maxLength() const { return line->maxLength(); };
 	virtual void setMaxLength(int l) { line->setMaxLength(l); };
 	virtual void setFrame(bool b) { line->setFrame(b); };
 	bool frame() const { return line->frame(); };
-	virtual void setEchoMode(QLineEdit::EchoMode e) { line->setEchoMode(e); };
-	QLineEdit::EchoMode echoMode() const { return line->echoMode(); };
+	virtual void setEchoMode(TQLineEdit::EchoMode e) { line->setEchoMode(e); };
+	TQLineEdit::EchoMode echoMode() const { return line->echoMode(); };
 	void setReadOnly(bool b) const { line->setReadOnly(b); };
 	bool isReadOnly() const { return line->isReadOnly(); };
-	virtual void setValidator(const QValidator *v) { line->setValidator(v); };
-	const QValidator *validator() const { return line->validator(); };
+	virtual void setValidator(const TQValidator *v) { line->setValidator(v); };
+	const TQValidator *validator() const { return line->validator(); };
 	virtual void setSelection(int s, int e) { line->setSelection(s, e); };
 	virtual void setCursorPosition(int p) { line->setCursorPosition(p); };
 	int cursorPosition() const { return line->cursorPosition(); };
-	bool validateAndSet(const QString &s, int a, int b, int c) { return line->validateAndSet(s, a, b, c); };
+	bool validateAndSet(const TQString &s, int a, int b, int c) { return line->validateAndSet(s, a, b, c); };
 	void cut() { line->cut(); };
 	void copy() const { line->copy(); };
 	void paste() { line->paste(); };
@@ -70,19 +70,19 @@ public:
 	void setEdited(bool e) { line->setEdited(e); };
 	bool edited() const { return line->edited(); };
 	bool hasMarkedText() const { return line->hasMarkedText(); };
-	QString markedText() const { return line->markedText(); };
-	virtual QSize sizeHint() const;
-	virtual QSize minimumSizeHint() const;
+	TQString markedText() const { return line->markedText(); };
+	virtual TQSize sizeHint() const;
+	virtual TQSize minimumSizeHint() const;
 public slots:
-	virtual void setText(const QString &text) { line->setText(text); };
+	virtual void setText(const TQString &text) { line->setText(text); };
 	void selectAll() { line->selectAll(); };
 	void deselect() { line->deselect(); };
 	void clearValidator() { line->clearValidator(); };
-	void insert(const QString &s) { line->insert(s); };
+	void insert(const TQString &s) { line->insert(s); };
 	void clear() { line->clear(); };
 	void selectFileClicked();
 signals:
-	void textChanged(const QString &);
+	void textChanged(const TQString &);
 	void returnPressed();
 private:
 	QLabel		*lbl;
diff --git a/lilo-config/kde-qt-common/expert.cpp b/lilo-config/kde-qt-common/expert.cpp
index dea58e9..d74b6b6 100644
--- a/lilo-config/kde-qt-common/expert.cpp
+++ b/lilo-config/kde-qt-common/expert.cpp
@@ -28,17 +28,17 @@
 */
 #include "expert.moc"
 #include <ui.h>
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <String.h>
 #include <strstream>
-Expert::Expert(liloconf *l, QWidget *parent, const char *name):QWidget(parent, name)
+Expert::Expert(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
-	layout=new QHBoxLayout(this);
-	edit=new QMultiLineEdit(this);
+	layout=new TQHBoxLayout(this);
+	edit=new TQMultiLineEdit(this);
 	layout->addWidget(edit);
-	connect(edit, SIGNAL(textChanged()), SIGNAL(configChanged()));
-	QWhatsThis::add(edit, _("You can edit the lilo.conf file directly here. All changes you make here are automatically transferred to the graphical interface."));
+	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();
 }
 Expert::~Expert()
diff --git a/lilo-config/kde-qt-common/expert.h b/lilo-config/kde-qt-common/expert.h
index d9d6afb..e2fec97 100644
--- a/lilo-config/kde-qt-common/expert.h
+++ b/lilo-config/kde-qt-common/expert.h
@@ -29,14 +29,14 @@
 #ifndef _EXPERT_H_
 #define _EXPERT_H_ 1
 #include <lilo.h>
-#include <qwidget.h>
-#include <qmultilineedit.h>
-#include <qlayout.h>
+#include <tqwidget.h>
+#include <tqmultilineedit.h>
+#include <tqlayout.h>
 class Expert:public QWidget
 {
 	Q_OBJECT
 public:
-	Expert(liloconf *l=0, QWidget *parent=0, const char *name=0);
+	Expert(liloconf *l=0, TQWidget *parent=0, const char *name=0);
 	~Expert();
 	void setCfg(liloconf *l) { lilo=l; };
     void makeReadOnly();
diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp
index 7944409..2040025 100644
--- a/lilo-config/kde-qt-common/general.cpp
+++ b/lilo-config/kde-qt-common/general.cpp
@@ -29,75 +29,75 @@
 #include "general.moc"
 #include "EditWidget.h"
 #include <Disks.h>
-#include <qlayout.h>
+#include <tqlayout.h>
 #include <ui.h>
-#include <qwhatsthis.h>
+#include <tqwhatsthis.h>
 
 #include <stdlib.h>
 
-General::General(liloconf *l, QWidget *parent, const char *name):QWidget(parent, name)
+General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
-	QVBoxLayout *layout=new QVBoxLayout(this);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
 	layout->setMargin(SPACE_MARGIN);
 	layout->setSpacing(SPACE_INSIDE);
-	QHBox *drv=new QHBox(this);
-	QLabel *drive_lbl=new QLabel(_("Install &boot record to drive/partition:"), drv);
-	drive=new QComboBox(false, drv);
+	TQHBox *drv=new TQHBox(this);
+	TQLabel *drive_lbl=new TQLabel(_("Install &boot record to drive/partition:"), drv);
+	drive=new TQComboBox(false, drv);
 	drive_lbl->setBuddy(drive);
 	StringList p=ptable::disklist();
 	p+=ptable::partlist();
 	p.sort();
 	for(StringList::const_iterator it=p.begin(); it!=p.end(); it++)
 		drive->insertItem((*it).cstr());
-	connect(drive, SIGNAL(activated(int)), SIGNAL(configChanged()));
+	connect(drive, TQT_SIGNAL(activated(int)), TQT_SIGNAL(configChanged()));
 	layout->addWidget(drv);
-	QWhatsThis::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."));
+	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."));
 
-	QHBox *to=new QHBox(this);
-	QLabel *to_lbl=new QLabel(_("Boot the default kernel/OS &after:"), to);
-	timeout=new QSpinBox(0, 1000000, 1, to);
+	TQHBox *to=new TQHBox(this);
+	TQLabel *to_lbl=new TQLabel(_("Boot the default kernel/OS &after:"), to);
+	timeout=new TQSpinBox(0, 1000000, 1, to);
 	timeout->setSuffix(_("/10 seconds"));
-	connect(timeout, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
+	connect(timeout, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(configChanged()));
 	to_lbl->setBuddy(timeout);
 	layout->addWidget(to);
-	QWhatsThis::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."));
+	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."));
 
-	QHBox *modes=new QHBox(this);
-	linear=new QCheckBox(_("Use &linear mode"), modes);
-	connect(linear, SIGNAL(clicked()), SIGNAL(configChanged()));
-	QWhatsThis::add(linear, _("Check this box if you want to use the linear mode.<br>Linear mode tells the boot loader the location of kernels in linear addressing rather than sector/head/cylinder.<br>linear mode is required for some SCSI drives, and shouldn't hurt unless you're planning to create a boot disk to be used with a different computer.<br>See the lilo.conf man page for details."));
-	compact=new QCheckBox(_("Use &compact mode"), modes);
-	connect(compact, SIGNAL(clicked()), SIGNAL(configChanged()));
-	QWhatsThis::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."));
+	TQHBox *modes=new TQHBox(this);
+	linear=new TQCheckBox(_("Use &linear mode"), modes);
+	connect(linear, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
+	TQWhatsThis::add(linear, _("Check this box if you want to use the linear mode.<br>Linear mode tells the boot loader the location of kernels in linear addressing rather than sector/head/cylinder.<br>linear mode is required for some SCSI drives, and shouldn't hurt unless you're planning to create a boot disk to be used with a different computer.<br>See the lilo.conf man page for details."));
+	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);
 
-	QHBox *opts=new QHBox(this);
-	lock=new QCheckBox(_("&Record boot command lines for defaults"), opts);
-	connect(lock, SIGNAL(clicked()), SIGNAL(configChanged()));
-	QWhatsThis::add(lock, "<qt>"+_("Checking this box enables automatic recording of boot command lines as the defaults for the following boots. This way, lilo \"locks\" on a choice until it is manually overridden.\nThis sets the <b>lock</b> option in lilo.conf."));
-	restricted=new QCheckBox(_("R&estrict parameters"), opts);
-	connect(restricted, SIGNAL(clicked()), SIGNAL(configChanged()));
-	connect(restricted, SIGNAL(clicked()), SLOT(check_pw()));
-	QWhatsThis::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>."));
+	TQHBox *opts=new TQHBox(this);
+	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
+	connect(lock, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
+	TQWhatsThis::add(lock, "<qt>"+_("Checking this box enables automatic recording of boot command lines as the defaults for the following boots. This way, lilo \"locks\" on a choice until it is manually overridden.\nThis sets the <b>lock</b> option in lilo.conf."));
+	restricted=new TQCheckBox(_("R&estrict parameters"), opts);
+	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);
 
-	QHBox *pw=new QHBox(this);
-	use_password=new QCheckBox(_("Require &password:"), pw);
-	connect(use_password, SIGNAL(clicked()), SIGNAL(configChanged()));
-	connect(use_password, SIGNAL(clicked()), SLOT(check_pw()));
-	password=new QLineEdit(pw);
+	TQHBox *pw=new TQHBox(this);
+	use_password=new TQCheckBox(_("Require &password:"), pw);
+	connect(use_password, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
+	connect(use_password, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
+	password=new TQLineEdit(pw);
 	password->setMaxLength(15);
-	password->setEchoMode(QLineEdit::Password);
-	connect(password, SIGNAL(textChanged(const QString &)), SIGNAL(configChanged()));
-	QWhatsThis::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>."));
+	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);
 
-	QHBox *vgab=new QHBox(this);
-	QLabel *vlbl=new QLabel(_("&Default graphics mode on text console:"), vgab);
-	vga=new QComboBox(false, vgab);
+	TQHBox *vgab=new TQHBox(this);
+	TQLabel *vlbl=new TQLabel(_("&Default graphics mode on text console:"), vgab);
+	vga=new TQComboBox(false, vgab);
 	vlbl->setBuddy(vga);
-	QWhatsThis::add(vgab, _("You can select the default graphics mode here.<br>If you intend to use a VGA graphics mode, you must compile the kernel with support for framebuffer devices. The <i>ask</i> setting brings up a prompt at boot time.<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>."));
+	TQWhatsThis::add(vgab, _("You can select the default graphics mode here.<br>If you intend to use a VGA graphics mode, you must compile the kernel with support for framebuffer devices. The <i>ask</i> setting brings up a prompt at boot time.<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>."));
 	vga->insertItem(_("default"));
 	vga->insertItem(_("ask"));
 	vga->insertItem(_("text 80x25 (0)"));
@@ -124,12 +124,12 @@ General::General(liloconf *l, QWidget *parent, const char *name):QWidget(parent,
 	vga->insertItem(_("VGA 1280x1024, 32767 colors (793)"));
 	vga->insertItem(_("VGA 1280x1024, 65536 colors (794)"));
 	vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
-        connect( vga, SIGNAL(activated ( int )), SIGNAL(configChanged()));
+        connect( vga, TQT_SIGNAL(activated ( int )), TQT_SIGNAL(configChanged()));
 	layout->addWidget(vgab);
 
-	prompt=new QCheckBox(_("Enter LILO &prompt automatically"), this);
-	QWhatsThis::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, SIGNAL(clicked()), SIGNAL(configChanged()));
+	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);
 
@@ -137,9 +137,9 @@ General::General(liloconf *l, QWidget *parent, const char *name):QWidget(parent,
 }
 void General::saveChanges()
 {
-	QString to;
+	TQString to;
 	to.sprintf("%u", timeout->value());
-        QString boot = drive->currentText();
+        TQString boot = drive->currentText();
 	lilo->defaults.set("boot", boot.isEmpty() ? "" : boot.latin1());
 	lilo->defaults.set("timeout", to.latin1());
 	if(compact->isChecked() && lilo->defaults.grep("^[ \t]*compact[ \t]*$").empty())
@@ -166,7 +166,7 @@ void General::saveChanges()
 		if(!lilo->defaults.grep("[ \t]*vga[ \t]*=").empty())
 			lilo->defaults.remove(lilo->defaults.grep("[ \t]*vga[ \t]*="));
 	} else {
-		QString mode=vga->currentText();
+		TQString mode=vga->currentText();
 		if(mode!="ask") {
 			mode=mode.mid(mode.find('(')+1);
 			mode=mode.left(mode.length()-1);
@@ -180,7 +180,7 @@ void General::saveChanges()
 }
 void General::update()
 {
-	QString boot=lilo->defaults.get("boot").cstr();
+	TQString boot=lilo->defaults.get("boot").cstr();
 	for(int i=0; i<drive->count(); i++)
 		if(drive->text(i)==boot)
 			drive->setCurrentItem(i);
@@ -194,7 +194,7 @@ void General::update()
 	if(!pw.empty())
 		password->setText(lilo->defaults.get("password").cstr());
 	check_pw();
-	QString mode=lilo->defaults.get("vga", "").cstr();
+	TQString mode=lilo->defaults.get("vga", "").cstr();
 	if(mode.isEmpty())
 		vga->setCurrentItem(0);
 	else if(mode=="ask")
diff --git a/lilo-config/kde-qt-common/general.h b/lilo-config/kde-qt-common/general.h
index 7e88a90..d925ad1 100644
--- a/lilo-config/kde-qt-common/general.h
+++ b/lilo-config/kde-qt-common/general.h
@@ -29,15 +29,15 @@
 #ifndef _GENERAL_H_
 #define _GENERAL_H_ 1
 #include <lilo.h>
-#include <qwidget.h>
-#include <qcombobox.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
+#include <tqwidget.h>
+#include <tqcombobox.h>
+#include <tqspinbox.h>
+#include <tqcheckbox.h>
 class General:public QWidget
 {
 	Q_OBJECT
 public:
-	General(liloconf *l=0, QWidget *parent=0, const char *name=0);
+	General(liloconf *l=0, TQWidget *parent=0, const char *name=0);
     void makeReadOnly();
 signals:
 	void configChanged();
diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp
index 98dd1cb..9159d97 100644
--- a/lilo-config/kde-qt-common/images.cpp
+++ b/lilo-config/kde-qt-common/images.cpp
@@ -28,9 +28,9 @@
 */
 #include "images.moc"
 #include <ui.h>
-#include <qwhatsthis.h>
-#include <qregexp.h>
-#include <qstring.h>
+#include <tqwhatsthis.h>
+#include <tqregexp.h>
+#include <tqstring.h>
 
 #ifdef USE_KDE
 #include "kde/InputBox.h"
@@ -40,63 +40,63 @@
 #include "qt/Details.h"
 #endif
 
-Images::Images(liloconf *l, QWidget *parent, const char *name):QWidget(parent, name)
+Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
-	current=""; previous=""; // Using QString::null gives problems!
+	current=""; previous=""; // Using TQString::null gives problems!
 	lilo=l;
-	layout=new QHBoxLayout(this);
+	layout=new TQHBoxLayout(this);
 	layout->setMargin(SPACE_MARGIN);
 	layout->setSpacing(SPACE_INSIDE);
-	images=new QListBox(this);
+	images=new TQListBox(this);
 	layout->addWidget(images, 1);
-	connect(images, SIGNAL(highlighted(const QString &)), SLOT(imageSelected(const QString &)));
-	QWhatsThis::add(images, _("This is the list of kernels and operating systems you can currently boot. Select which one you want to edit here."));
+	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 QVBox(this);
+	parameters=new TQVBox(this);
 	parameters->setMargin(SPACE_MARGIN);
 	parameters->setSpacing(SPACE_INSIDE);
 	layout->addWidget(parameters, 2);
 	image=new EditWidget(_("&Kernel:"), "", true, parameters);
-	QWhatsThis::add(image, _("Enter the filename of the kernel you want to boot here."));
-	connect(image, SIGNAL(textChanged(const QString &)), this, SIGNAL(configChanged()));
+	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()));
 	label=new EditWidget(_("&Label:"), "", false, parameters);
-	QWhatsThis::add(label, _("Enter the label (name) of the kernel you want to boot here."));
-	connect(label, SIGNAL(textChanged(const QString &)), this, SIGNAL(configChanged()));
+	TQWhatsThis::add(label, _("Enter the label (name) of the kernel you want to boot here."));
+	connect(label, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged()));
 	root=new EditWidget(_("&Root filesystem:"), "", true, parameters);
-	QWhatsThis::add(root, _("Enter the root filesystem (i.e. the partition that will be mounted as / at boot time) for the kernel you want to boot here."));
-	connect(root, SIGNAL(textChanged(const QString &)), this, SIGNAL(configChanged()));
+	TQWhatsThis::add(root, _("Enter the root filesystem (i.e. the partition that will be mounted as / at boot time) for the kernel you want to boot here."));
+	connect(root, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged()));
 	initrd=new EditWidget(_("&Initial ramdisk:"), "", true, parameters);
-	QWhatsThis::add(initrd, _("If you want to use an initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field blank if you don't intend to use an initial ramdisk for this kernel."));
-	connect(initrd, SIGNAL(textChanged(const QString &)), this, SIGNAL(configChanged()));
+	TQWhatsThis::add(initrd, _("If you want to use an initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field blank if you don't intend to use an initial ramdisk for this kernel."));
+	connect(initrd, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged()));
 	append=new EditWidget(_("E&xtra parameters:"), "", false, parameters);
-	QWhatsThis::add(append, _("Enter any extra parameters you wish to pass to the kernel here. Usually, this can be left blank.<br>This sets the <i>append</i> option in lilo.conf."));
-	connect(append, SIGNAL(textChanged(const QString &)), this, SIGNAL(configChanged()));
+	TQWhatsThis::add(append, _("Enter any extra parameters you wish to pass to the kernel here. Usually, this can be left blank.<br>This sets the <i>append</i> option in lilo.conf."));
+	connect(append, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged()));
 
-	actions=new QVBox(this);
+	actions=new TQVBox(this);
 	actions->setMargin(SPACE_MARGIN);
 	actions->setSpacing(SPACE_INSIDE);
 	layout->addWidget(actions);
-	dflt=new QPushButton(_("Set &Default"), actions);
-	QWhatsThis::add(dflt, _("Boot this kernel/OS if the user doesn't make a different choice"));
-	connect(dflt, SIGNAL(clicked()), SLOT(dfltClicked()));
-	details=new QPushButton(_("De&tails"), actions);
-	QWhatsThis::add(details, _("This button brings up a dialog box with further, less commonly used, options."));
-	connect(details, SIGNAL(clicked()), SLOT(detailsClicked()));
-	probe=new QPushButton(_("&Probe"), actions);
-	connect(probe, SIGNAL(clicked()), SLOT(probeClicked()));
-	QWhatsThis::add(probe, _("Automatically generate a (hopefully) reasonable lilo.conf for your system"));
-	check=new QPushButton(_("&Check Configuration"), actions);
-	connect(check, SIGNAL(clicked()), SLOT(checkClicked()));
-	QWhatsThis::add(check, _("Run LILO in test mode to see if the configuration is ok"));
-	addKrnl=new QPushButton(_("Add &Kernel..."), actions);
-	connect(addKrnl, SIGNAL(clicked()), SLOT(addKrnlClicked()));
-	QWhatsThis::add(addKrnl, _("Add a new Linux kernel to the boot menu"));
-	addOS=new QPushButton(_("Add Other &OS..."), actions);
-	connect(addOS, SIGNAL(clicked()), SLOT(addOSClicked()));
-	QWhatsThis::add(addOS, _("Add a non-Linux OS to the boot menu"));
-	remove=new QPushButton(_("&Remove Entry"), actions);
-	connect(remove, SIGNAL(clicked()), SLOT(removeClicked()));
-	QWhatsThis::add(remove, _("Remove entry from the boot menu"));
+	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()));
+	details=new TQPushButton(_("De&tails"), actions);
+	TQWhatsThis::add(details, _("This button brings up a dialog box with further, less commonly used, options."));
+	connect(details, TQT_SIGNAL(clicked()), TQT_SLOT(detailsClicked()));
+	probe=new TQPushButton(_("&Probe"), actions);
+	connect(probe, TQT_SIGNAL(clicked()), TQT_SLOT(probeClicked()));
+	TQWhatsThis::add(probe, _("Automatically generate a (hopefully) reasonable lilo.conf for your system"));
+	check=new TQPushButton(_("&Check Configuration"), actions);
+	connect(check, TQT_SIGNAL(clicked()), TQT_SLOT(checkClicked()));
+	TQWhatsThis::add(check, _("Run LILO in test mode to see if the configuration is ok"));
+	addKrnl=new TQPushButton(_("Add &Kernel..."), actions);
+	connect(addKrnl, TQT_SIGNAL(clicked()), TQT_SLOT(addKrnlClicked()));
+	TQWhatsThis::add(addKrnl, _("Add a new Linux kernel to the boot menu"));
+	addOS=new TQPushButton(_("Add Other &OS..."), actions);
+	connect(addOS, TQT_SIGNAL(clicked()), TQT_SLOT(addOSClicked()));
+	TQWhatsThis::add(addOS, _("Add a non-Linux OS to the boot menu"));
+	remove=new TQPushButton(_("&Remove Entry"), actions);
+	connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeClicked()));
+	TQWhatsThis::add(remove, _("Remove entry from the boot menu"));
 	update();
 }
 Images::~Images()
@@ -131,7 +131,7 @@ void Images::probeClicked() // SLOT
 void Images::dfltClicked() // SLOT
 {
 	if (images->currentItem() < 0) return;
-	lilo->setDefault(images->currentText().replace(QRegExp(" (default)", true, true), "").latin1());
+	lilo->setDefault(images->currentText().replace(TQRegExp(" (default)", true, true), "").latin1());
 	update();
 	emit configChanged();
 }
@@ -139,7 +139,7 @@ void Images::detailsClicked() // SLOT
 {
 	liloimage *l=lilo->images[current.latin1()];
 	Details *d = new Details(l, this);
-	if(d->exec()==QDialog::Accepted) {
+	if(d->exec()==TQDialog::Accepted) {
 		String tmp;
 		tmp=l->grep("^[ \t]*read-only[ \t]*");
 		if(d->isReadOnly() && tmp.empty())
@@ -172,7 +172,7 @@ void Images::detailsClicked() // SLOT
 }
 void Images::checkClicked() // SLOT
 {
-	QString LiloOut=lilo->liloOut().cstr();
+	TQString LiloOut=lilo->liloOut().cstr();
 	if(lilo->isOk()) {
 		LiloOut=_("Configuration ok. LILO said:\n")+LiloOut;
 		InformationOK(this, LiloOut, _("Configuration OK"), "lilo-config.confOK");
@@ -193,9 +193,9 @@ void Images::addKrnlClicked() // SLOT
 	e.insert(e.end(), l2);
 	e.insert(e.end(), l3);
 	InputBox *label=new InputBox(e, this);
-	if(label->exec()==QDialog::Accepted) {
-		QStringList s=label->text();
-		QStringList::Iterator it=s.begin();
+	if(label->exec()==TQDialog::Accepted) {
+		TQStringList s=label->text();
+		TQStringList::Iterator it=s.begin();
 		String kernel=(*it).latin1();
 		it++;
 		String label=(*it).latin1();
@@ -217,9 +217,9 @@ void Images::addOSClicked() // SLOT
 	e.insert(e.end(), l0);
 	e.insert(e.end(), l1);
 	InputBox *label=new InputBox(e, this);
-	if(label->exec()==QDialog::Accepted) {
-		QStringList s=label->text();
-		QStringList::Iterator it=s.begin();
+	if(label->exec()==TQDialog::Accepted) {
+		TQStringList s=label->text();
+		TQStringList::Iterator it=s.begin();
 		String disk=(*it).latin1();
 		it++;
 		String label=(*it).latin1();
@@ -233,7 +233,7 @@ void Images::removeClicked() // SLOT
 {
 	if(images->currentItem()==-1)
 		return;
-	QString s=images->currentText();
+	TQString s=images->currentText();
 	if(s.right(10)==" (default)")
 		s=s.left(s.length()-10);
         if (s.isNull())
@@ -244,9 +244,9 @@ void Images::removeClicked() // SLOT
 	emit configChanged();
 }
 
-QString value(QString const &s)
+TQString value(TQString const &s)
 {
-	QString r=s.mid(s.find('=')+1).simplifyWhiteSpace();
+	TQString r=s.mid(s.find('=')+1).simplifyWhiteSpace();
 	if(r.left(1)=="\"")
 		r=r.mid(1);
 	if(r.right(1)=="\"")
@@ -256,11 +256,11 @@ QString value(QString const &s)
 	return r;
 }
 
-void Images::imageSelected(const QString &i) // SLOT
+void Images::imageSelected(const TQString &i) // SLOT
 {
 	bool blocked = signalsBlocked();
 	blockSignals(true);
-	QString s=i;
+	TQString s=i;
 	if(s.right(10)==" (default)")
 		s=s.left(s.length()-10);
 	if(previous!=s && !previous.isEmpty()) {
@@ -274,7 +274,7 @@ void Images::imageSelected(const QString &i) // SLOT
 	current=s;
 	liloimage *l=lilo->images[s.latin1()];
 	if(l) {
-		QString img=value(l->grep("^[ \t]*(image|other)[ \t]*=").cstr());
+		TQString img=value(l->grep("^[ \t]*(image|other)[ \t]*=").cstr());
 		image->setText(img);
 		label->setText(s);
 		if(l->isLinux()) {
diff --git a/lilo-config/kde-qt-common/images.h b/lilo-config/kde-qt-common/images.h
index 62c6124..6a089f4 100644
--- a/lilo-config/kde-qt-common/images.h
+++ b/lilo-config/kde-qt-common/images.h
@@ -29,18 +29,18 @@
 #ifndef _IMAGES_H_
 #define _IMAGES_H_ 1
 #include <lilo.h>
-#include <qwidget.h>
-#include <qmultilineedit.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qlistbox.h>
-#include <qvbox.h>
+#include <tqwidget.h>
+#include <tqmultilineedit.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqlistbox.h>
+#include <tqvbox.h>
 #include "EditWidget.h"
 class Images:public QWidget
 {
 	Q_OBJECT
 public:
-	Images(liloconf *l=0, QWidget *parent=0, const char *name=0);
+	Images(liloconf *l=0, TQWidget *parent=0, const char *name=0);
 	~Images();
 	void setCfg(liloconf *l) { lilo=l; };
     void makeReadOnly();
@@ -55,7 +55,7 @@ private slots:
 	void addKrnlClicked();
 	void addOSClicked();
 	void removeClicked();
-	void imageSelected(const QString &i);
+	void imageSelected(const TQString &i);
 signals:
 	void configChanged();
 private:
diff --git a/lilo-config/kde-qt-common/mainwidget.cpp b/lilo-config/kde-qt-common/mainwidget.cpp
index 6d76dc5..bb966f2 100644
--- a/lilo-config/kde-qt-common/mainwidget.cpp
+++ b/lilo-config/kde-qt-common/mainwidget.cpp
@@ -29,21 +29,21 @@
 #include "mainwidget.moc"
 #include "ui.h"
 
-MainWidget::MainWidget(QWidget *parent, const char *name)
-  : QTabWidget(parent, name)
+MainWidget::MainWidget(TQWidget *parent, const char *name)
+  : TQTabWidget(parent, name)
 {
 	l=new liloconf();
 	general=new General(l, this);
-	connect(general, SIGNAL(configChanged()), SIGNAL(configChanged()));
+	connect(general, TQT_SIGNAL(configChanged()), TQT_SIGNAL(configChanged()));
 	images=new Images(l, this);
-	connect(images, SIGNAL(configChanged()), SIGNAL(configChanged()));
+	connect(images, TQT_SIGNAL(configChanged()), TQT_SIGNAL(configChanged()));
 	expert=new Expert(l, this);
-	connect(expert, SIGNAL(configChanged()), SIGNAL(configChanged()));
-	connect(expert, SIGNAL(configChanged()), images, SLOT(update()));
+	connect(expert, TQT_SIGNAL(configChanged()), TQT_SIGNAL(configChanged()));
+	connect(expert, TQT_SIGNAL(configChanged()), images, TQT_SLOT(update()));
 	addTab(general, _("&General Options"));
 	addTab(images, _("&Operating Systems"));
 	addTab(expert, _("&Expert"));
-	connect(this, SIGNAL(selected(const QString &)), SLOT(tabChanged(const QString &)));
+	connect(this, TQT_SIGNAL(selected(const TQString &)), TQT_SLOT(tabChanged(const TQString &)));
 	load();
 	arrangeWidgets();
 }
@@ -89,7 +89,7 @@ void MainWidget::reset()
 void MainWidget::arrangeWidgets()
 {
 }
-void MainWidget::tabChanged(QString const &lbl) // SLOT
+void MainWidget::tabChanged(TQString const &lbl) // SLOT
 {
 	if(previous==_("&Expert"))
 		expert->saveChanges();
diff --git a/lilo-config/kde-qt-common/mainwidget.h b/lilo-config/kde-qt-common/mainwidget.h
index 46696e8..716931d 100644
--- a/lilo-config/kde-qt-common/mainwidget.h
+++ b/lilo-config/kde-qt-common/mainwidget.h
@@ -28,18 +28,18 @@
 */
 #ifndef _MAINWIDGET_H_
 #define _MAINWIDGET_H_ 1
-#include <qwidget.h>
-#include <qlistbox.h>
-#include <qtabwidget.h>
-#include <qevent.h>
+#include <tqwidget.h>
+#include <tqlistbox.h>
+#include <tqtabwidget.h>
+#include <tqevent.h>
 #include "general.h"
 #include "images.h"
 #include "expert.h"
 
-class MainWidget: public QTabWidget {
+class MainWidget: public TQTabWidget {
 	Q_OBJECT
 public:
-	MainWidget(QWidget *parent, const char *name=0);
+	MainWidget(TQWidget *parent, const char *name=0);
 	void arrangeWidgets();
     void makeReadOnly();
 public slots:
@@ -47,11 +47,11 @@ public slots:
 	void save();
 	void reset();
 	void defaults();
-	void tabChanged(const QString &lbl);
+	void tabChanged(const TQString &lbl);
 signals:
 	void configChanged();
 private:
-	QString previous;
+	TQString previous;
 	General *general;
 	Images	*images;
 	Expert	*expert;
diff --git a/lilo-config/kde-qt-common/ui.h b/lilo-config/kde-qt-common/ui.h
index e672847..4454bde 100644
--- a/lilo-config/kde-qt-common/ui.h
+++ b/lilo-config/kde-qt-common/ui.h
@@ -52,19 +52,19 @@
 #define SPACE_MARGIN KDialog::marginHint()
 #define SPACE_INSIDE KDialog::spacingHint()
 #else
-#include <qmessagebox.h>
-#include <qtabwidget.h>
-#include <qdialog.h>
-#include <qfiledialog.h>
+#include <tqmessagebox.h>
+#include <tqtabwidget.h>
+#include <tqdialog.h>
+#include <tqfiledialog.h>
 #define _(x) tr(x)
 #define WarningYesNo(parent, caption, text) \
-	QMessageBox::warning(parent, caption, text, QMessageBox::Yes, QMessageBox::No)
+	TQMessageBox::warning(parent, caption, text, TQMessageBox::Yes, TQMessageBox::No)
 #define ErrorOK(parent, caption, text) \
-	QMessageBox::information(parent, caption, text)
+	TQMessageBox::information(parent, caption, text)
 #define InformationOK(parent, text, caption, dontShowAgainName) \
-	QMessageBox::information(parent, caption, text)
+	TQMessageBox::information(parent, caption, text)
 #define CriticalErrorOK(parent, text, caption) \
-	QMessageBox::critical(parent, caption, text)
+	TQMessageBox::critical(parent, caption, text)
 #define TabBar QTabWidget
 #define FileDlg QFileDialog
 #define SPACE_MARGIN 5