Remove additional unneeded tq method conversions

1 files changed, 33 insertions, 33 deletions

diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index e259f3e56..3cde076b7 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -250,8 +250,8 @@ void PrefsTabBase::apply(bool syncToDisc)
 MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
-	// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-	int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
+	// Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+	int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
 
 	TQGroupBox* group = new TQButtonGroup(i18n("Run Mode"), mPage, "modeGroup");
 	TQGridLayout* grid = new TQGridLayout(group, 6, 2, KDialog::marginHint(), KDialog::spacingHint());
@@ -269,7 +269,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	           "Notes:\n"
 	           "1. Alarms are displayed even when KAlarm is not running, since alarm monitoring is done by the alarm daemon.\n"
 	           "2. With this option selected, the system tray icon can be displayed or hidden independently of KAlarm."));
-	grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, tqalignment);
+	grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, alignment);
 
 	// Run-in-system-tray radio button
 	mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray");
@@ -281,7 +281,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	           "1. With this option selected, closing the system tray icon will quit KAlarm.\n"
 	           "2. You do not need to select this option in order for alarms to be displayed, since alarm monitoring is done by the alarm daemon."
 	           " Running in the system tray simply provides easy access and a status indication."));
-	grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, tqalignment);
+	grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, alignment);
 
 	// Run continuously options
 	mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl");
@@ -289,19 +289,19 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	connect(mDisableAlarmsIfStopped, TQT_SIGNAL(toggled(bool)), TQT_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, tqalignment);
+	grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment);
 
 	mQuitWarn = new TQCheckBox(i18n("Warn before &quitting"), group, "disableAl");
 	mQuitWarn->setFixedSize(mQuitWarn->sizeHint());
 	TQWhatsThis::add(mQuitWarn,
 	      i18n("Check to display a warning prompt before quitting KAlarm."));
-	grid->addWidget(mQuitWarn, 4, 2, tqalignment);
+	grid->addWidget(mQuitWarn, 4, 2, alignment);
 
 	mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray");
 #ifdef AUTOSTART_BY_KALARMD
 	connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool)));
 #endif
-	grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, tqalignment);
+	grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment);
 
 	// Autostart alarm daemon
 	mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon");
@@ -310,8 +310,8 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	TQWhatsThis::add(mAutostartDaemon,
 	      i18n("Automatically start alarm monitoring whenever you start KDE, by running the alarm daemon (%1).\n\n"
 	           "This option should always be checked unless you intend to discontinue use of KAlarm.")
-	          .tqarg(TQString::fromLatin1(DAEMON_APP_NAME)));
-	grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, tqalignment);
+	          .arg(TQString::fromLatin1(DAEMON_APP_NAME)));
+	grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, alignment);
 
 	group->setFixedHeight(group->sizeHint().height());
 
@@ -325,7 +325,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	label->setBuddy(mStartOfDay);
 	static const TQString startOfDayText = i18n("The earliest time of day at which a date-only alarm (i.e. "
 	                                           "an alarm with \"any time\" specified) will be triggered.");
-	TQWhatsThis::add(box, TQString("%1\n\n%2").tqarg(startOfDayText).tqarg(TimeSpinBox::shiftWhatsThis()));
+	TQWhatsThis::add(box, TQString("%1\n\n%2").arg(startOfDayText).arg(TimeSpinBox::shiftWhatsThis()));
 	itemBox->setStretchFactor(new TQWidget(itemBox), 1);    // left adjust the controls
 	itemBox->setFixedHeight(box->sizeHint().height());
 
@@ -349,7 +349,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	connect(mKeepExpired, TQT_SIGNAL(toggled(bool)), TQT_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, tqalignment);
+	grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment);
 
 	box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
@@ -365,14 +365,14 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	mPurgeAfterLabel->setBuddy(mPurgeAfter);
 	TQWhatsThis::add(box,
 	      i18n("Uncheck to store expired alarms indefinitely. Check to enter how long expired alarms should be stored."));
-	grid->addWidget(box, 2, 1, tqalignment);
+	grid->addWidget(box, 2, 1, alignment);
 
 	mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group);
 	mClearExpired->setFixedSize(mClearExpired->sizeHint());
 	connect(mClearExpired, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearExpired()));
 	TQWhatsThis::add(mClearExpired,
 	      i18n("Delete all existing expired alarms."));
