Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 94fad98cf23ddd7a5533e30e79bffc5d2f1f843c)

14 files changed, 103 insertions, 103 deletions

diff --git a/kshutdown/appobserver.cpp b/kshutdown/appobserver.cpp
index 9518499..fa9252e 100644
--- a/kshutdown/appobserver.cpp
+++ b/kshutdown/appobserver.cpp
@@ -55,7 +55,7 @@ AppObserver::AppObserver(TQWidget *parent)
 	b_refresh->setIconSet(SmallIcon("reload"));
 	b_refresh->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
 	MiscUtils::setHint(b_refresh, i18n("Refresh the list of processes"));
-	connect(b_refresh, SIGNAL(clicked()), SLOT(slotRefresh()));
+	connect(b_refresh, TQ_SIGNAL(clicked()), TQ_SLOT(slotRefresh()));
 
 	// processes combo box
 	cb_processes = new TQComboBox(this, "TQComboBox::cb_processes");
@@ -66,7 +66,7 @@ AppObserver::AppObserver(TQWidget *parent)
 	b_kill = new KPushButton(SmallIcon("edit-delete"), i18n("Kill"), this, "KPushButton::b_kill");
 	b_kill->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
 	MiscUtils::setHint(b_kill, i18n("Kill the selected process"));
-	connect(b_kill, SIGNAL(clicked()), SLOT(slotKill()));
+	connect(b_kill, TQ_SIGNAL(clicked()), TQ_SLOT(slotKill()));
 }
 
 TQString AppObserver::getInfo() const
@@ -132,8 +132,8 @@ void AppObserver::refresh()
 	if (!_process)
 	{
 		_process = new TQProcess(this);
-		connect(_process, SIGNAL(processExited()), SLOT(slotProcessExit()));
-		connect(_process, SIGNAL(readyReadStdout()), SLOT(slotReadStdout()));
+		connect(_process, TQ_SIGNAL(processExited()), TQ_SLOT(slotProcessExit()));
+		connect(_process, TQ_SIGNAL(readyReadStdout()), TQ_SLOT(slotReadStdout()));
 	}
 	else
 	{
diff --git a/kshutdown/extras.cpp b/kshutdown/extras.cpp
index b729380..ac2e0df 100644
--- a/kshutdown/extras.cpp
+++ b/kshutdown/extras.cpp
@@ -108,8 +108,8 @@ Extras::Extras()
 	_idToFileMap(0) // initialized in getIdToFileMap()
 {
 	_menu = new TDEPopupMenu(0, "TDEPopupMenu::_menu");
-	connect(_menu, SIGNAL(aboutToShow()), SLOT(slotShowMenu()));
-	connect(_menu, SIGNAL(activated(int)), SLOT(slotActivated(int)));
+	connect(_menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotShowMenu()));
+	connect(_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
 }
 
 // TODO: 2.0: recent items
@@ -139,7 +139,7 @@ void Extras::buildMenu(TDEPopupMenu *parentMenu, const TQString &subdir)
 		if (fi.isDir())
 		{
 			TDEPopupMenu *submenu = new TDEPopupMenu(parentMenu, "TDEPopupMenu::submenu");
-			connect(submenu, SIGNAL(activated(int)), SLOT(slotActivated(int)));
+			connect(submenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
 
 			KDesktopFile *desktopFile = new KDesktopFile(path + "/.directory", true);
 			if (desktopFile->getConfigState() != TDEConfigBase::NoAccess)
diff --git a/kshutdown/links.cpp b/kshutdown/links.cpp
index e2aab33..f128169 100644
--- a/kshutdown/links.cpp
+++ b/kshutdown/links.cpp
@@ -54,7 +54,7 @@ Links::Links(TQWidget *parent)
 	cb_location->insertItem(SmallIcon("desktop"), i18n("Desktop"));
 	cb_location->insertItem(SmallIcon("kmenu"), i18n("K Menu"));
 	l_location->setBuddy(cb_location);
-	connect(cb_location, SIGNAL(activated(int)), SLOT(slotActivated(int)));
+	connect(cb_location, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
 
 	// type
 	TQHBox *w_type = new TQHBox(this);
@@ -73,11 +73,11 @@ Links::Links(TQWidget *parent)
 	cb_type->insertItem(ks_actions->getIcon(Action::LockScreen), ks_actions->getName(Action::LockScreen));
 	cb_type->insertItem(ks_actions->getIcon(Action::Logout), ks_actions->getName(Action::Logout));
 	l_type->setBuddy(cb_type);
-	connect(cb_type, SIGNAL(activated(int)), SLOT(slotActivated(int)));
+	connect(cb_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
 
 	// add/remove link
 	b_addRemoveLink = new KPushButton(this, "KPushButton::b_addRemoveLink");
-	connect(b_addRemoveLink, SIGNAL(clicked()), SLOT(slotAddRemoveLink()));
+	connect(b_addRemoveLink, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddRemoveLink()));
 
 	updateAddRemoveButton();
 }
diff --git a/kshutdown/mactioneditdialog.cpp b/kshutdown/mactioneditdialog.cpp
index 0427932..951a04c 100644
--- a/kshutdown/mactioneditdialog.cpp
+++ b/kshutdown/mactioneditdialog.cpp
@@ -74,7 +74,7 @@ MActionEditDialog::MActionEditDialog(TQWidget *parent, Action::Type action)
 	_methods->setFocusPolicy(StrongFocus);
 	_methods->insertItem(i18n("TDE (default)"));
 	l_method->setBuddy(_methods);
-	connect(_methods, SIGNAL(activated(int)), SLOT(slotMethodChange(int)));
+	connect(_methods, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMethodChange(int)));
 
 	// command label
 	l_command = new TQLabel(i18n("Enter a custom command:"), gb_method);
@@ -92,16 +92,16 @@ MActionEditDialog::MActionEditDialog(TQWidget *parent, Action::Type action)
 	i_commandBeforeActionPause->setSpecialValueText(i18n("No pause"));
 	i_commandBeforeActionPause->setSuffix(" " + i18n("second(s)"));
 	b_testCommandBeforeAction = new KPushButton(KStdGuiItem::test(), gb_commandBeforeAction, "KPushButton::b_testCommandBeforeAction");
-	connect(b_testCommandBeforeAction, SIGNAL(clicked()), SLOT(slotTestCommandBeforeAction()));
+	connect(b_testCommandBeforeAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotTestCommandBeforeAction()));
 	connect(
-		c_runCommandBeforeAction, SIGNAL(toggled(bool)),
-		i_commandBeforeAction, SLOT(setEnabled(bool)));
+		c_runCommandBeforeAction, TQ_SIGNAL(toggled(bool)),
+		i_commandBeforeAction, TQ_SLOT(setEnabled(bool)));
 	connect(
-		c_runCommandBeforeAction, SIGNAL(toggled(bool)),
-		i_commandBeforeActionPause, SLOT(setEnabled(bool)));
+		c_runCommandBeforeAction, TQ_SIGNAL(toggled(bool)),
+		i_commandBeforeActionPause, TQ_SLOT(setEnabled(bool)));
 	connect(
-		c_runCommandBeforeAction, SIGNAL(toggled(bool)),
-		b_testCommandBeforeAction, SLOT(setEnabled(bool)));
+		c_runCommandBeforeAction, TQ_SIGNAL(toggled(bool)),
+		b_testCommandBeforeAction, TQ_SLOT(setEnabled(bool)));
 
 	MTip *t_progs = new MTip(MTip::Warning, gb_south);
 	t_progs->setTipText(
@@ -121,7 +121,7 @@ MActionEditDialog::MActionEditDialog(TQWidget *parent, Action::Type action)
 		)
 	);
 
