Rename obsolete tq methods to standard names

1 files changed, 33 insertions, 33 deletions

diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index 7df52956..b0da4471 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -230,9 +230,9 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup");
 	connect(mActionGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotAlarmTypeChanged(int)));
 	topLayout->addWidget(mActionGroup, 1);
-	TQBoxLayout* tqlayout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint());
-	tqlayout->addSpacing(fontMetrics().lineSpacing()/2);
-	TQGridLayout* grid = new TQGridLayout(tqlayout, 1, 5);
+	TQBoxLayout* layout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint());
+	layout->addSpacing(fontMetrics().lineSpacing()/2);
+	TQGridLayout* grid = new TQGridLayout(layout, 1, 5);
 
 	// Message radio button
 	mMessageRadio = new RadioButton(i18n("Te&xt"), mActionGroup, "messageButton");
@@ -266,11 +266,11 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	grid->addWidget(mEmailRadio, 1, 6);
 
 	initDisplayAlarms(mActionGroup);
-	tqlayout->addWidget(mDisplayAlarmsFrame);
+	layout->addWidget(mDisplayAlarmsFrame);
 	initCommand(mActionGroup);
-	tqlayout->addWidget(mCommandFrame);
+	layout->addWidget(mCommandFrame);
 	initEmail(mActionGroup);
-	tqlayout->addWidget(mEmailFrame);
+	layout->addWidget(mEmailFrame);
 
 	// Deferred date/time: visible only for a deferred recurring event.
 	mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
@@ -285,14 +285,14 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	TQWhatsThis::add(mDeferChangeButton, i18n("Change the alarm's deferred time, or cancel the deferral"));
 	mDeferGroup->addSpace(0);
 
-	tqlayout = new TQHBoxLayout(topLayout);
+	layout = new TQHBoxLayout(topLayout);
 
 	// Date and time entry
 	if (mTemplate)
 	{
 		mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup");
 		connect(mTemplateTimeGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotTemplateTimeType(int)));
-		tqlayout->addWidget(mTemplateTimeGroup);
+		layout->addWidget(mTemplateTimeGroup);
 		grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint());
 		grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
 		// Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
@@ -350,7 +350,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 		box->setFixedHeight(box->sizeHint().height());
 		grid->addWidget(box, 1, 1, alignment);
 
-		tqlayout->addStretch();
+		layout->addStretch();
 	}
 	else
 	{
@@ -373,12 +373,12 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	topLayout->addWidget(mLateCancel, 0, TQt::AlignAuto);
 
 	// Acknowledgement confirmation required - default = no confirmation
-	tqlayout = new TQHBoxLayout(topLayout, 0);
+	layout = new TQHBoxLayout(topLayout, 0);
 	mConfirmAck = createConfirmAckCheckbox(mainPage);
 	mConfirmAck->setFixedSize(mConfirmAck->sizeHint());
-	tqlayout->addWidget(mConfirmAck);
-	tqlayout->addSpacing(2*spacingHint());
-	tqlayout->addStretch();
+	layout->addWidget(mConfirmAck);
+	layout->addSpacing(2*spacingHint());
+	layout->addStretch();
 
 	if (theApp()->korganizerEnabled())
 	{
@@ -386,7 +386,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 		mShowInKorganizer = new CheckBox(i18n_ShowInKOrganizer(), mainPage);
 		mShowInKorganizer->setFixedSize(mShowInKorganizer->sizeHint());
 		TQWhatsThis::add(mShowInKorganizer, i18n("Check to copy the alarm into KOrganizer's calendar"));
-		tqlayout->addWidget(mShowInKorganizer);
+		layout->addWidget(mShowInKorganizer);
 	}
 
 	setButtonWhatsThis(Ok, i18n("Schedule the alarm at the specified time."));
@@ -446,30 +446,30 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent)
 	mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height());
 	frameLayout->addWidget(mFontColourButton);
 
-	TQHBoxLayout* tqlayout = new TQHBoxLayout(frameLayout, 0, 0);
+	TQHBoxLayout* layout = new TQHBoxLayout(frameLayout, 0, 0);
 	mBgColourBox = new TQHBox(mDisplayAlarmsFrame);
 	mBgColourBox->setSpacing(spacingHint());
-	tqlayout->addWidget(mBgColourBox);
-	tqlayout->addStretch();
+	layout->addWidget(mBgColourBox);
+	layout->addStretch();
 	TQLabel* label = new TQLabel(i18n("&Background color:"), mBgColourBox);
 	mBgColourButton = new ColourCombo(mBgColourBox);
 	label->setBuddy(mBgColourButton);
 	TQWhatsThis::add(mBgColourBox, i18n("Select the alarm message background color"));
 
 	// Sound checkbox and file selector
