Rename obsolete tq methods to standard names

8 files changed, 37 insertions, 37 deletions

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..43c5b01 100644
--- a/lilo-config/kde-qt-common/expert.h
+++ b/lilo-config/kde-qt-common/expert.h
@@ -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..2040025 100644
--- a/lilo-config/kde-qt-common/general.cpp
+++ b/lilo-config/kde-qt-common/general.cpp
@@ -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..ca52d7b 100644
--- a/lilo-config/kde-qt-common/images.h
+++ b/lilo-config/kde-qt-common/images.h
@@ -63,7 +63,7 @@ private:
 	liloconf	*lilo;
 	TQString		previous;
 	TQString		current;
-	TQHBoxLayout	*tqlayout;
+	TQHBoxLayout	*layout;
 	TQListBox	*images;
 	TQVBox		*parameters;
 	EditWidget	*image;
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp
index 75f514c..846edc8 100644
--- a/lilo-config/kde/kcontrol.cpp
+++ b/lilo-config/kde/kcontrol.cpp
@@ -38,9 +38,9 @@
 KControl::KControl(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
 	m=new MainWidget(this, name);
-	tqlayout->addWidget(m);
+	layout->addWidget(m);
 	connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged()));
         if (getuid() != 0) {
             m->makeReadOnly();
diff --git a/lilo-config/qt/Details.cpp b/lilo-config/qt/Details.cpp
index 5abce8a..944ba0d 100644
--- a/lilo-config/qt/Details.cpp
+++ b/lilo-config/qt/Details.cpp
@@ -36,9 +36,9 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 {
 	l=lilo;
 
-	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 *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)"));
-	tqlayout->addWidget(vgab);
+	layout->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."));
-	tqlayout->addWidget(readonly);
+	layout->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."));
-	tqlayout->addWidget(unsafe);
+	layout->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."));
-	tqlayout->addWidget(opts);
+	layout->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."));
-	tqlayout->addWidget(pw);
+	layout->addWidget(pw);
 
 	TQHBox *btns=new TQHBox(this);
 	ok=new TQPushButton(_("&OK"), btns);
 	cancel=new TQPushButton(_("&Cancel"), btns);
-	tqlayout->addWidget(btns);
+	layout->addWidget(btns);
 	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
 
diff --git a/lilo-config/qt/InputBox.cpp b/lilo-config/qt/InputBox.cpp
index ca1c557..9836a91 100644
--- a/lilo-config/qt/InputBox.cpp
+++ b/lilo-config/qt/InputBox.cpp
@@ -33,24 +33,24 @@
 
 InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel, WFlags f):TQDialog(parent, name, true, f)
 {
-	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);
 	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);
-		tqlayout->addWidget(ed);
+		layout->addWidget(ed);
 		edit.insert(edit.end(), ed);
 	}
 	if(hasCancel) {
 		TQHBox *btns=new TQHBox(this);
 		ok=new TQPushButton(_("&OK"), btns);
 		cancel=new TQPushButton(_("&Cancel"), btns);
-		tqlayout->addWidget(btns);
+		layout->addWidget(btns);
 		connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 	} else {
 		ok=new TQPushButton(_("&OK"), this);
-		tqlayout->addWidget(ok);
+		layout->addWidget(ok);
 	}
 	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
 }