-	connect(this, SIGNAL(okClicked()), SLOT(slotOKClicked()));
+	connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotOKClicked()));
 
 	Action::Method m = Action::Method_TDE;
 	TQString c;
diff --git a/kshutdown/main.cpp b/kshutdown/main.cpp
index 48fcba3..a8e34eb 100644
--- a/kshutdown/main.cpp
+++ b/kshutdown/main.cpp
@@ -135,8 +135,8 @@ int KShutDownApplication::newInstance()
 		(void)new MMainWindow();
 		kapp->setMainWidget(ks_main);
 		connect(
-			this, SIGNAL(aboutToQuit()),
-			ks_main, SLOT(deleteLater()));
+			this, TQ_SIGNAL(aboutToQuit()),
+			ks_main, TQ_SLOT(deleteLater()));
 	}
 
 	// check command line args
diff --git a/kshutdown/miscutils.cpp b/kshutdown/miscutils.cpp
index 3dd6885..6828b03 100644
--- a/kshutdown/miscutils.cpp
+++ b/kshutdown/miscutils.cpp
@@ -136,7 +136,7 @@ void MiscUtils::passiveMessage(const TQString &text, TQWidget *parent) {
 
 void MiscUtils::plug(const TDEAction *action, KPushButton *pushButton) {
 	pushButton->disconnect(); // disconnect all
-	pushButton->connect(pushButton, SIGNAL(clicked()), action, SLOT(activate()));
+	pushButton->connect(pushButton, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()));
 	pushButton->setIconSet(action->iconSet());
 	TQString text = action->text();
 	if (text.contains("%1"))
diff --git a/kshutdown/mmainwindow.cpp b/kshutdown/mmainwindow.cpp
index d780727..8a2cd8a 100644
--- a/kshutdown/mmainwindow.cpp
+++ b/kshutdown/mmainwindow.cpp
@@ -67,7 +67,7 @@ MMainWindow::MMainWindow()
 	_delayType(DelayType_Now)
 {
 	_instance = this;
-	connect(kapp, SIGNAL(aboutToQuit()), SLOT(slotAboutToQuit()));
+	connect(kapp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotAboutToQuit()));
 
 	// init date/time
 	dt_end = TQDateTime();
@@ -75,7 +75,7 @@ MMainWindow::MMainWindow()
 
 	// action timeout timer
 	_timer = new TQTimer(this);
-	connect(_timer, SIGNAL(timeout()), SLOT(slotCheckTime()));
+	connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCheckTime()));
 
 	// init widgets
 	setCentralWidget(initWidgets());
