Rename a number of old tq methods that are no longer tq specific

7 files changed, 44 insertions, 44 deletions

diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp
index 3c80d2a..3b096cd 100644
--- a/lilo-config/kde-qt-common/EditWidget.cpp
+++ b/lilo-config/kde-qt-common/EditWidget.cpp
@@ -42,7 +42,7 @@ 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->tqminimumSizeHint());
+		select->resize(select->minimumSizeHint());
 		setStretchFactor(select, 0);
 	} else
 		select=0;
@@ -53,29 +53,29 @@ void EditWidget::selectFileClicked()
     if(!filename.isEmpty())
 	line->setText(filename);
 }
-TQSize EditWidget::tqsizeHint() const
+TQSize EditWidget::sizeHint() const
 {
-	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();
+	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();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->tqsizeHint().width();
-		if(h<select->tqsizeHint().height())
-			h=select->tqsizeHint().height();
+		w+=SPACE_INSIDE+select->sizeHint().width();
+		if(h<select->sizeHint().height())
+			h=select->sizeHint().height();
 	}
 	return TQSize(w, h);
 }
-TQSize EditWidget::tqminimumSizeHint() const
+TQSize EditWidget::minimumSizeHint() const
 {
-	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();
+	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();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->tqminimumSizeHint().width();
-		if(h<select->tqminimumSizeHint().height())
-			h=select->tqminimumSizeHint().height();
+		w+=SPACE_INSIDE+select->minimumSizeHint().width();
+		if(h<select->minimumSizeHint().height())
+			h=select->minimumSizeHint().height();
 	}
 	return TQSize(w, h);
 }
diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h
index e0901f9..89b037c 100644
--- a/lilo-config/kde-qt-common/EditWidget.h
+++ b/lilo-config/kde-qt-common/EditWidget.h
@@ -58,8 +58,8 @@ public:
 	void cut() { line->cut(); };
 	void copy() const { line->copy(); };
 	void paste() { line->paste(); };
-	void tqsetAlignment(int flag) { line->tqsetAlignment(flag); };
-	int tqalignment() const { return line->tqalignment(); };
+	void setAlignment(int flag) { line->setAlignment(flag); };
+	int alignment() const { return line->alignment(); };
 	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); };
@@ -72,8 +72,8 @@ public:
 	bool edited() const { return line->edited(); };
 	bool hasMarkedText() const { return line->hasMarkedText(); };
 	TQString markedText() const { return line->markedText(); };
-	virtual TQSize tqsizeHint() const;
-	virtual TQSize tqminimumSizeHint() const;
+	virtual TQSize sizeHint() const;
+	virtual TQSize minimumSizeHint() const;
 public slots:
 	virtual void setText(const TQString &text) { line->setText(text); };
 	void selectAll() { line->selectAll(); };
diff --git a/lilo-config/kde-qt-common/expert.cpp b/lilo-config/kde-qt-common/expert.cpp
index 7140fd9..d74b6b6 100644
--- a/lilo-config/kde-qt-common/expert.cpp
+++ b/lilo-config/kde-qt-common/expert.cpp
@@ -34,9 +34,9 @@
 Expert::Expert(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
-	tqlayout=new TQHBoxLayout(this);
+	layout=new TQHBoxLayout(this);
 	edit=new TQMultiLineEdit(this);
-	tqlayout->addWidget(edit);
+	layout->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 c2971a1..a3829d3 100644
--- a/lilo-config/kde-qt-common/expert.h
+++ b/lilo-config/kde-qt-common/expert.h
@@ -31,7 +31,7 @@
 #include <lilo.h>
 #include <tqwidget.h>
 #include <tqmultilineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 class Expert:public TQWidget
 {
 	Q_OBJECT
@@ -48,7 +48,7 @@ signals:
 	void configChanged();
 private:
 	liloconf	*lilo;
-	TQHBoxLayout	*tqlayout;
+	TQHBoxLayout	*layout;
 	TQMultiLineEdit	*edit;
 };
 #endif
diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp
index e67dc1f..71e0b48 100644
--- a/lilo-config/kde-qt-common/general.cpp
+++ b/lilo-config/kde-qt-common/general.cpp
@@ -29,7 +29,7 @@
 #include "general.moc"
 #include "EditWidget.h"
 #include <Disks.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <ui.h>
 #include <tqwhatsthis.h>
 
@@ -38,9 +38,9 @@
 General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->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()));
-	tqlayout->addWidget(drv);
+	layout->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);
-	tqlayout->addWidget(to);
+	layout->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."));
-	tqlayout->addWidget(modes);
+	layout->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>."));
-	tqlayout->addWidget(opts);
+	layout->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>."));
-	tqlayout->addWidget(pw);
+	layout->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()));
-	tqlayout->addWidget(vgab);
+	layout->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()));
 
-	tqlayout->addWidget(prompt);
+	layout->addWidget(prompt);
 
 	update();
 }
diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp
index a0f1c37..559b993 100644
--- a/lilo-config/kde-qt-common/images.cpp
+++ b/lilo-config/kde-qt-common/images.cpp
@@ -44,18 +44,18 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 {
 	current=""; previous=""; // Using TQString() gives problems!
 	lilo=l;
-	tqlayout=new TQHBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	layout=new TQHBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->setSpacing(SPACE_INSIDE);
 	images=new TQListBox(this);
-	tqlayout->addWidget(images, 1);
+	layout->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);
-	tqlayout->addWidget(parameters, 2);
+	layout->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);
-	tqlayout->addWidget(actions);
+	layout->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()));
diff --git a/lilo-config/kde-qt-common/images.h b/lilo-config/kde-qt-common/images.h
index 898b95b..1f54448 100644
--- a/lilo-config/kde-qt-common/images.h
+++ b/lilo-config/kde-qt-common/images.h
@@ -31,7 +31,7 @@
 #include <lilo.h>
 #include <tqwidget.h>
 #include <tqmultilineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include <tqvbox.h>
@@ -63,7 +63,7 @@ private:
 	liloconf	*lilo;
 	TQString		previous;
 	TQString		current;
-	TQHBoxLayout	*tqlayout;
+	TQHBoxLayout	*layout;
 	TQListBox	*images;
 	TQVBox		*parameters;
 	EditWidget	*image;