Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

10 files changed, 52 insertions, 52 deletions

diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp
index 3b096cd..173aeea 100644
--- a/lilo-config/kde-qt-common/EditWidget.cpp
+++ b/lilo-config/kde-qt-common/EditWidget.cpp
@@ -36,12 +36,12 @@ EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, T
 	setStretchFactor(lbl, 0);
 	line=new TQLineEdit(text, this);
 	setStretchFactor(line, 1);
-	connect(line, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(textChanged(const TQString &)));
-	connect(line, TQT_SIGNAL(returnPressed()), TQT_SIGNAL(returnPressed()));
+	connect(line, TQ_SIGNAL(textChanged(const TQString &)), TQ_SIGNAL(textChanged(const TQString &)));
+	connect(line, TQ_SIGNAL(returnPressed()), TQ_SIGNAL(returnPressed()));
 	lbl->setBuddy(line);
 	if(isFile) {
 		select=new TQPushButton(_("Select..."), this);
-		connect(select, TQT_SIGNAL(clicked()), TQT_SLOT(selectFileClicked()));
+		connect(select, TQ_SIGNAL(clicked()), TQ_SLOT(selectFileClicked()));
 		select->resize(select->minimumSizeHint());
 		setStretchFactor(select, 0);
 	} else
diff --git a/lilo-config/kde-qt-common/expert.cpp b/lilo-config/kde-qt-common/expert.cpp
index 5793058..390b3da 100644
--- a/lilo-config/kde-qt-common/expert.cpp
+++ b/lilo-config/kde-qt-common/expert.cpp
@@ -37,7 +37,7 @@ Expert::Expert(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 	layout=new TQHBoxLayout(this);
 	edit=new TQMultiLineEdit(this);
 	layout->addWidget(edit);
-	connect(edit, TQT_SIGNAL(textChanged()), TQT_SIGNAL(configChanged()));
+	connect(edit, TQ_SIGNAL(textChanged()), TQ_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/general.cpp b/lilo-config/kde-qt-common/general.cpp
index 2040025..efaaf74 100644
--- a/lilo-config/kde-qt-common/general.cpp
+++ b/lilo-config/kde-qt-common/general.cpp
@@ -50,7 +50,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	p.sort();
 	for(StringList::const_iterator it=p.begin(); it!=p.end(); it++)
 		drive->insertItem((*it).cstr());
-	connect(drive, TQT_SIGNAL(activated(int)), TQT_SIGNAL(configChanged()));
+	connect(drive, TQ_SIGNAL(activated(int)), TQ_SIGNAL(configChanged()));
 	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."));
 
@@ -58,38 +58,38 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	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, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(configChanged()));
+	connect(timeout, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(configChanged()));
 	to_lbl->setBuddy(timeout);
 	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);
 	linear=new TQCheckBox(_("Use &linear mode"), modes);
-	connect(linear, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
+	connect(linear, TQ_SIGNAL(clicked()), TQ_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()));
+	connect(compact, TQ_SIGNAL(clicked()), TQ_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);
 
 	TQHBox *opts=new TQHBox(this);
 	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
-	connect(lock, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
+	connect(lock, TQ_SIGNAL(clicked()), TQ_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()));
+	connect(restricted, TQ_SIGNAL(clicked()), TQ_SIGNAL(configChanged()));
+	connect(restricted, TQ_SIGNAL(clicked()), TQ_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);
 
 	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()));
+	connect(use_password, TQ_SIGNAL(clicked()), TQ_SIGNAL(configChanged()));
+	connect(use_password, TQ_SIGNAL(clicked()), TQ_SLOT(check_pw()));
 	password=new TQLineEdit(pw);
 	password->setMaxLength(15);
 	password->setEchoMode(TQLineEdit::Password);
-	connect(password, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(configChanged()));
+	connect(password, TQ_SIGNAL(textChanged(const TQString &)), TQ_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);
 