@@ -477,7 +477,7 @@ void MMainWindow::initMainMenu()
 		_statisticsAction->setEnabled(false);
 
 // TODO: 2.0: improve kiosk support
-	KStdAction::quit(this, SLOT(slotQuit()), actionCollection())->plug(pm_file);
+	KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection())->plug(pm_file);
 	mainMenu->insertItem(i18n("&File"), pm_file);
 
 	// actions
@@ -495,10 +495,10 @@ void MMainWindow::initMainMenu()
 	TDEPopupMenu *pm_settings = new TDEPopupMenu(this);
 	_checkSystemConfigurationAction->plug(pm_settings);
 	pm_settings->insertSeparator();
-	pm_settings->insertItem(SmallIcon("configure_shortcuts"), i18n("Configure Global Shortcuts..."), this, SLOT(slotConfigureGlobalShortcuts()));
-	KStdAction::keyBindings(this, SLOT(slotConfigureShortcuts()), actionCollection())->plug(pm_settings);
+	pm_settings->insertItem(SmallIcon("configure_shortcuts"), i18n("Configure Global Shortcuts..."), this, TQ_SLOT(slotConfigureGlobalShortcuts()));
+	KStdAction::keyBindings(this, TQ_SLOT(slotConfigureShortcuts()), actionCollection())->plug(pm_settings);
 	pm_settings->insertSeparator();
-	KStdAction::configureNotifications(this, SLOT(slotConfigureNotifications()), actionCollection())->plug(pm_settings);
+	KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection())->plug(pm_settings);
 	_configureKShutDownAction->plug(pm_settings);
 	mainMenu->insertItem(i18n("&Settings"), pm_settings);
 
@@ -515,28 +515,28 @@ void MMainWindow::initActions()
 	_lockScreenAction = new TDEAction(
 		ks_actions->getName(Action::LockScreen),
 		ks_actions->getIcon(Action::LockScreen), TDEShortcut(),
-		ks_actions, SLOT(slotLockScreen()),
+		ks_actions, TQ_SLOT(slotLockScreen()),
 		ac_shutDown, "kshutdown_lockscreen"
 	);
 
 	_logoutAction = new TDEAction(
 		ks_actions->getName(Action::Logout),
 		ks_actions->getIcon(Action::Logout), TDEShortcut(),
-		ks_actions, SLOT(slotLogout()),
+		ks_actions, TQ_SLOT(slotLogout()),
 		ac_shutDown, "kshutdown_logout"
 	);
 
 	_rebootAction = new TDEAction(
 		ks_actions->getName(Action::Reboot),
 		ks_actions->getIcon(Action::Reboot), TDEShortcut(),
-		ks_actions, SLOT(slotReboot()),
+		ks_actions, TQ_SLOT(slotReboot()),
 		ac_shutDown, "kshutdown_reboot"
 	);
 
 	_shutDownAction = new TDEAction(
 		ks_actions->getName(Action::ShutDown),
 		ks_actions->getIcon(Action::ShutDown), TDEShortcut(),
-		ks_actions, SLOT(slotShutDown()),
+		ks_actions, TQ_SLOT(slotShutDown()),
 		ac_shutDown, "kshutdown_shutdown"
 	);
 
@@ -545,7 +545,7 @@ void MMainWindow::initActions()
 	_cancelAction = new TDEAction(
 		i18n("C&ancel"),
 		"cancel", TDEShortcut(Key_Escape),
-		this, SLOT(slotCancel()),
+		this, TQ_SLOT(slotCancel()),
 		actionCollection(), "kshutdown_cancelaction"
 	);
 	_cancelAction->setEnabled(false);
@@ -553,16 +553,16 @@ void MMainWindow::initActions()
 	_checkSystemConfigurationAction = new TDEAction(
 		i18n("Check &System Configuration"),
 		"button_ok", TDEShortcut(),
-		this, SLOT(slotCheckSystemConfig()),
+		this, TQ_SLOT(slotCheckSystemConfig()),
 		actionCollection(), "kshutdown_checksystemconfiguration"
 	);
 
-	_configureKShutDownAction = KStdAction::preferences(this, SLOT(slotConfigureKShutDown()), actionCollection());
+	_configureKShutDownAction = KStdAction::preferences(this, TQ_SLOT(slotConfigureKShutDown()), actionCollection());
 
 	_startAction = new TDEAction(
 		i18n("&Start"),
 		"button_ok", TDEShortcut(Key_Return),
-		this, SLOT(slotStart()),
+		this, TQ_SLOT(slotStart()),
 		actionCollection(), "kshutdown_startaction"
 	);
 	MiscUtils::plug(_startAction, b_startStop);
@@ -570,7 +570,7 @@ void MMainWindow::initActions()
 	_statisticsAction = new TDEAction(
 		i18n("&Statistics"),
 		TDEShortcut(Key_F2),
-		this, SLOT(slotStats()),
+		this, TQ_SLOT(slotStats()),
 		actionCollection(), "kshutdown_statistics"
 	);
 
@@ -583,25 +583,25 @@ void MMainWindow::initActions()
 		"kshutdown_shutdown",
 		ks_actions->getName(Action::ShutDown),
 		TQString(),
