Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 3b3f9ec8f31978030c17309fae48335bea5c1587)

1 files changed, 18 insertions, 18 deletions

diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index f439d609d..38cd56034 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -263,7 +263,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	// Run-on-demand radio button
 	mRunOnDemand = new TQRadioButton(i18n("&Run only on demand"), group, "runDemand");
 	mRunOnDemand->setFixedSize(mRunOnDemand->sizeHint());
-	connect(mRunOnDemand, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool)));
+	connect(mRunOnDemand, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRunModeToggled(bool)));
 	TQWhatsThis::add(mRunOnDemand,
 	      i18n("Check to run KAlarm only when required.\n\n"
 	           "Notes:\n"
@@ -274,7 +274,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	// Run-in-system-tray radio button
 	mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray");
 	mRunInSystemTray->setFixedSize(mRunInSystemTray->sizeHint());
-	connect(mRunInSystemTray, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool)));
+	connect(mRunInSystemTray, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRunModeToggled(bool)));
 	TQWhatsThis::add(mRunInSystemTray,
 	      i18n("Check to run KAlarm continuously in the TDE system tray.\n\n"
 	           "Notes:\n"
@@ -286,7 +286,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	// Run continuously options
 	mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl");
 	mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->sizeHint());
-	connect(mDisableAlarmsIfStopped, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableIfStoppedToggled(bool)));
+	connect(mDisableAlarmsIfStopped, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDisableIfStoppedToggled(bool)));
 	TQWhatsThis::add(mDisableAlarmsIfStopped,
 	      i18n("Check to disable alarms whenever KAlarm is not running. Alarms will only appear while the system tray icon is visible."));
 	grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment);
@@ -299,14 +299,14 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 
 	mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray");
 #ifdef AUTOSTART_BY_KALARMD
-	connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool)));
+	connect(mAutostartTrayIcon, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutostartToggled(bool)));
 #endif
 	grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment);
 
 	// Autostart alarm daemon
 	mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon");
 	mAutostartDaemon->setFixedSize(mAutostartDaemon->sizeHint());
-	connect(mAutostartDaemon, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutostartDaemonClicked()));
+	connect(mAutostartDaemon, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutostartDaemonClicked()));
 	TQWhatsThis::add(mAutostartDaemon,
 	      i18n("Automatically start alarm monitoring whenever you start TDE, by running the alarm daemon (%1).\n\n"
 	           "This option should always be checked unless you intend to discontinue use of KAlarm.")
@@ -346,7 +346,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
 	mKeepExpired = new TQCheckBox(i18n("Keep alarms after e&xpiry"), group, "keepExpired");
 	mKeepExpired->setFixedSize(mKeepExpired->sizeHint());
-	connect(mKeepExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool)));
+	connect(mKeepExpired, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotExpiredToggled(bool)));
 	TQWhatsThis::add(mKeepExpired,
 	      i18n("Check to store alarms after expiry or deletion (except deleted alarms which were never triggered)."));
 	grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment);
@@ -355,7 +355,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	box->setSpacing(KDialog::spacingHint());
 	mPurgeExpired = new TQCheckBox(i18n("Discard ex&pired alarms after:"), box, "purgeExpired");
 	mPurgeExpired->setMinimumSize(mPurgeExpired->sizeHint());
-	connect(mPurgeExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool)));
+	connect(mPurgeExpired, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotExpiredToggled(bool)));
 	mPurgeAfter = new SpinBox(box);
 	mPurgeAfter->setMinValue(1);
 	mPurgeAfter->setLineShiftStep(10);
@@ -369,7 +369,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 
 	mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group);
 	mClearExpired->setFixedSize(mClearExpired->sizeHint());
-	connect(mClearExpired, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearExpired()));
+	connect(mClearExpired, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearExpired()));
 	TQWhatsThis::add(mClearExpired,
 	      i18n("Delete all existing expired alarms."));
 	grid->addWidget(mClearExpired, 3, 1, alignment);
@@ -413,7 +413,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, TQt::AlignAuto);
 	TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box);
 	radio->setFixedSize(radio->sizeHint());