-	grid->addWidget(mClearExpired, 3, 1, tqalignment);
+	grid->addWidget(mClearExpired, 3, 1, alignment);
 	group->setFixedHeight(group->sizeHint().height());
 
 	// Terminal window to use for command alarms
@@ -404,7 +404,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 		cmd.replace("%w", "<command; sleep>");
 		cmd.replace("%C", "[command]");
 		cmd.replace("%W", "[command; sleep]");
-		TQWhatsThis::add(radio, whatsThis.tqarg(cmd));
+		TQWhatsThis::add(radio, whatsThis.arg(cmd));
 		grid->addWidget(radio, (row = index/3 + 1), index % 3, TQt::AlignAuto);
 		++index;
 	}
@@ -470,7 +470,7 @@ void MiscPrefTab::apply(bool syncToDisc)
 			if (KStandardDirs::findExe(cmd).isEmpty())
 			{
 				mXtermCommand->setFocus();
-				if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").tqarg(cmd))
+				if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").arg(cmd))
 				                != KMessageBox::Continue)
 					return;
 			}
@@ -618,10 +618,10 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	           "your system is configured to use sendmail or a sendmail compatible mail transport agent."));
 
 	box = new TQHBox(mPage);   // this is to allow left adjustment
-	mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()), box);
+	mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").arg(KAMail::i18n_sent_mail()), box);
 	mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->sizeHint());
 	TQWhatsThis::add(mEmailCopyToKMail,
-	      i18n("After sending an email, store a copy in KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()));
+	      i18n("After sending an email, store a copy in KMail's %1 folder").arg(KAMail::i18n_sent_mail()));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
 	box->setFixedHeight(box->sizeHint().height());
 
@@ -793,18 +793,18 @@ TQString EmailPrefTab::validate()
 
 TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const TQString& msg)
 {
-	TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").tqarg(msg);
+	TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").arg(msg);
 	switch (group->selectedId())
 	{
 		case Preferences::MAIL_FROM_CONTROL_CENTRE:
 			if (!KAMail::controlCentreAddress().isEmpty())
 				return TQString();
-			errmsg = i18n("No email address is currently set in the KDE Control Center. %1").tqarg(errmsg);
+			errmsg = i18n("No email address is currently set in the KDE Control Center. %1").arg(errmsg);
 			break;
 		case Preferences::MAIL_FROM_KMAIL:
 			if (KAMail::identitiesExist())
 				return TQString();
-			errmsg = i18n("No KMail identities currently exist. %1").tqarg(errmsg);
+			errmsg = i18n("No KMail identities currently exist. %1").arg(errmsg);
 			break;
 		case Preferences::MAIL_FROM_ADDR:
 			if (!addr->text().stripWhiteSpace().isEmpty())
@@ -887,9 +887,9 @@ void FontColourPrefTab::setDefaults()
 EditPrefTab::EditPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
-	// Get tqalignment to use in TQLabel::setAlignment(tqalignment | TQt::WordBreak)
+	// Get alignment to use in TQLabel::setAlignment(alignment | TQt::WordBreak)
 	// (AlignAuto doesn't work correctly there)
-	int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
+	int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
 
 	int groupTopMargin = fontMetrics().lineSpacing()/2;
 	TQString defsetting   = i18n("The default setting for \"%1\" in the alarm edit dialog.");
@@ -902,12 +902,12 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 
 	mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck");
 	mConfirmAck->setMinimumSize(mConfirmAck->sizeHint());
-	TQWhatsThis::add(mConfirmAck, defsetting.tqarg(EditAlarmDlg::i18n_ConfirmAck()));
+	TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck()));
 	tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto);
 
 	mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose");
 	mAutoClose->setMinimumSize(mAutoClose->sizeHint());
-	TQWhatsThis::add(mAutoClose, defsetting.tqarg(LateCancelSelector::i18n_AutoCloseWin()));
+	TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin()));
 	tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto);
 
 	TQHBox* box = new TQHBox(group);