-	tqlayout = new TQHBoxLayout(frameLayout);
+	layout = new TQHBoxLayout(frameLayout);
 	mSoundPicker = new SoundPicker(mDisplayAlarmsFrame);
 	mSoundPicker->setFixedSize(mSoundPicker->sizeHint());
-	tqlayout->addWidget(mSoundPicker);
-	tqlayout->addSpacing(2*spacingHint());
-	tqlayout->addStretch();
+	layout->addWidget(mSoundPicker);
+	layout->addSpacing(2*spacingHint());
+	layout->addStretch();
 
 	if (ShellProcess::authorised())    // don't display if shell commands not allowed (e.g. kiosk mode)
 	{
 		// Special actions button
 		mSpecialActionsButton = new SpecialActionsButton(i18n_SpecialActions(), mDisplayAlarmsFrame);
 		mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint());
-		tqlayout->addWidget(mSpecialActionsButton);
+		layout->addWidget(mSpecialActionsButton);
 	}
 
 	// Top-adjust the controls
@@ -505,19 +505,19 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 
 	mCmdOutputGroup = new ButtonGroup(i18n("Command Output"), mCommandFrame);
 	frameLayout->addWidget(mCmdOutputGroup);
-	TQBoxLayout* tqlayout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint());
-	tqlayout->addSpacing(fontMetrics().lineSpacing()/2);
+	TQBoxLayout* layout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint());
+	layout->addSpacing(fontMetrics().lineSpacing()/2);
 
 	// Execute in terminal window
 	RadioButton* button = new RadioButton(i18n_u_ExecInTermWindow(), mCmdOutputGroup, "execInTerm");
 	button->setFixedSize(button->sizeHint());
 	TQWhatsThis::add(button, i18n("Check to execute the command in a terminal window"));
 	mCmdOutputGroup->insert(button, EXEC_IN_TERMINAL);
-	tqlayout->addWidget(button, 0, TQt::AlignAuto);
+	layout->addWidget(button, 0, TQt::AlignAuto);
 
 	// Log file name edit box
 	TQHBox* box = new TQHBox(mCmdOutputGroup);
-	(new TQWidget(box))->setFixedWidth(button->tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, button).width());   // indent the edit box
+	(new TQWidget(box))->setFixedWidth(button->style().subRect(TQStyle::SR_RadioButtonIndicator, button).width());   // indent the edit box
 //	(new TQWidget(box))->setFixedWidth(button->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth));   // indent the edit box
 	mCmdLogFileEdit = new LineEdit(LineEdit::Url, box);
 	mCmdLogFileEdit->setAcceptDrops(true);
@@ -537,15 +537,15 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 	TQWhatsThis::add(button,
 	      i18n("Check to log the command output to a local file. The output will be appended to any existing contents of the file."));
 	mCmdOutputGroup->insert(button, LOG_TO_FILE);
-	tqlayout->addWidget(button, 0, TQt::AlignAuto);
-	tqlayout->addWidget(box);
+	layout->addWidget(button, 0, TQt::AlignAuto);
+	layout->addWidget(box);
 
 	// Discard output
 	button = new RadioButton(i18n("Discard"), mCmdOutputGroup, "cmdDiscard");
 	button->setFixedSize(button->sizeHint());
 	TQWhatsThis::add(button, i18n("Check to discard command output."));
 	mCmdOutputGroup->insert(button, DISCARD_OUTPUT);
-	tqlayout->addWidget(button, 0, TQt::AlignAuto);
+	layout->addWidget(button, 0, TQt::AlignAuto);
 
 	// Top-adjust the controls
 	mCmdPadding = new TQHBox(mCommandFrame);
@@ -560,8 +560,8 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 {
 	mEmailFrame = new TQFrame(parent);
 	mEmailFrame->setFrameStyle(TQFrame::NoFrame);
-	TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint());
-	TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint());
+	TQBoxLayout* layout = new TQVBoxLayout(mEmailFrame, 0, spacingHint());
+	TQGridLayout* grid = new TQGridLayout(layout, 3, 3, spacingHint());
 	grid->setColStretch(1, 1);
 
 	mEmailFromList = 0;
@@ -614,10 +614,10 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 	// Email body
 	mEmailMessageEdit = new TextEdit(mEmailFrame);
 	TQWhatsThis::add(mEmailMessageEdit, i18n("Enter the email message."));
-	tqlayout->addWidget(mEmailMessageEdit);
+	layout->addWidget(mEmailMessageEdit);
 
 	// Email attachments
-	grid = new TQGridLayout(tqlayout, 2, 3, spacingHint());
+	grid = new TQGridLayout(layout, 2, 3, spacingHint());
 	label = new TQLabel(i18n("Attachment&s:"), mEmailFrame);
 	label->setFixedSize(label->sizeHint());
 	grid->addWidget(label, 0, 0);