-	connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool)));
+	connect(radio, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotOtherTerminalToggled(bool)));
 	mXtermType->insert(radio, mXtermCount);
 	if (mXtermFirst < 0)
 		mXtermFirst = mXtermCount;   // note the id of the first button
@@ -609,7 +609,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	radio = new RadioButton(i18n("&Sendmail"), box, "sendmail");
 	radio->setMinimumSize(radio->sizeHint());
 	mEmailClient->insert(radio, Preferences::SENDMAIL);
-	connect(mEmailClient, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotEmailClientChanged(int)));
+	connect(mEmailClient, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotEmailClientChanged(int)));
 	box->setFixedHeight(box->sizeHint().height());
 	TQWhatsThis::add(box,
 	      i18n("Choose how to send email when an email alarm is triggered.\n"
@@ -637,7 +637,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	grid->addWidget(label, 1, 0);
 	mFromAddressGroup = new ButtonGroup(group);
 	mFromAddressGroup->hide();
-	connect(mFromAddressGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotFromAddrChanged(int)));
+	connect(mFromAddressGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotFromAddrChanged(int)));
 
 	// Line edit to enter a 'From' email address
 	radio = new RadioButton(group);
@@ -646,7 +646,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	label->setBuddy(radio);
 	grid->addWidget(radio, 1, 1);
 	mEmailAddress = new TQLineEdit(group);
-	connect(mEmailAddress, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotAddressChanged()));
+	connect(mEmailAddress, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotAddressChanged()));
 	TQString whatsThis = i18n("Your email address, used to identify you as the sender when sending email alarms.");
 	TQWhatsThis::add(radio, whatsThis);
 	TQWhatsThis::add(mEmailAddress, whatsThis);
@@ -678,7 +678,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	grid->addWidget(label, 5, 0);
 	mBccAddressGroup = new ButtonGroup(group);
 	mBccAddressGroup->hide();
-	connect(mBccAddressGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotBccAddrChanged(int)));
+	connect(mBccAddressGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotBccAddrChanged(int)));
 
 	// Line edit to enter a 'Bcc' email address
 	radio = new RadioButton(group);
@@ -962,7 +962,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	mSoundFileBrowse = new TQPushButton(box);
 	mSoundFileBrowse->setPixmap(SmallIcon("document-open"));
 	mSoundFileBrowse->setFixedSize(mSoundFileBrowse->sizeHint());
-	connect(mSoundFileBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowseSoundFile()));
+	connect(mSoundFileBrowse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowseSoundFile()));
 	TQToolTip::add(mSoundFileBrowse, i18n("Choose a sound file"));
 	TQWhatsThis::add(box,
 	      i18n("Enter the default sound file to use in the alarm edit dialog."));
@@ -1201,7 +1201,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 
 	mTooltipShowAlarms = new TQCheckBox(i18n("Show next &24 hours' alarms"), group, "tooltipShow");
 	mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->sizeHint());
-	connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool)));
+	connect(mTooltipShowAlarms, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipAlarmsToggled(bool)));
 	TQWhatsThis::add(mTooltipShowAlarms,
 	      i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours"));
 	grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, TQt::AlignAuto);
@@ -1210,7 +1210,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	box->setSpacing(KDialog::spacingHint());
 	mTooltipMaxAlarms = new TQCheckBox(i18n("Ma&ximum number of alarms to show:"), box, "tooltipMax");
 	mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->sizeHint());
-	connect(mTooltipMaxAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipMaxToggled(bool)));
+	connect(mTooltipMaxAlarms, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipMaxToggled(bool)));
 	mTooltipMaxAlarmCount = new SpinBox(1, 99, 1, box);
 	mTooltipMaxAlarmCount->setLineShiftStep(5);
 	mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->sizeHint());
@@ -1221,14 +1221,14 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 
 	mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime");
 	mTooltipShowTime->setMinimumSize(mTooltipShowTime->sizeHint());
-	connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool)));
+	connect(mTooltipShowTime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipTimeToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTime,
 	      i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due"));
 	grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, TQt::AlignAuto);
 
 	mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo");
 	mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->sizeHint());
-	connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool)));
+	connect(mTooltipShowTimeTo, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipTimeToToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTimeTo,
 	      i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due"));
 	grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, TQt::AlignAuto);