-		0, 0, ks_actions, SLOT(slotShutDown())
+		0, 0, ks_actions, TQ_SLOT(slotShutDown())
 	);
 	_globalAccel->insert(
 		"kshutdown_reboot",
 		ks_actions->getName(Action::Reboot),
 		TQString(),
-		0, 0, ks_actions, SLOT(slotReboot())
+		0, 0, ks_actions, TQ_SLOT(slotReboot())
 	);
 	_globalAccel->insert(
 		"kshutdown_lockscreen",
 		ks_actions->getName(Action::LockScreen),
 		TQString(),
-		0, 0, ks_actions, SLOT(slotLockScreen())
+		0, 0, ks_actions, TQ_SLOT(slotLockScreen())
 	);
 	_globalAccel->insert(
 		"kshutdown_logout",
 		ks_actions->getName(Action::Logout),
 		TQString(),
-		0, 0, ks_actions, SLOT(slotLogout())
+		0, 0, ks_actions, TQ_SLOT(slotLogout())
 	);
 	_globalAccel->readSettings();
 	_globalAccel->updateConnections();
@@ -623,7 +623,7 @@ TQWidget *MMainWindow::initWidgets()
 	cb_actions->insertItem(ks_actions->getIcon(Action::Logout), ks_actions->getName(Action::Logout));
 	cb_actions->insertItem(ks_actions->getIcon(Action::Extras), i18n("Extras"));
 	TQWhatsThis::add(cb_actions, i18n("Select an action to perform at the selected time."));
-	connect(cb_actions, SIGNAL(activated(int)), SLOT(slotActionChange(int)));
+	connect(cb_actions, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActionChange(int)));
 
 	// extras
 	ks_extras->createButton(gb_actions);
@@ -642,14 +642,14 @@ TQWidget *MMainWindow::initWidgets()
 		TQWhatsThis::add(cb_delayTypes, i18n("Disabled by the Administrator."));
 	else
 		TQWhatsThis::add(cb_delayTypes, i18n("Select the type of delay."));
-	connect(cb_delayTypes, SIGNAL(activated(int)), SLOT(slotDelayTypeChange(int)));
+	connect(cb_delayTypes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotDelayTypeChange(int)));
 
 	// date/time edit
 	_dateTimeEdit = new TQDateTimeEdit(gb_delayValues, "TQDateTimeEdit::_dateTimeEdit");
 	_dateTimeEdit->setAutoAdvance(true);
 	_dateTimeEdit->dateEdit()->setMinValue(TQDate::currentDate());
 	setDate(TQDate::currentDate());
-	connect(_dateTimeEdit, SIGNAL(valueChanged(const TQDateTime &)), SLOT(slotUpdateTimeInfo()));
+	connect(_dateTimeEdit, TQ_SIGNAL(valueChanged(const TQDateTime &)), TQ_SLOT(slotUpdateTimeInfo()));
 
 	// app observer/killer
 	_appObserver = new AppObserver(gb_delayValues);
diff --git a/kshutdown/mmessagedialog.cpp b/kshutdown/mmessagedialog.cpp
index 0305987..9e9c318 100644
--- a/kshutdown/mmessagedialog.cpp
+++ b/kshutdown/mmessagedialog.cpp
@@ -86,23 +86,23 @@ MMessageDialog::MMessageDialog(const int delay, const Action::Type actionToExecu
 // FIXME: 2.0: no accelerator for "b_continue"
 	b_continue->setPaletteBackgroundColor(yellow);
 	b_continue->setPaletteForegroundColor(black);
-	connect(b_continue, SIGNAL(clicked()), SLOT(slotAccept()));
+	connect(b_continue, TQ_SIGNAL(clicked()), TQ_SLOT(slotAccept()));
 	b_continue->setEnabled(false);
-	TQTimer::singleShot(2000, this, SLOT(slotEnableContinue()));
+	TQTimer::singleShot(2000, this, TQ_SLOT(slotEnableContinue()));
 
 	// cancel button
 	KPushButton *b_cancel = new KPushButton(KStdGuiItem::cancel(), bottomBox, "KPushButton::b_cancel");
 	b_cancel->setDefault(true);
 	b_cancel->setPaletteBackgroundColor(yellow);
 	b_cancel->setPaletteForegroundColor(black);
-	connect(b_cancel, SIGNAL(clicked()), SLOT(slotReject()));
+	connect(b_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(slotReject()));
 
 	l->addWidget(t_message);
 	l->addWidget(bottomBox);
 
 	// init time checker
 	_checkTimer = new TQTimer(this);
-	connect(_checkTimer, SIGNAL(timeout()), SLOT(slotCheckTime()));
+	connect(_checkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCheckTime()));
 	_checkTimer->start(500);
 
 	setFixedSize(sizeHint());
diff --git a/kshutdown/msettingsdialog.cpp b/kshutdown/msettingsdialog.cpp
index cf187ff..cc89194 100644
--- a/kshutdown/msettingsdialog.cpp
+++ b/kshutdown/msettingsdialog.cpp
@@ -79,10 +79,10 @@ MSettingsDialog::MSettingsDialog(TQWidget *parent)
 
 	_configDialogManager = new TDEConfigDialogManager(this, kshutdownrc);
 	_configDialogManager->updateWidgets();
