TQt4 port kdeadmin

This enables compilation under both Qt3 and Qt4


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

6 files changed, 41 insertions, 38 deletions

diff --git a/lilo-config/qt/Details.cpp b/lilo-config/qt/Details.cpp
index 944ba0d..6b4e50a 100644
--- a/lilo-config/qt/Details.cpp
+++ b/lilo-config/qt/Details.cpp
@@ -32,13 +32,13 @@
 #include <tqlabel.h>
 #include <ui.h>
 
-Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):TQDialog(parent, name, true, f)
+Details::Details(liloimage *lilo, TQWidget *tqparent, const char *name, WFlags f):TQDialog(tqparent, name, true, f)
 {
 	l=lilo;
 
-	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 *vgab=new TQHBox(this);
 	TQLabel *vlbl=new TQLabel(_("&Graphics mode on text console:"), vgab);
@@ -71,15 +71,15 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	vga->insertItem(_("VGA 1280x1024, 32767 colors (793)"));
 	vga->insertItem(_("VGA 1280x1024, 65536 colors (794)"));
 	vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
-	layout->addWidget(vgab);
+	tqlayout->addWidget(vgab);
 	
 	readonly=new TQCheckBox(_("Mount root filesystem &read-only"), this);
 	TQWhatsThis::add(readonly, _("Mount the root filesystem for this kernel read-only. Since the init scripts normally take care of remounting the root filesystem in read-write mode after running some checks, this should always be turned on.<br>Don't turn this off unless you know what you're doing."));
-	layout->addWidget(readonly);
+	tqlayout->addWidget(readonly);
 
 	unsafe=new TQCheckBox(_("Do not check &partition table"), this);
 	TQWhatsThis::add(unsafe, _("This turns off some sanity checks while writing the configuration. This shouldn't be used under \"normal\" circumstances, but it's useful, for example, for installing the possibility to boot from a floppy disk without having a floppy in the drive every time you run lilo.<br>This sets the <i>unsafe</i> keyword in lilo.conf."));
-	layout->addWidget(unsafe);
+	tqlayout->addWidget(unsafe);
 
 	TQHBox *opts=new TQHBox(this);
 	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
@@ -87,7 +87,7 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	restricted=new TQCheckBox(_("R&estrict parameters"), opts);
 	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."));
-	layout->addWidget(opts);
+	tqlayout->addWidget(opts);
 
 	TQHBox *pw=new TQHBox(this);
 	use_password=new TQCheckBox(_("Require &password:"), pw);
@@ -96,12 +96,12 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	password->setMaxLength(15);
 	password->setEchoMode(TQLineEdit::Password);
 	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."));
-	layout->addWidget(pw);
+	tqlayout->addWidget(pw);
 
 	TQHBox *btns=new TQHBox(this);
 	ok=new TQPushButton(_("&OK"), btns);
 	cancel=new TQPushButton(_("&Cancel"), btns);
-	layout->addWidget(btns);
+	tqlayout->addWidget(btns);
 	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
 
@@ -113,7 +113,7 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 			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;
 				}
@@ -137,7 +137,7 @@ TQString Details::vgaMode() const
 	if(s=="default")
 		return "";
 	else if(s!="ask") {
-		s=s.mid(s.find('(')+1);
+		s=s.mid(s.tqfind('(')+1);
 		s=s.left(s.length()-1);
 	}
 	return s;
diff --git a/lilo-config/qt/Details.h b/lilo-config/qt/Details.h
index c7c7f98..079a83a 100644
--- a/lilo-config/qt/Details.h
+++ b/lilo-config/qt/Details.h
@@ -32,11 +32,12 @@
 #include <tqcombobox.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-class Details:public QDialog
+class Details:public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	Details(liloimage *lilo, TQWidget *parent=0, const char *name=0, WFlags f=0);
+	Details(liloimage *lilo, TQWidget *tqparent=0, const char *name=0, WFlags f=0);
 	bool isReadOnly() const { return readonly->isChecked(); };
 	TQString vgaMode() const;
 	bool isUnsafe() const { return unsafe->isChecked(); };
@@ -48,14 +49,14 @@ private slots:
 	void check_pw();
 private:
 	liloimage	*l;
-	QCheckBox	*readonly;
-	QComboBox	*vga;
-	QCheckBox	*unsafe;
-	QCheckBox	*lock;
-	QCheckBox	*restricted;
-	QCheckBox	*use_password;
-	QLineEdit	*password;
-	QPushButton	*ok;
-	QPushButton	*cancel;
+	TQCheckBox	*readonly;
+	TQComboBox	*vga;
+	TQCheckBox	*unsafe;
+	TQCheckBox	*lock;
+	TQCheckBox	*restricted;
+	TQCheckBox	*use_password;
+	TQLineEdit	*password;
+	TQPushButton	*ok;
+	TQPushButton	*cancel;
 };
 #endif