@@ -124,12 +124,12 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	vga->insertItem(_("VGA 1280x1024, 32767 colors (793)"));
 	vga->insertItem(_("VGA 1280x1024, 65536 colors (794)"));
 	vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
-        connect( vga, TQT_SIGNAL(activated ( int )), TQT_SIGNAL(configChanged()));
+        connect( vga, TQ_SIGNAL(activated ( int )), TQ_SIGNAL(configChanged()));
 	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()));
+        connect(prompt, TQ_SIGNAL(clicked()), TQ_SIGNAL(configChanged()));
 
 	layout->addWidget(prompt);
 
diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp
index 8b09749..17df335 100644
--- a/lilo-config/kde-qt-common/images.cpp
+++ b/lilo-config/kde-qt-common/images.cpp
@@ -49,7 +49,7 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 	layout->setSpacing(SPACE_INSIDE);
 	images=new TQListBox(this);
 	layout->addWidget(images, 1);
-	connect(images, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(imageSelected(const TQString &)));
+	connect(images, TQ_SIGNAL(highlighted(const TQString &)), TQ_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);
@@ -58,19 +58,19 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 	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()));
+	connect(image, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged()));
 	label=new EditWidget(_("&Label:"), "", false, parameters);
 	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()));
+	connect(label, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged()));
 	root=new EditWidget(_("&Root filesystem:"), "", true, parameters);
 	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()));
+	connect(root, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged()));
 	initrd=new EditWidget(_("&Initial ramdisk:"), "", true, parameters);
 	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()));
+	connect(initrd, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged()));
 	append=new EditWidget(_("E&xtra parameters:"), "", false, parameters);
 	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()));
+	connect(append, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged()));
 
 	actions=new TQVBox(this);
 	actions->setMargin(SPACE_MARGIN);
@@ -78,24 +78,24 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 	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()));
+	connect(dflt, TQ_SIGNAL(clicked()), TQ_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()));
+	connect(details, TQ_SIGNAL(clicked()), TQ_SLOT(detailsClicked()));
 	probe=new TQPushButton(_("&Probe"), actions);
-	connect(probe, TQT_SIGNAL(clicked()), TQT_SLOT(probeClicked()));
+	connect(probe, TQ_SIGNAL(clicked()), TQ_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()));
+	connect(check, TQ_SIGNAL(clicked()), TQ_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()));
+	connect(addKrnl, TQ_SIGNAL(clicked()), TQ_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()));
+	connect(addOS, TQ_SIGNAL(clicked()), TQ_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()));
+	connect(remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeClicked()));
 	TQWhatsThis::add(remove, _("Remove entry from the boot menu"));
 	update();
 }
diff --git a/lilo-config/kde-qt-common/mainwidget.cpp b/lilo-config/kde-qt-common/mainwidget.cpp
index bb966f2..5acdd81 100644
--- a/lilo-config/kde-qt-common/mainwidget.cpp
+++ b/lilo-config/kde-qt-common/mainwidget.cpp
@@ -34,16 +34,16 @@ MainWidget::MainWidget(TQWidget *parent, const char *name)
 {
 	l=new liloconf();
 	general=new General(l, this);
-	connect(general, TQT_SIGNAL(configChanged()), TQT_SIGNAL(configChanged()));
+	connect(general, TQ_SIGNAL(configChanged()), TQ_SIGNAL(configChanged()));
 	images=new Images(l, this);
-	connect(images, TQT_SIGNAL(configChanged()), TQT_SIGNAL(configChanged()));
+	connect(images, TQ_SIGNAL(configChanged()), TQ_SIGNAL(configChanged()));
 	expert=new Expert(l, this);
-	connect(expert, TQT_SIGNAL(configChanged()), TQT_SIGNAL(configChanged()));
-	connect(expert, TQT_SIGNAL(configChanged()), images, TQT_SLOT(update()));
+	connect(expert, TQ_SIGNAL(configChanged()), TQ_SIGNAL(configChanged()));
+	connect(expert, TQ_SIGNAL(configChanged()), images, TQ_SLOT(update()));
 	addTab(general, _("&General Options"));
 	addTab(images, _("&Operating Systems"));
 	addTab(expert, _("&Expert"));
-	connect(this, TQT_SIGNAL(selected(const TQString &)), TQT_SLOT(tabChanged(const TQString &)));
+	connect(this, TQ_SIGNAL(selected(const TQString &)), TQ_SLOT(tabChanged(const TQString &)));
 	load();
 	arrangeWidgets();
 }