-	connect(_configDialogManager, SIGNAL(widgetModified()), SLOT(slotConfigChanged()));
+	connect(_configDialogManager, TQ_SIGNAL(widgetModified()), TQ_SLOT(slotConfigChanged()));
 
-	connect(this, SIGNAL(applyClicked()), SLOT(slotOKClicked()));
-	connect(this, SIGNAL(okClicked()), SLOT(slotOKClicked()));
+	connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotOKClicked()));
+	connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotOKClicked()));
 
 	// lock after login
 	c_autoLock->setChecked(TQFile::exists(TDEGlobalSettings::autostartPath() + "/kshutdown-autolock.desktop"));
@@ -156,22 +156,22 @@ void MSettingsDialog::initActionsPage()
 	_shutDownItem = new TDEListViewItem(_actions, ks_actions->getName(Action::ShutDown));
 	_shutDownItem->setPixmap(0, ks_actions->getIcon(Action::ShutDown));
 
-	connect(_actions, SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), SLOT(slotEditAction()));
-	connect(_actions, SIGNAL(spacePressed(TQListViewItem *)), SLOT(slotEditAction()));
+	connect(_actions, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(slotEditAction()));
+	connect(_actions, TQ_SIGNAL(spacePressed(TQListViewItem *)), TQ_SLOT(slotEditAction()));
 	// edit action
 	KPushButton *b_editAction = new KPushButton(SmallIcon("edit"), i18n("Edit..."), gb_general, "KPushButton::b_editAction");
-	connect(b_editAction, SIGNAL(clicked()), SLOT(slotEditAction()));
+	connect(b_editAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditAction()));
 	// check system configuration
 	KPushButton *b_checkSystemConfig = new KPushButton(SmallIcon("button_ok"), i18n("Check System Configuration"), gb_general, "KPushButton::b_checkSystemConfig");
-	connect(b_checkSystemConfig, SIGNAL(clicked()), SLOT(slotCheckSystemConfig()));
+	connect(b_checkSystemConfig, TQ_SIGNAL(clicked()), TQ_SLOT(slotCheckSystemConfig()));
 
 	TQVGroupBox *gb_extras = new TQVGroupBox(i18n("Extras Menu"), _actionsPage);
 	KPushButton *b_modifyExtras = new KPushButton(SmallIcon("edit"), i18n("Modify..."), gb_extras, "KPushButton::b_modifyExtras");
 	if (!ks_actions->isEnabled(Action::Extras))
 		gb_extras->hide();
 	connect(
-		b_modifyExtras, SIGNAL(clicked()),
-		ks_extras, SLOT(slotModify()));
+		b_modifyExtras, TQ_SIGNAL(clicked()),
+		ks_extras, TQ_SLOT(slotModify()));
 
 	l->addWidget(gb_general);
 	l->addStretch();
@@ -189,7 +189,7 @@ void MSettingsDialog::initAdvancedPage()
 	// after login
 	TQVGroupBox *gb_afterLogin = new TQVGroupBox(i18n("After Login"), _advancedPage);
 	c_autoLock = new TQCheckBox(i18n("Lock screen"), gb_afterLogin);
-	connect(c_autoLock, SIGNAL(clicked()), SLOT(slotConfigChanged()));
+	connect(c_autoLock, TQ_SIGNAL(clicked()), TQ_SLOT(slotConfigChanged()));
 
 	// cd tray close
 	TQVGroupBox *gb_cdTrayClose = new TQVGroupBox(i18n("Before Logout"), _advancedPage);
@@ -201,12 +201,12 @@ void MSettingsDialog::initAdvancedPage()
 	KLineEdit *in_cdTrayCloseCommand = new KLineEdit(cdTrayCloseBox, "kcfg_cd_tray_close_command");
 	l_cdTrayCloseCommand->setBuddy(in_cdTrayCloseCommand);
 	connect(
-		c_cdTrayClose, SIGNAL(toggled(bool)),
-		in_cdTrayCloseCommand, SLOT(setEnabled(bool)));
+		c_cdTrayClose, TQ_SIGNAL(toggled(bool)),
+		in_cdTrayCloseCommand, TQ_SLOT(setEnabled(bool)));
 
 	// kde settings
 	KPushButton *b_kdeSettings = new KPushButton(SmallIcon("misc"), i18n("Related TDE Settings..."), _advancedPage, "KPushButton::b_kdeSettings");
-	connect(b_kdeSettings, SIGNAL(clicked()), SLOT(slotKDESettings()));
+	connect(b_kdeSettings, TQ_SIGNAL(clicked()), TQ_SLOT(slotKDESettings()));
 
 	l->addWidget(gb_afterLogin);
 	l->addWidget(gb_cdTrayClose);
@@ -224,11 +224,11 @@ void MSettingsDialog::initGeneralPage()
 
 	KURLLabel *ul_shutDownProblem = new KURLLabel(gb_problems);
 	ul_shutDownProblem->setText(i18n("\"Turn Off Computer\" does not work"));