@@ -942,14 +942,14 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	if (theApp()->speechEnabled())
 		mSound->insertItem(SoundPicker::i18n_Speak());  // index 3
 	mSound->setMinimumSize(mSound->sizeHint());
-	TQWhatsThis::add(mSound, defsetting.tqarg(SoundPicker::i18n_Sound()));
+	TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound()));
 	htqlayout->addWidget(mSound);
 	htqlayout->addStretch(1);
 
 #ifndef WITHOUT_ARTS
 	mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound");
 	mSoundRepeat->setMinimumSize(mSoundRepeat->sizeHint());
-	TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").tqarg(SoundDlg::i18n_Repeat()));
+	TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundDlg::i18n_Repeat()));
 	htqlayout->addWidget(mSoundRepeat);
 #endif
 
@@ -978,13 +978,13 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 
 	mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript");
 	mCmdScript->setMinimumSize(mCmdScript->sizeHint());
-	TQWhatsThis::add(mCmdScript, defsetting.tqarg(EditAlarmDlg::i18n_EnterScript()));
+	TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript()));
 	tqlayout->addWidget(mCmdScript);
 	tqlayout->addStretch();
 
 	mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm");
 	mCmdXterm->setMinimumSize(mCmdXterm->sizeHint());
-	TQWhatsThis::add(mCmdXterm, defsetting.tqarg(EditAlarmDlg::i18n_ExecInTermWindow()));
+	TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow()));
 	tqlayout->addWidget(mCmdXterm);
 
 	// EMAIL ALARMS
@@ -995,21 +995,21 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	// BCC email to sender
 	mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc");
 	mEmailBcc->setMinimumSize(mEmailBcc->sizeHint());
-	TQWhatsThis::add(mEmailBcc, defsetting.tqarg(EditAlarmDlg::i18n_CopyEmailToSelf()));
+	TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf()));
 	tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto);
 
 	// MISCELLANEOUS
 	// Show in KOrganizer
 	mCopyToKOrganizer = new TQCheckBox(EditAlarmDlg::i18n_g_ShowInKOrganizer(), mPage, "defShowKorg");
 	mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->sizeHint());
-	TQWhatsThis::add(mCopyToKOrganizer, defsetting.tqarg(EditAlarmDlg::i18n_ShowInKOrganizer()));
+	TQWhatsThis::add(mCopyToKOrganizer, defsetting.arg(EditAlarmDlg::i18n_ShowInKOrganizer()));
 
 	// Late cancellation
 	box = new TQHBox(mPage);
 	box->setSpacing(KDialog::spacingHint());
 	mLateCancel = new TQCheckBox(LateCancelSelector::i18n_n_CancelIfLate(), box, "defCancelLate");
 	mLateCancel->setMinimumSize(mLateCancel->sizeHint());
-	TQWhatsThis::add(mLateCancel, defsetting.tqarg(LateCancelSelector::i18n_CancelIfLate()));
+	TQWhatsThis::add(mLateCancel, defsetting.arg(LateCancelSelector::i18n_CancelIfLate()));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the control
 
 	// Recurrence
@@ -1035,7 +1035,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	TQVBox* vbox = new TQVBox(mPage);   // this is to control the TQWhatsThis text display area
 	vbox->setSpacing(KDialog::spacingHint());
 	label = new TQLabel(i18n("In non-leap years, repeat yearly February 29th alarms on:"), vbox);
-	label->setAlignment(tqalignment | TQt::WordBreak);
+	label->setAlignment(alignment | TQt::WordBreak);
 	itemBox = new TQHBox(vbox);
 	itemBox->setSpacing(2*KDialog::spacingHint());
 	mFeb29 = new TQButtonGroup(itemBox);
@@ -1179,7 +1179,7 @@ TQString EditPrefTab::validate()
 	if (mSound->currentItem() == SoundPicker::PLAY_FILE  &&  mSoundFile->text().isEmpty())
 	{
 		mSoundFile->setFocus();
-		return i18n("You must enter a sound file when %1 is selected as the default sound type").tqarg(SoundPicker::i18n_File());;
+		return i18n("You must enter a sound file when %1 is selected as the default sound type").arg(SoundPicker::i18n_File());;
 	}
 	return TQString();
 }