diff --git a/lilo-config/kde/Details.cpp b/lilo-config/kde/Details.cpp
index 86e47bb..b54b3e2 100644
--- a/lilo-config/kde/Details.cpp
+++ b/lilo-config/kde/Details.cpp
@@ -82,12 +82,12 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags /*
 	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
 	TQWhatsThis::add(lock, "<qt>" + _("Checking this box enables automatic recording of boot command lines as the default for the following bootups. This way, lilo \"locks\" on a choice until it is manually overridden.<br>This sets the <b>lock</b> option in lilo.conf"));
 	restricted=new TQCheckBox(_("R&estrict parameters"), opts);
-	connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
+	connect(restricted, TQ_SIGNAL(clicked()), TQ_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."));
 
 	TQHBox *pw=new TQHBox(page);
 	use_password=new TQCheckBox(_("Require &password:"), pw);
-	connect(use_password, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
+	connect(use_password, TQ_SIGNAL(clicked()), TQ_SLOT(check_pw()));
 	password=new TQLineEdit(pw);
 	password->setMaxLength(15);
 	password->setEchoMode(TQLineEdit::Password);
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp
index bcce8aa..b12e218 100644
--- a/lilo-config/kde/kcontrol.cpp
+++ b/lilo-config/kde/kcontrol.cpp
@@ -41,7 +41,7 @@ KControl::KControl(TQWidget *parent, const char *name)
 	TQVBoxLayout *layout=new TQVBoxLayout(this);
 	m=new MainWidget(this, name);
 	layout->addWidget(m);
-	connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged()));
+	connect(m, TQ_SIGNAL(configChanged()), TQ_SLOT(configChanged()));
         if (getuid() != 0) {
             m->makeReadOnly();
         }
diff --git a/lilo-config/qt/Details.cpp b/lilo-config/qt/Details.cpp
index 944ba0d..5bebba9 100644
--- a/lilo-config/qt/Details.cpp
+++ b/lilo-config/qt/Details.cpp
@@ -85,13 +85,13 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
 	TQWhatsThis::add(lock, "<qt>"+_("Checking this box enables automatic recording of boot command lines as the default for the following bootups. This way, lilo \"locks\" on a choice until it is manually overridden.<br>This sets the <b>lock</b> option in lilo.conf"));
 	restricted=new TQCheckBox(_("R&estrict parameters"), opts);
-	connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
+	connect(restricted, TQ_SIGNAL(clicked()), TQ_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);
 
 	TQHBox *pw=new TQHBox(this);
 	use_password=new TQCheckBox(_("Require &password:"), pw);
-	connect(use_password, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
+	connect(use_password, TQ_SIGNAL(clicked()), TQ_SLOT(check_pw()));
 	password=new TQLineEdit(pw);
 	password->setMaxLength(15);
 	password->setEchoMode(TQLineEdit::Password);
@@ -102,8 +102,8 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	ok=new TQPushButton(_("&OK"), btns);
 	cancel=new TQPushButton(_("&Cancel"), btns);
 	layout->addWidget(btns);
-	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
-	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
+	connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
+	connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
 
 	if(l) {
 		TQString mode=l->get("vga", "").cstr();
diff --git a/lilo-config/qt/InputBox.cpp b/lilo-config/qt/InputBox.cpp
index 9836a91..9c40569 100644
--- a/lilo-config/qt/InputBox.cpp
+++ b/lilo-config/qt/InputBox.cpp
@@ -47,10 +47,10 @@ InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel
 		ok=new TQPushButton(_("&OK"), btns);
 		cancel=new TQPushButton(_("&Cancel"), btns);
 		layout->addWidget(btns);
-		connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+		connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 	} else {
 		ok=new TQPushButton(_("&OK"), this);
 		layout->addWidget(ok);
 	}
-	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
+	connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
 }
diff --git a/lilo-config/qt/standalone.cpp b/lilo-config/qt/standalone.cpp
index 4dc73e2..d6bca94 100644
--- a/lilo-config/qt/standalone.cpp
+++ b/lilo-config/qt/standalone.cpp
@@ -36,31 +36,31 @@
 Standalone::Standalone(TQWidget *parent, const char *name):TQWidget(parent,name)
 {
 	m=new MainWidget(this);
-	connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged()));
+	connect(m, TQ_SIGNAL(configChanged()), TQ_SLOT(configChanged()));
 	actions=new TQHButtonGroup(this);
 	_whatsthis=new TQPushButton(_("&What's This?"), actions);
 	_whatsthis->setAccel(SHIFT+Key_F1);
 	TQWhatsThis::add(_whatsthis, _("The <i>What's This?</i> button is part of this program's help system. Click on the What's This? button then on any widget in the window to get information (like this) on it."));
-	connect(_whatsthis, TQT_SIGNAL(clicked()), TQT_SLOT(whatsthis()));
+	connect(_whatsthis, TQ_SIGNAL(clicked()), TQ_SLOT(whatsthis()));
 	_help=new TQPushButton(_("&Help"), actions);
 	_help->setAccel(Key_F1);
 	TQWhatsThis::add(_help, _("This button calls up the program's online help system. If it does nothing, no help file has been written (yet); in that case, use the <i>What's This</i> button on the left."));
-	connect(_help, TQT_SIGNAL(clicked()), this, TQT_SLOT(help()));
+	connect(_help, TQ_SIGNAL(clicked()), this, TQ_SLOT(help()));
 	_deflt=new TQPushButton(_("&Default"), actions);
 	TQWhatsThis::add(_deflt, _("This button resets all parameters to some (hopefully sane) default values."));	
-	connect(_deflt, TQT_SIGNAL(clicked()), this, TQT_SLOT(defaults()));
+	connect(_deflt, TQ_SIGNAL(clicked()), this, TQ_SLOT(defaults()));
 	_reset=new TQPushButton(_("&Reset"), actions);
 	TQWhatsThis::add(_reset, _("This button resets all parameters to what they were before you started the program."));
-	connect(_reset, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset()));
+	connect(_reset, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset()));
 	_apply=new TQPushButton(_("&Apply"), actions);
 	TQWhatsThis::add(_apply, _("This button saves all your changes without exiting."));
-	connect(_apply, TQT_SIGNAL(clicked()), this, TQT_SLOT(apply()));
+	connect(_apply, TQ_SIGNAL(clicked()), this, TQ_SLOT(apply()));
 	_ok=new TQPushButton(_("&OK"), actions);
 	TQWhatsThis::add(_ok, _("This button saves all your changes and exits the program."));
-	connect(_ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(ok()));
+	connect(_ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(ok()));
 	_cancel=new TQPushButton(_("&Cancel"), actions);
 	TQWhatsThis::add(_cancel, _("This button exits the program without saving your changes."));
-	connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(cancel()));
+	connect(_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(cancel()));
 	_apply->setEnabled(false);
 	setMinimumWidth(actions->sizeHint().width()+10);
 	arrangeWidgets();
@@ -118,7 +118,7 @@ int main(int argc, char **argv) {
 	int ret;
 	a.setStyle(new TQWindowsStyle());
 	a.setMainWidget(s);
-	TQObject::connect(s, TQT_SIGNAL(done()), &a, TQT_SLOT(quit()));
+	TQObject::connect(s, TQ_SIGNAL(done()), &a, TQ_SLOT(quit()));
 	s->show();
 	ret=a.exec();
 	delete s;