-	connect(ul_shutDownProblem, SIGNAL(leftClickedURL()), SLOT(slotShutDownProblem()));
+	connect(ul_shutDownProblem, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(slotShutDownProblem()));
 
 	KURLLabel *ul_trayMessageProblem = new KURLLabel(gb_problems);
 	ul_trayMessageProblem->setText(i18n("Popup messages are very annoying"));
-	connect(ul_trayMessageProblem, SIGNAL(leftClickedURL()), SLOT(slotTrayMessageProblem()));
+	connect(ul_trayMessageProblem, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(slotTrayMessageProblem()));
 
 	// links
 	TQVGroupBox *gb_links = new TQVGroupBox(i18n("Add/Remove Links"), _generalPage);
@@ -258,12 +258,12 @@ void MSettingsDialog::initGeneralPage()
 			MTip *t_karamba = new MTip(MTip::Info, _generalPage);
 /* TODO: 2.0: superkaramba integration
 			t_karamba->disconnect(
-				t_karamba, SIGNAL(linkClicked(const TQString &)),
-				t_karamba, SLOT(openLink(const TQString &))
+				t_karamba, TQ_SIGNAL(linkClicked(const TQString &)),
+				t_karamba, TQ_SLOT(openLink(const TQString &))
 			);
 			t_karamba->connect(
-				t_karamba, SIGNAL(linkClicked(const TQString &)),
-				this, SLOT(slotOpenKarambaLink(const TQString &))
+				t_karamba, TQ_SIGNAL(linkClicked(const TQString &)),
+				this, TQ_SLOT(slotOpenKarambaLink(const TQString &))
 			);
 */
 			karambaThemes = karambaThemes.left(i);
@@ -298,7 +298,7 @@ void MSettingsDialog::initMessagesPage()
 	in_warningMessageDelay->setSuffix(" " + i18n("minute(s)"));
 	in_warningMessageDelay->setRange(1, 60, 1, true);
 	KPushButton *b_warningMessageTest = new KPushButton(KStdGuiItem::test(), w_warning, "KPushButton::b_warningMessageTest");
-	connect(b_warningMessageTest, SIGNAL(clicked()), SLOT(slotWarningMessageTest()));
+	connect(b_warningMessageTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotWarningMessageTest()));
 
 	TQLabel *l_warningText = new TQLabel(i18n("Recommended"), w_warning);
 	l_warningText->setFont(TQFont(l_warningText->font().family(), l_warningText->font().pointSize(), TQFont::Bold));
@@ -332,12 +332,12 @@ void MSettingsDialog::initMessagesPage()
 
 	KPushButton *b_customMessagePresets = new KPushButton(i18n("Presets"), w_customMessage, "KPushButton::b_customMessagePresets");
 	TDEPopupMenu *pm_customMessagePresets = new TDEPopupMenu(b_customMessagePresets);
-	pm_customMessagePresets->insertItem("KDialog", this, SLOT(slotSetKDialogCustomMessage()));
-	pm_customMessagePresets->insertItem("Amor", this, SLOT(slotSetAmorCustomMessage()));
+	pm_customMessagePresets->insertItem("KDialog", this, TQ_SLOT(slotSetKDialogCustomMessage()));
+	pm_customMessagePresets->insertItem("Amor", this, TQ_SLOT(slotSetAmorCustomMessage()));
 	b_customMessagePresets->setPopup(pm_customMessagePresets);
 
 	KPushButton *b_testCustomMessage = new KPushButton(KStdGuiItem::test(), w_customMessage, "KPushButton::b_testCustomMessage");
-	connect(b_testCustomMessage, SIGNAL(clicked()), SLOT(slotCustomMessageTest()));
+	connect(b_testCustomMessage, TQ_SIGNAL(clicked()), TQ_SLOT(slotCustomMessageTest()));
 	l_customMessage->addWidget(c_customMessageEnabled);
 	l_customMessage->addWidget(l_customMessageCommand);
 	l_customMessage->addWidget(in_customMessageCommand);
@@ -359,7 +359,7 @@ void MSettingsDialog::initMessagesPage()
 			"<b>Do not show this message again</b> feature."
 		))
 	);
-	connect(b_enableAllMessages, SIGNAL(clicked()), SLOT(slotEnableAllMessages()));
+	connect(b_enableAllMessages, TQ_SIGNAL(clicked()), TQ_SLOT(slotEnableAllMessages()));
 
 	l->addWidget(t_messages);
 	l->addWidget(w_progressBar);
