From 377fa3a2775cdb3194315bb83e21744dc7c97bbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:15 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d1248617107f659af9d03cf1ef6d783571a0cba8. --- lilo-config/kde-qt-common/general.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'lilo-config/kde-qt-common/general.cpp') diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp index 71e0b48..e67dc1f 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 -#include +#include #include #include @@ -38,9 +38,9 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, 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.
In this case, you should probably select /dev/hda if your boot drive is an IDE drive or /dev/sda 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 default in the Images 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.
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 linux, but not linux single or linux init=/bin/sh).\nThis sets the restricted option in lilo.conf.
This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the Operating systems tab and select Details.")); - 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 restricted above is checked, the password is required for additional parameters only.
WARNING: 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.
This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the Operating systems tab and select Details.")); - 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).
This sets the prompt option in lilo.conf.")); connect(prompt, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged())); - layout->addWidget(prompt); + tqlayout->addWidget(prompt); update(); } -- cgit v1.2.1