Rename obsolete tq methods to standard names

1 files changed, 25 insertions, 25 deletions

diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 3cde076b7..b41740941 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -233,7 +233,7 @@ PrefsTabBase::PrefsTabBase(TQVBox* frame)
 	  mPage(frame)
 {
 	if (!mIndentWidth)
-		mIndentWidth = tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, this).width();
+		mIndentWidth = style().subRect(TQStyle::SR_RadioButtonIndicator, this).width();
 }
 
 void PrefsTabBase::apply(bool syncToDisc)
@@ -826,9 +826,9 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame)
 	mPage->setStretchFactor(mFontChooser, 1);
 
 	TQFrame* layoutBox = new TQFrame(mPage);
-	TQHBoxLayout* htqlayout = new TQHBoxLayout(layoutBox);
-	TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
-	htqlayout->addStretch();
+	TQHBoxLayout* hlayout = new TQHBoxLayout(layoutBox);
+	TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
+	hlayout->addStretch();
 
 	TQHBox* box = new TQHBox(layoutBox);    // to group widgets for TQWhatsThis text
 	box->setSpacing(KDialog::spacingHint()/2);
@@ -897,22 +897,22 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 
 	// DISPLAY ALARMS
 	TQGroupBox* group = new TQGroupBox(i18n("Display Alarms"), mPage);
-	TQBoxLayout* tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
-	tqlayout->addSpacing(groupTopMargin);
+	TQBoxLayout* layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
+	layout->addSpacing(groupTopMargin);
 
 	mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck");
 	mConfirmAck->setMinimumSize(mConfirmAck->sizeHint());
 	TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck()));
-	tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto);
+	layout->addWidget(mConfirmAck, 0, TQt::AlignAuto);
 
 	mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose");
 	mAutoClose->setMinimumSize(mAutoClose->sizeHint());
 	TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin()));
-	tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto);
+	layout->addWidget(mAutoClose, 0, TQt::AlignAuto);
 
 	TQHBox* box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	TQLabel* label = new TQLabel(i18n("Reminder &units:"), box);
 	label->setFixedSize(label->sizeHint());
 	mReminderUnits = new TQComboBox(box, "defWarnUnits");
@@ -931,10 +931,10 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 
 	// SOUND
 	TQButtonGroup* bgroup = new TQButtonGroup(SoundPicker::i18n_Sound(), mPage, "soundGroup");
-	tqlayout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint());
-	tqlayout->addSpacing(groupTopMargin);
+	layout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint());
+	layout->addSpacing(groupTopMargin);
 
-	TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+	TQBoxLayout* hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
 	mSound = new TQComboBox(false, bgroup, "defSound");
 	mSound->insertItem(SoundPicker::i18n_None());         // index 0
 	mSound->insertItem(SoundPicker::i18n_Beep());         // index 1
@@ -943,14 +943,14 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 		mSound->insertItem(SoundPicker::i18n_Speak());  // index 3
 	mSound->setMinimumSize(mSound->sizeHint());
 	TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound()));
-	htqlayout->addWidget(mSound);
-	htqlayout->addStretch(1);
+	hlayout->addWidget(mSound);
+	hlayout->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.").arg(SoundDlg::i18n_Repeat()));
-	htqlayout->addWidget(mSoundRepeat);
+	hlayout->addWidget(mSoundRepeat);
 #endif
 
 	box = new TQHBox(bgroup);   // this is to control the TQWhatsThis text display area
@@ -967,36 +967,36 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	TQWhatsThis::add(box,
 	      i18n("Enter the default sound file to use in the alarm edit dialog."));
 	box->setFixedHeight(box->sizeHint().height());
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	bgroup->setFixedHeight(bgroup->sizeHint().height());
 
 	// COMMAND ALARMS
 	group = new TQGroupBox(i18n("Command Alarms"), mPage);
-	tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
-	tqlayout->addSpacing(groupTopMargin);
-	tqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+	layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
+	layout->addSpacing(groupTopMargin);
+	layout = new TQHBoxLayout(layout, KDialog::spacingHint());
 
 	mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript");
 	mCmdScript->setMinimumSize(mCmdScript->sizeHint());
 	TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript()));
-	tqlayout->addWidget(mCmdScript);
-	tqlayout->addStretch();
+	layout->addWidget(mCmdScript);
+	layout->addStretch();
 
 	mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm");
 	mCmdXterm->setMinimumSize(mCmdXterm->sizeHint());
 	TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow()));
-	tqlayout->addWidget(mCmdXterm);
+	layout->addWidget(mCmdXterm);
 
 	// EMAIL ALARMS
 	group = new TQGroupBox(i18n("Email Alarms"), mPage);
-	tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
-	tqlayout->addSpacing(groupTopMargin);
+	layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
+	layout->addSpacing(groupTopMargin);
 
 	// BCC email to sender
 	mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc");
 	mEmailBcc->setMinimumSize(mEmailBcc->sizeHint());
 	TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf()));
-	tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto);
+	layout->addWidget(mEmailBcc, 0, TQt::AlignAuto);
 
 	// MISCELLANEOUS
 	// Show in KOrganizer