@@ -367,20 +367,20 @@ void MSettingsDialog::initMessagesPage()
 	l->addWidget(b_enableAllMessages);
 
 	connect(
-		c_warningMessageEnabled, SIGNAL(toggled(bool)),
-		in_warningMessageDelay, SLOT(setEnabled(bool)));
+		c_warningMessageEnabled, TQ_SIGNAL(toggled(bool)),
+		in_warningMessageDelay, TQ_SLOT(setEnabled(bool)));
 	connect(
-		c_warningMessageEnabled, SIGNAL(toggled(bool)),
-		b_warningMessageTest, SLOT(setEnabled(bool)));
+		c_warningMessageEnabled, TQ_SIGNAL(toggled(bool)),
+		b_warningMessageTest, TQ_SLOT(setEnabled(bool)));
 	connect(
-		c_customMessageEnabled, SIGNAL(toggled(bool)),
-		in_customMessageCommand, SLOT(setEnabled(bool)));
+		c_customMessageEnabled, TQ_SIGNAL(toggled(bool)),
+		in_customMessageCommand, TQ_SLOT(setEnabled(bool)));
 	connect(
-		c_customMessageEnabled, SIGNAL(toggled(bool)),
-		b_customMessagePresets, SLOT(setEnabled(bool)));
+		c_customMessageEnabled, TQ_SIGNAL(toggled(bool)),
+		b_customMessagePresets, TQ_SLOT(setEnabled(bool)));
 	connect(
-		c_customMessageEnabled, SIGNAL(toggled(bool)),
-		b_testCustomMessage, SLOT(setEnabled(bool)));
+		c_customMessageEnabled, TQ_SIGNAL(toggled(bool)),
+		b_testCustomMessage, TQ_SLOT(setEnabled(bool)));
 }
 
 Action::Type MSettingsDialog::itemToActionType(const TDEListViewItem *item) const
diff --git a/kshutdown/mstatstab.cpp b/kshutdown/mstatstab.cpp
index 3cf277c..8305fbf 100644
--- a/kshutdown/mstatstab.cpp
+++ b/kshutdown/mstatstab.cpp
@@ -50,8 +50,8 @@ MStatsTab::MStatsTab()
 	_buf(TQString::null)
 {
 	_process = new TQProcess(this);
-	connect(_process, SIGNAL(processExited()), SLOT(slotProcessExit()));
-	connect(_process, SIGNAL(readyReadStdout()), SLOT(slotReadStdout()));
+	connect(_process, TQ_SIGNAL(processExited()), TQ_SLOT(slotProcessExit()));
+	connect(_process, TQ_SIGNAL(readyReadStdout()), TQ_SLOT(slotReadStdout()));
 
 	TQVBox *main = new TQVBox(this);
 	setMainWidget(main);
@@ -77,20 +77,20 @@ MStatsTab::MStatsTab()
 	TQHBox *buttons = new TQHBox(main);
 	// refresh
 	b_refresh = new KPushButton(SmallIcon("reload"), i18n("Refresh"), buttons, "KPushButton::b_refresh");
-	connect(b_refresh, SIGNAL(clicked()), SLOT(slotRefresh()));
+	connect(b_refresh, TQ_SIGNAL(clicked()), TQ_SLOT(slotRefresh()));
 
 	// options
 	TQVGroupBox *options = new TQVGroupBox(i18n("Options"), main);
 	// long format
 	c_longFormat = new TQCheckBox(i18n("More information"), options);
 	c_longFormat->setChecked(kshutdownrc->statsLongFormat);
-	connect(c_longFormat, SIGNAL(clicked()), SLOT(slotRefresh()));
+	connect(c_longFormat, TQ_SIGNAL(clicked()), TQ_SLOT(slotRefresh()));
 	MiscUtils::setHint(c_longFormat, i18n("Show login time, JCPU and PCPU times."));
 	// toggle from field
 	c_toggleFromField = new TQCheckBox(i18n("Toggle \"FROM\""), options);
 	c_toggleFromField->setChecked(kshutdownrc->statsToggleFromField);
 	MiscUtils::setHint(c_toggleFromField, i18n("Toggle the \"FROM\" (remote hostname) field."));
-	connect(c_toggleFromField, SIGNAL(clicked()), SLOT(slotRefresh()));
+	connect(c_toggleFromField, TQ_SIGNAL(clicked()), TQ_SLOT(slotRefresh()));
 
 	setButtonGuiItem(Details, KStdGuiItem::configure());
 	setDetailsWidget(options);
diff --git a/kshutdown/msystemtray.cpp b/kshutdown/msystemtray.cpp
index de84c53..35bb06e 100644
--- a/kshutdown/msystemtray.cpp
+++ b/kshutdown/msystemtray.cpp
@@ -140,11 +140,11 @@ MSystemTray::MSystemTray()
 
 	// init fade timer
 	_fadeTimer = new TQTimer(this);
-	connect(_fadeTimer, SIGNAL(timeout()), SLOT(slotFade()));
+	connect(_fadeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFade()));
 
 	// init flash timer
 	_flashTimer = new TQTimer(this);
-	connect(_flashTimer, SIGNAL(timeout()), SLOT(slotFlashTimeout()));
+	connect(_flashTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFlashTimeout()));
 
 	// init icons
 	KPixmap pm(SmallIcon("system-log-out", TDEIcon::SizeSmallMedium));
@@ -168,8 +168,8 @@ MSystemTray::MSystemTray()
 
 	// quit signal
 	connect(
-		this, SIGNAL(quitSelected()),
-		ks_main, SLOT(slotQuit()));
+		this, TQ_SIGNAL(quitSelected()),
+		ks_main, TQ_SLOT(slotQuit()));
 }
 
 // private slots
