Rename a number of old tq methods that are no longer tq specific

1 files changed, 95 insertions, 95 deletions

diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 2a10c1a33..43b95c7ef 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -24,7 +24,7 @@
 #include "kalarm.h"
 
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqwidgetstack.h>
 #include <tqlistbox.h>
@@ -93,7 +93,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	  mNoEmitTypeChanged(true),
 	  mReadOnly(readOnly)
 {
-	TQBoxLayout* tqlayout;
+	TQBoxLayout* layout;
 	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
 	/* Create the recurrence rule Group box which holds the recurrence period
@@ -106,11 +106,11 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup");
 	topLayout->addWidget(recurGroup);
 	TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame");
-	tqlayout = new TQVBoxLayout(ruleFrame, 0);
-	tqlayout->addSpacing(KDialog::spacingHint()/2);
+	layout = new TQVBoxLayout(ruleFrame, 0);
+	layout->addSpacing(KDialog::spacingHint()/2);
 
-	tqlayout = new TQHBoxLayout(tqlayout, 0);
-	TQBoxLayout* lay = new TQVBoxLayout(tqlayout, 0);
+	layout = new TQHBoxLayout(layout, 0);
+	TQBoxLayout* lay = new TQVBoxLayout(layout, 0);
 	mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame);
 	mRuleButtonGroup->setInsideMargin(0);
 	mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame);
@@ -119,43 +119,43 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	connect(mRuleButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(periodClicked(int)));
 
 	mNoneButton = new RadioButton(i18n_Norecur(), mRuleButtonGroup);
-	mNoneButton->setFixedSize(mNoneButton->tqsizeHint());
+	mNoneButton->setFixedSize(mNoneButton->sizeHint());
 	mNoneButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mNoneButton, i18n("Do not repeat the alarm"));
 
 	mAtLoginButton = new RadioButton(i18n_l_Atlogin(), mRuleButtonGroup);
-	mAtLoginButton->setFixedSize(mAtLoginButton->tqsizeHint());
+	mAtLoginButton->setFixedSize(mAtLoginButton->sizeHint());
 	mAtLoginButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mAtLoginButton,
 	      i18n("Trigger the alarm at the specified date/time and at every login until then.\n"
 	           "Note that it will also be triggered any time the alarm daemon is restarted."));
 
 	mSubDailyButton = new RadioButton(i18n_u_HourlyMinutely(), mRuleButtonGroup);
-	mSubDailyButton->setFixedSize(mSubDailyButton->tqsizeHint());
+	mSubDailyButton->setFixedSize(mSubDailyButton->sizeHint());
 	mSubDailyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mSubDailyButton,
 	      i18n("Repeat the alarm at hourly/minutely intervals"));
 
 	mDailyButton = new RadioButton(i18n_d_Daily(), mRuleButtonGroup);
-	mDailyButton->setFixedSize(mDailyButton->tqsizeHint());
+	mDailyButton->setFixedSize(mDailyButton->sizeHint());
 	mDailyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mDailyButton,
 	      i18n("Repeat the alarm at daily intervals"));
 
 	mWeeklyButton = new RadioButton(i18n_w_Weekly(), mRuleButtonGroup);
-	mWeeklyButton->setFixedSize(mWeeklyButton->tqsizeHint());
+	mWeeklyButton->setFixedSize(mWeeklyButton->sizeHint());
 	mWeeklyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mWeeklyButton,
 	      i18n("Repeat the alarm at weekly intervals"));
 
 	mMonthlyButton = new RadioButton(i18n_m_Monthly(), mRuleButtonGroup);
-	mMonthlyButton->setFixedSize(mMonthlyButton->tqsizeHint());
+	mMonthlyButton->setFixedSize(mMonthlyButton->sizeHint());
 	mMonthlyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mMonthlyButton,
 	      i18n("Repeat the alarm at monthly intervals"));
 
 	mYearlyButton = new RadioButton(i18n_y_Yearly(), mRuleButtonGroup);
-	mYearlyButton->setFixedSize(mYearlyButton->tqsizeHint());
+	mYearlyButton->setFixedSize(mYearlyButton->sizeHint());
 	mYearlyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mYearlyButton,
 	      i18n("Repeat the alarm at annual intervals"));
@@ -170,7 +170,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 
 	// Sub-repetition button
 	mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), true, ruleFrame);
-	mSubRepetition->setFixedSize(mSubRepetition->tqsizeHint());
+	mSubRepetition->setFixedSize(mSubRepetition->sizeHint());
 	mSubRepetition->setReadOnly(mReadOnly);
 	connect(mSubRepetition, TQT_SIGNAL(needsInitialisation()), TQT_SIGNAL(repeatNeedsInitialisation()));
 	connect(mSubRepetition, TQT_SIGNAL(changed()), TQT_SIGNAL(frequencyChanged()));
@@ -178,16 +178,16 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	lay->addSpacing(KDialog::spacingHint());
 	lay->addWidget(mSubRepetition);
 
-	lay = new TQVBoxLayout(tqlayout);
+	lay = new TQVBoxLayout(layout);
 
 	lay->addStretch();
-	tqlayout = new TQHBoxLayout(lay);
+	layout = new TQHBoxLayout(lay);
 
-	tqlayout->addSpacing(KDialog::marginHint());
+	layout->addSpacing(KDialog::marginHint());
 	TQFrame* divider = new TQFrame(ruleFrame);
 	divider->setFrameStyle(TQFrame::VLine | TQFrame::Sunken);
-	tqlayout->addWidget(divider);
-	tqlayout->addSpacing(KDialog::marginHint());
+	layout->addWidget(divider);
+	layout->addSpacing(KDialog::marginHint());
 
 	mNoRule       = new NoRule(ruleFrame, "noFrame");
 	mSubDailyRule = new SubDailyRule(mReadOnly, ruleFrame, "subdayFrame");
@@ -203,15 +203,15 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	connect(mYearlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged()));
 
 	mRuleStack = new TQWidgetStack(ruleFrame);
-	tqlayout->addWidget(mRuleStack);
-	tqlayout->addStretch(1);
+	layout->addWidget(mRuleStack);
+	layout->addStretch(1);
 	mRuleStack->addWidget(mNoRule, 0);
 	mRuleStack->addWidget(mSubDailyRule, 1);
 	mRuleStack->addWidget(mDailyRule, 2);
 	mRuleStack->addWidget(mWeeklyRule, 3);
 	mRuleStack->addWidget(mMonthlyRule, 4);
 	mRuleStack->addWidget(mYearlyRule, 5);
-	tqlayout->addSpacing(KDialog::marginHint());
+	layout->addSpacing(KDialog::marginHint());
 
 	// Create the recurrence range group which contains the controls
 	// which specify how long the recurrence is to last.
@@ -220,22 +220,22 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	connect(mRangeButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(rangeTypeClicked()));
 	topLayout->addWidget(mRangeButtonGroup);
 
-	TQVBoxLayout* vtqlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint());
-	vtqlayout->addSpacing(fontMetrics().lineSpacing()/2);
+	TQVBoxLayout* vlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint());
+	vlayout->addSpacing(fontMetrics().lineSpacing()/2);
 	mNoEndDateButton = new RadioButton(i18n("No &end"), mRangeButtonGroup);
-	mNoEndDateButton->setFixedSize(mNoEndDateButton->tqsizeHint());
+	mNoEndDateButton->setFixedSize(mNoEndDateButton->sizeHint());
 	mNoEndDateButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mNoEndDateButton, i18n("Repeat the alarm indefinitely"));
-	vtqlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto);
+	vlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto);
 	TQSize size = mNoEndDateButton->size();
 
-	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
+	layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
 	mRepeatCountButton = new RadioButton(i18n("End a&fter:"), mRangeButtonGroup);
 	mRepeatCountButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mRepeatCountButton,
 	      i18n("Repeat the alarm for the number of times specified"));
 	mRepeatCountEntry = new SpinBox(1, 9999, 1, mRangeButtonGroup);
-	mRepeatCountEntry->setFixedSize(mRepeatCountEntry->tqsizeHint());
+	mRepeatCountEntry->setFixedSize(mRepeatCountEntry->sizeHint());
 	mRepeatCountEntry->setLineShiftStep(10);
 	mRepeatCountEntry->setSelectOnStep(false);
 	mRepeatCountEntry->setReadOnly(mReadOnly);
@@ -244,44 +244,44 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	      i18n("Enter the total number of times to trigger the alarm"));
 	mRepeatCountButton->setFocusWidget(mRepeatCountEntry);
 	mRepeatCountLabel = new TQLabel(i18n("occurrence(s)"), mRangeButtonGroup);
-	mRepeatCountLabel->setFixedSize(mRepeatCountLabel->tqsizeHint());
-	tqlayout->addWidget(mRepeatCountButton);
-	tqlayout->addSpacing(KDialog::spacingHint());
-	tqlayout->addWidget(mRepeatCountEntry);
-	tqlayout->addWidget(mRepeatCountLabel);
-	tqlayout->addStretch();
-	size = size.expandedTo(mRepeatCountButton->tqsizeHint());
-
-	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
+	mRepeatCountLabel->setFixedSize(mRepeatCountLabel->sizeHint());
+	layout->addWidget(mRepeatCountButton);
+	layout->addSpacing(KDialog::spacingHint());
+	layout->addWidget(mRepeatCountEntry);
+	layout->addWidget(mRepeatCountLabel);
+	layout->addStretch();
+	size = size.expandedTo(mRepeatCountButton->sizeHint());
+
+	layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
 	mEndDateButton = new RadioButton(i18n("End &by:"), mRangeButtonGroup);
 	mEndDateButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mEndDateButton,
 	      i18n("Repeat the alarm until the date/time specified.\n\n"
 	           "Note: This applies to the main recurrence only. It does not limit any sub-repetition which will occur regardless after the last main recurrence."));
 	mEndDateEdit = new DateEdit(mRangeButtonGroup);
-	mEndDateEdit->setFixedSize(mEndDateEdit->tqsizeHint());
+	mEndDateEdit->setFixedSize(mEndDateEdit->sizeHint());
 	mEndDateEdit->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mEndDateEdit,
 	      i18n("Enter the last date to repeat the alarm"));
 	mEndDateButton->setFocusWidget(mEndDateEdit);
 	mEndTimeEdit = new TimeEdit(mRangeButtonGroup);
-	mEndTimeEdit->setFixedSize(mEndTimeEdit->tqsizeHint());
+	mEndTimeEdit->setFixedSize(mEndTimeEdit->sizeHint());
 	mEndTimeEdit->setReadOnly(mReadOnly);
 	static const TQString lastTimeText = i18n("Enter the last time to repeat the alarm.");
-	TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").tqarg(lastTimeText).tqarg(TimeSpinBox::shiftWhatsThis()));
+	TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").arg(lastTimeText).arg(TimeSpinBox::shiftWhatsThis()));
 	mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup);
-	mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->tqsizeHint());
+	mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->sizeHint());
 	mEndAnyTimeCheckBox->setReadOnly(mReadOnly);
 	connect(mEndAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool)));
 	TQWhatsThis::add(mEndAnyTimeCheckBox,
 	      i18n("Stop repeating the alarm after your first login on or after the specified end date"));
-	tqlayout->addWidget(mEndDateButton);
-	tqlayout->addSpacing(KDialog::spacingHint());
-	tqlayout->addWidget(mEndDateEdit);
-	tqlayout->addWidget(mEndTimeEdit);
-	tqlayout->addWidget(mEndAnyTimeCheckBox);
-	tqlayout->addStretch();
-	size = size.expandedTo(mEndDateButton->tqsizeHint());
+	layout->addWidget(mEndDateButton);
+	layout->addSpacing(KDialog::spacingHint());
+	layout->addWidget(mEndDateEdit);
+	layout->addWidget(mEndTimeEdit);
+	layout->addWidget(mEndAnyTimeCheckBox);
+	layout->addStretch();
+	size = size.expandedTo(mEndDateButton->sizeHint());
 
 	// Line up the widgets to the right of the radio buttons
 	mRepeatCountButton->setFixedSize(size);
@@ -293,17 +293,17 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	mExceptionGroup = new TQGroupBox(i18n("E&xceptions"), this, "mExceptionGroup");
 	topLayout->addWidget(mExceptionGroup);
 	topLayout->setStretchFactor(mExceptionGroup, 2);
-	vtqlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint());
-	vtqlayout->addSpacing(fontMetrics().lineSpacing()/2);
-	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
-	vtqlayout = new TQVBoxLayout(tqlayout);
+	vlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint());
+	vlayout->addSpacing(fontMetrics().lineSpacing()/2);
+	layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+	vlayout = new TQVBoxLayout(layout);
 
 	mExceptionDateList = new TQListBox(mExceptionGroup);
-	mExceptionDateList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+	mExceptionDateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	connect(mExceptionDateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(enableExceptionButtons()));
 	TQWhatsThis::add(mExceptionDateList,
 	      i18n("The list of exceptions, i.e. dates/times excluded from the recurrence"));
-	vtqlayout->addWidget(mExceptionDateList);
+	vlayout->addWidget(mExceptionDateList);
 
 	if (mReadOnly)
 	{
@@ -313,36 +313,36 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	}
 	else
 	{
-		vtqlayout = new TQVBoxLayout(tqlayout);
+		vlayout = new TQVBoxLayout(layout);
 		mExceptionDateEdit = new DateEdit(mExceptionGroup);
-		mExceptionDateEdit->setFixedSize(mExceptionDateEdit->tqsizeHint());
-		mExceptionDateEdit->setDate(TQDate::tqcurrentDate());
+		mExceptionDateEdit->setFixedSize(mExceptionDateEdit->sizeHint());
+		mExceptionDateEdit->setDate(TQDate::currentDate());
 		TQWhatsThis::add(mExceptionDateEdit,
 		      i18n("Enter a date to insert in the exceptions list. "
 		           "Use in conjunction with the Add or Change button below."));
-		vtqlayout->addWidget(mExceptionDateEdit);
+		vlayout->addWidget(mExceptionDateEdit);
 
-		tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
+		layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
 		TQPushButton* button = new TQPushButton(i18n("Add"), mExceptionGroup);
-		button->setFixedSize(button->tqsizeHint());
+		button->setFixedSize(button->sizeHint());
 		connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addException()));
 		TQWhatsThis::add(button,
 		      i18n("Add the date entered above to the exceptions list"));
-		tqlayout->addWidget(button);
+		layout->addWidget(button);
 
 		mChangeExceptionButton = new TQPushButton(i18n("Change"), mExceptionGroup);
-		mChangeExceptionButton->setFixedSize(mChangeExceptionButton->tqsizeHint());
+		mChangeExceptionButton->setFixedSize(mChangeExceptionButton->sizeHint());
 		connect(mChangeExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(changeException()));
 		TQWhatsThis::add(mChangeExceptionButton,
 		      i18n("Replace the currently highlighted item in the exceptions list with the date entered above"));
-		tqlayout->addWidget(mChangeExceptionButton);
+		layout->addWidget(mChangeExceptionButton);
 
 		mDeleteExceptionButton = new TQPushButton(i18n("Delete"), mExceptionGroup);
-		mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->tqsizeHint());
+		mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->sizeHint());
 		connect(mDeleteExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteException()));
 		TQWhatsThis::add(mDeleteExceptionButton,
 		      i18n("Remove the currently highlighted item from the exceptions list"));
-		tqlayout->addWidget(mDeleteExceptionButton);
+		layout->addWidget(mDeleteExceptionButton);
 	}
 
 	mNoEmitTypeChanged = false;
@@ -1029,30 +1029,30 @@ Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, b
 	box->setSpacing(KDialog::spacingHint());
 
 	TQLabel* label = new TQLabel(i18n("Recur e&very"), box);
-	label->setFixedSize(label->tqsizeHint());
+	label->setFixedSize(label->sizeHint());
 	if (time)
 	{
 		mIntSpinBox = 0;
 		mSpinBox = mTimeSpinBox = new TimeSpinBox(1, 5999, box);
-		mTimeSpinBox->setFixedSize(mTimeSpinBox->tqsizeHint());
+		mTimeSpinBox->setFixedSize(mTimeSpinBox->sizeHint());
 		mTimeSpinBox->setReadOnly(readOnly);
 	}
 	else
 	{
 		mTimeSpinBox = 0;
 		mSpinBox = mIntSpinBox = new SpinBox(1, 999, 1, box);
-		mIntSpinBox->setFixedSize(mIntSpinBox->tqsizeHint());
+		mIntSpinBox->setFixedSize(mIntSpinBox->sizeHint());
 		mIntSpinBox->setReadOnly(readOnly);
 	}
 	connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(frequencyChanged()));
 	label->setBuddy(mSpinBox);
 	label = new TQLabel(freqText, box);
-	label->setFixedSize(label->tqsizeHint());
-	box->setFixedSize(tqsizeHint());
+	label->setFixedSize(label->sizeHint());
+	box->setFixedSize(sizeHint());
 	TQWhatsThis::add(box, freqWhatsThis);
 
 	new TQWidget(freqBox);     // left adjust the visible widgets
-	freqBox->setFixedHeight(freqBox->tqsizeHint().height());
+	freqBox->setFixedHeight(freqBox->sizeHint().height());
 	freqBox->setFocusProxy(mSpinBox);
 }
 
@@ -1112,11 +1112,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis
 	: Rule(freqText, freqWhatsThis, false, readOnly, parent, name),
 	  mSavedDays(7)
 {
-	TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint());
+	TQGridLayout* grid = new TQGridLayout(layout(), 1, 4, KDialog::spacingHint());
 	grid->setRowStretch(0, 1);
 
 	TQLabel* label = new TQLabel(i18n("On: Tuesday", "O&n:"), this);
-	label->setFixedSize(label->tqsizeHint());
+	label->setFixedSize(label->sizeHint());
 	grid->addWidget(label, 0, 0, TQt::AlignRight | TQt::AlignTop);
 	grid->addColSpacing(1, KDialog::spacingHint());
 
@@ -1129,11 +1129,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis
 	{
 		int day = KAlarm::localeDayInWeek_to_weekDay(i);
 		mDayBox[i] = new CheckBox(calendar->weekDayName(day), box);
-		mDayBox[i]->setFixedSize(mDayBox[i]->tqsizeHint());
+		mDayBox[i]->setFixedSize(mDayBox[i]->sizeHint());
 		mDayBox[i]->setReadOnly(readOnly);
 		dgrid->addWidget(mDayBox[i], i%4, i/4, TQt::AlignAuto);
 	}
-	box->setFixedSize(box->tqsizeHint());
+	box->setFixedSize(box->sizeHint());
 	TQWhatsThis::add(box, daysWhatsThis);
 	grid->addWidget(box, 0, 2, TQt::AlignAuto);
 	label->setBuddy(mDayBox[0]);
@@ -1258,10 +1258,10 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 	// Month day selector
 	TQHBox* box = new TQHBox(this);
 	box->setSpacing(KDialog::spacingHint());
-	tqlayout()->addWidget(box);
+	layout()->addWidget(box);
 
 	mDayButton = new RadioButton(i18n("On day number in the month", "O&n day"), box);
-	mDayButton->setFixedSize(mDayButton->tqsizeHint());
+	mDayButton->setFixedSize(mDayButton->sizeHint());
 	mDayButton->setReadOnly(readOnly);
 	mDayButtonId = mButtonGroup->insert(mDayButton);
 	TQWhatsThis::add(mDayButton, i18n("Repeat the alarm on the selected day of the month"));
@@ -1271,22 +1271,22 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 	for (int i = 0;  i < 31;  ++i)
 		mDayCombo->insertItem(TQString::number(i + 1));
 	mDayCombo->insertItem(i18n("Last day of month", "Last"));
-	mDayCombo->setFixedSize(mDayCombo->tqsizeHint());
+	mDayCombo->setFixedSize(mDayCombo->sizeHint());
 	mDayCombo->setReadOnly(readOnly);
 	TQWhatsThis::add(mDayCombo, i18n("Select the day of the month on which to repeat the alarm"));
 	mDayButton->setFocusWidget(mDayCombo);
 	connect(mDayCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotDaySelected(int)));
 
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->tqsizeHint().height());
+	box->setFixedHeight(box->sizeHint().height());
 
 	// Month position selector
 	box = new TQHBox(this);
 	box->setSpacing(KDialog::spacingHint());
-	tqlayout()->addWidget(box);
+	layout()->addWidget(box);
 
 	mPosButton = new RadioButton(i18n("On the 1st Tuesday", "On t&he"), box);
-	mPosButton->setFixedSize(mPosButton->tqsizeHint());
+	mPosButton->setFixedSize(mPosButton->sizeHint());
 	mPosButton->setReadOnly(readOnly);
 	mPosButtonId = mButtonGroup->insert(mPosButton);
 	TQWhatsThis::add(mPosButton,
@@ -1309,7 +1309,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 		mWeekCombo->setSizeLimit(11);
 	}
 	TQWhatsThis::add(mWeekCombo, i18n("Select the week of the month in which to repeat the alarm"));
-	mWeekCombo->setFixedSize(mWeekCombo->tqsizeHint());
+	mWeekCombo->setFixedSize(mWeekCombo->sizeHint());
 	mWeekCombo->setReadOnly(readOnly);
 	mPosButton->setFocusWidget(mWeekCombo);
 
@@ -1324,7 +1324,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 	TQWhatsThis::add(mDayOfWeekCombo, i18n("Select the day of the week on which to repeat the alarm"));
 
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->tqsizeHint().height());
+	box->setFixedHeight(box->sizeHint().height());
 	connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(clicked(int)));
 }
 
@@ -1456,47 +1456,47 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name)
 	       true, readOnly, parent, name)
 {
 	// Set up the month selection widgets
-	TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint());
+	TQBoxLayout* hlayout = new TQHBoxLayout(layout(), KDialog::spacingHint());
 	TQLabel* label = new TQLabel(i18n("List of months to select", "Months:"), this);
-	label->setFixedSize(label->tqsizeHint());
-	htqlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop);
+	label->setFixedSize(label->sizeHint());
+	hlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop);
 
 	// List the months of the year.
 	TQWidget* w = new TQWidget(this);   // this is to control the TQWhatsThis text display area
-	htqlayout->addWidget(w, 1, TQt::AlignAuto);
+	hlayout->addWidget(w, 1, TQt::AlignAuto);
 	TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint());
 	const KCalendarSystem* calendar = KGlobal::locale()->calendar();
-	int year = TQDate::tqcurrentDate().year();
+	int year = TQDate::currentDate().year();
 	for (int i = 0;  i < 12;  ++i)
 	{
 		mMonthBox[i] = new CheckBox(calendar->monthName(i + 1, year, true), w);
-		mMonthBox[i]->setFixedSize(mMonthBox[i]->tqsizeHint());
+		mMonthBox[i]->setFixedSize(mMonthBox[i]->sizeHint());
 		mMonthBox[i]->setReadOnly(readOnly);
 		grid->addWidget(mMonthBox[i], i%3, i/3, TQt::AlignAuto);
 	}
 	connect(mMonthBox[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(enableFeb29()));
-	w->setFixedHeight(w->tqsizeHint().height());
+	w->setFixedHeight(w->sizeHint().height());
 	TQWhatsThis::add(w, i18n("Select the months of the year in which to repeat the alarm"));
 
 	// February 29th handling option
 	TQHBox* f29box = new TQHBox(this);
-	tqlayout()->addWidget(f29box);
+	layout()->addWidget(f29box);
 	TQHBox* box = new TQHBox(f29box);    // this is to control the TQWhatsThis text display area
 	box->setSpacing(KDialog::spacingHint());
 	mFeb29Label = new TQLabel(i18n("February 2&9th alarm in non-leap years:"), box);
-	mFeb29Label->setFixedSize(mFeb29Label->tqsizeHint());
+	mFeb29Label->setFixedSize(mFeb29Label->sizeHint());
 	mFeb29Combo = new ComboBox(false, box);
 	mFeb29Combo->insertItem(i18n("No date", "None"));
 	mFeb29Combo->insertItem(i18n("1st March (short form)", "1 Mar"));
 	mFeb29Combo->insertItem(i18n("28th February (short form)", "28 Feb"));
-	mFeb29Combo->setFixedSize(mFeb29Combo->tqsizeHint());
+	mFeb29Combo->setFixedSize(mFeb29Combo->sizeHint());
 	mFeb29Combo->setReadOnly(readOnly);
 	mFeb29Label->setBuddy(mFeb29Combo);
-	box->setFixedSize(box->tqsizeHint());
+	box->setFixedSize(box->sizeHint());
 	TQWhatsThis::add(box,
 	      i18n("Select which date, if any, the February 29th alarm should trigger in non-leap years"));
 	new TQWidget(f29box);     // left adjust the visible widgets
-	f29box->setFixedHeight(f29box->tqsizeHint().height());
+	f29box->setFixedHeight(f29box->sizeHint().height());
 }
 
 void YearlyRule::setDefaultValues(int dayOfMonth, int dayOfWeek, int month)