diff --git a/lilo-config/qt/InputBox.cpp b/lilo-config/qt/InputBox.cpp
index 9836a91..a8aaa1d 100644
--- a/lilo-config/qt/InputBox.cpp
+++ b/lilo-config/qt/InputBox.cpp
@@ -31,26 +31,26 @@
 #include <tqwhatsthis.h>
 #include <ui.h>
 
-InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel, WFlags f):TQDialog(parent, name, true, f)
+InputBox::InputBox(entries e, TQWidget *tqparent, const char *name, bool hasCancel, WFlags f):TQDialog(tqparent, name, true, f)
 {
-	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);
 	for(entries::iterator it=e.begin(); it!=e.end(); it++) {
 		EditWidget *ed=new EditWidget((*it).label, (*it).dflt, (*it).isFile, this);
 		TQWhatsThis::add(ed, (*it).help);
-		layout->addWidget(ed);
+		tqlayout->addWidget(ed);
 		edit.insert(edit.end(), ed);
 	}
 	if(hasCancel) {
 		TQHBox *btns=new TQHBox(this);
 		ok=new TQPushButton(_("&OK"), btns);
 		cancel=new TQPushButton(_("&Cancel"), btns);
-		layout->addWidget(btns);
+		tqlayout->addWidget(btns);
 		connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 	} else {
 		ok=new TQPushButton(_("&OK"), this);
-		layout->addWidget(ok);
+		tqlayout->addWidget(ok);
 	}
 	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
 }
diff --git a/lilo-config/qt/InputBox.h b/lilo-config/qt/InputBox.h
index f4be6e9..1a624c8 100644
--- a/lilo-config/qt/InputBox.h
+++ b/lilo-config/qt/InputBox.h
@@ -33,13 +33,14 @@
 #include <tqpushbutton.h>
 #include "EditWidget.h"
 #include <list>
-class InputBox:public QDialog
+class InputBox:public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	typedef struct { TQString label; TQString dflt; bool isFile; TQString help; } entry;
 	typedef std::list<entry> entries;
-	InputBox(entries e, TQWidget *parent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
+	InputBox(entries e, TQWidget *tqparent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
 	TQStringList const text() const { TQStringList s; for(std::list<EditWidget*>::const_iterator it=edit.begin(); it!=edit.end(); it++) s << (*it)->text(); return s; };
 private:
 	std::list<EditWidget*> edit;
diff --git a/lilo-config/qt/standalone.cpp b/lilo-config/qt/standalone.cpp
index 4dc73e2..acab064 100644
--- a/lilo-config/qt/standalone.cpp
+++ b/lilo-config/qt/standalone.cpp
@@ -33,7 +33,7 @@
 #include <ui.h>
 #include "standalone.moc"
 
-Standalone::Standalone(TQWidget *parent, const char *name):TQWidget(parent,name)
+Standalone::Standalone(TQWidget *tqparent, const char *name):TQWidget(tqparent,name)
 {
 	m=new MainWidget(this);
 	connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged()));
@@ -62,14 +62,14 @@ Standalone::Standalone(TQWidget *parent, const char *name):TQWidget(parent,name)
 	TQWhatsThis::add(_cancel, _("This button exits the program without saving your changes."));
 	connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(cancel()));
 	_apply->setEnabled(false);
-	setMinimumWidth(actions->sizeHint().width()+10);
+	setMinimumWidth(actions->tqsizeHint().width()+10);
 	arrangeWidgets();
 }
 
 void Standalone::arrangeWidgets()
 {
-	m->setGeometry(SPACE_MARGIN, SPACE_MARGIN, width()-2*SPACE_MARGIN, height()-actions->sizeHint().height()-SPACE_MARGIN-SPACE_INSIDE);
-	actions->setGeometry(SPACE_MARGIN, height()-actions->sizeHint().height()-SPACE_MARGIN, width()-2*SPACE_MARGIN, actions->sizeHint().height());
+	m->setGeometry(SPACE_MARGIN, SPACE_MARGIN, width()-2*SPACE_MARGIN, height()-actions->tqsizeHint().height()-SPACE_MARGIN-SPACE_INSIDE);
+	actions->setGeometry(SPACE_MARGIN, height()-actions->tqsizeHint().height()-SPACE_MARGIN, width()-2*SPACE_MARGIN, actions->tqsizeHint().height());
 }
 
 void Standalone::resizeEvent(TQResizeEvent *e)
diff --git a/lilo-config/qt/standalone.h b/lilo-config/qt/standalone.h
index 3d5c4bf..2131b2a 100644
--- a/lilo-config/qt/standalone.h
+++ b/lilo-config/qt/standalone.h
@@ -32,11 +32,12 @@
 #include <tqhbuttongroup.h>
 #include <tqevent.h>
 #include "mainwidget.h"
-class Standalone: public QWidget
+class Standalone: public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	Standalone(TQWidget *parent=0, const char *name=0);
+	Standalone(TQWidget *tqparent=0, const char *name=0);
 	void resizeEvent(TQResizeEvent *e);
 public slots:
 	void whatsthis();