diff --git a/kshutdown/progressbar.cpp b/kshutdown/progressbar.cpp
index cd412a9..2421136 100644
--- a/kshutdown/progressbar.cpp
+++ b/kshutdown/progressbar.cpp
@@ -96,11 +96,11 @@ void ProgressBar::mousePressEvent(TQMouseEvent *e) {
 		// show popup menu
 		TDEPopupMenu *popup = new TDEPopupMenu(this);
 		popup->insertTitle(kapp->miniIcon(), "KShutDown");
-		popup->insertItem(i18n("Hide"), this, SLOT(hide()));
+		popup->insertItem(i18n("Hide"), this, TQ_SLOT(hide()));
 		popup->insertTitle("Position");
-		int topPositionItem = popup->insertItem(i18n("Top"), this, SLOT(slotSetTopPosition()));
+		int topPositionItem = popup->insertItem(i18n("Top"), this, TQ_SLOT(slotSetTopPosition()));
 		popup->setItemChecked(topPositionItem, _position == TOP);
-		int bottomPositionItem = popup->insertItem(i18n("Bottom"), this, SLOT(slotSetBottomPosition()));
+		int bottomPositionItem = popup->insertItem(i18n("Bottom"), this, TQ_SLOT(slotSetBottomPosition()));
 		popup->setItemChecked(bottomPositionItem, _position == BOTTOM);
 		popup->popup(e->globalPos());
 		e->accept();
diff --git a/kshutdown/systemconfig.cpp b/kshutdown/systemconfig.cpp
index 60cfb99..c563e0e 100644
--- a/kshutdown/systemconfig.cpp
+++ b/kshutdown/systemconfig.cpp
@@ -84,8 +84,8 @@ SystemConfig::SystemConfig(TQWidget *parent)
 	_messages->addColumn("");
 	_messages->addColumn(i18n("Message"));
 	_messages->header()->setClickEnabled(false);
-	connect(_messages, SIGNAL(executed(TQListViewItem *)), SLOT(slotExecuted(TQListViewItem *)));
-	connect(_messages, SIGNAL(spacePressed(TQListViewItem *)), SLOT(slotExecuted(TQListViewItem *)));
+	connect(_messages, TQ_SIGNAL(executed(TQListViewItem *)), TQ_SLOT(slotExecuted(TQListViewItem *)));
+	connect(_messages, TQ_SIGNAL(spacePressed(TQListViewItem *)), TQ_SLOT(slotExecuted(TQListViewItem *)));
 	setMainWidget(_messages);
 
 	_shutdownAllowItem = add(Info, i18n("Tip: Click here if you have problem with the \"/sbin/shutdown\" command."));
diff --git a/kshutdownlockout/lockout.cpp b/kshutdownlockout/lockout.cpp
index 419a1ad..c7fc64e 100644
--- a/kshutdownlockout/lockout.cpp
+++ b/kshutdownlockout/lockout.cpp
@@ -99,7 +99,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
 	button->setPopupDelay(100);
 	button->setMinimumSize(button->pixmap()->size());
 	button->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
-	connect(button, SIGNAL(clicked()), this, SLOT(slotShowKShutDown()));
+	connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotShowKShutDown()));
 
 	button->setPopup(pm_actions);
 	layout->addWidget(button);
@@ -111,7 +111,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
 */
 	if (!kapp->dcopClient()->isAttached())
 		kapp->dcopClient()->attach();
-	connect(kapp, SIGNAL(iconChanged(int)), SLOT(slotIconChanged()));
+	connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged()));
 
 	TQToolTip::add(
 		this,
@@ -163,25 +163,25 @@ void Lockout::initActions() {
 
 	_lockScreenAction = new TDEAction(
 		i18n("Lock Screen"), "system-lock-screen", TDEShortcut(),
-		this, SLOT(slotLockScreen()),
+		this, TQ_SLOT(slotLockScreen()),
 		ac_shutDown, "kshutdown_lockscreen"
 	);
 
 	_logoutAction = new TDEAction(
 		i18n("End Current Session"), "edit-undo", TDEShortcut(),
-		this, SLOT(slotLogout()),
+		this, TQ_SLOT(slotLogout()),
 		ac_shutDown, "kshutdown_logout"
 	);
 
 	_rebootAction = new TDEAction(
 		i18n("Restart Computer"), "reload", TDEShortcut(),
-		this, SLOT(slotReboot()),
+		this, TQ_SLOT(slotReboot()),
 		ac_shutDown, "kshutdown_reboot"
 	);
 
 	_shutDownAction = new TDEAction(
 		i18n("Turn Off Computer"), "system-log-out", TDEShortcut(),
-		this, SLOT(slotShutDown()),
+		this, TQ_SLOT(slotShutDown()),
 		ac_shutDown, "kshutdown_shutdown"
 	);
 
@@ -189,7 +189,7 @@ void Lockout::initActions() {
 
 	_configureKShutDownAction = new TDEAction(
 		i18n("&Configure KShutDown..."), "configure", TDEShortcut(),
-		this, SLOT(slotConfigureKShutDown()),
+		this, TQ_SLOT(slotConfigureKShutDown()),
 		ac_shutDown, "options_configure"
 	);
 }