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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 15 insertions, 15 deletions

diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp
index db17c9fbc..403250ba5 100644
--- a/kalarm/repetition.cpp
+++ b/kalarm/repetition.cpp
@@ -20,7 +20,7 @@
 
 #include "kalarm.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
@@ -165,7 +165,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
 	                       "checking this option makes the alarm trigger multiple times at each recurrence."),
 	                  i18n("Enter the time between repetitions of the alarm"),
 	                  true, page);
-	mTimeSelector->setFixedSize(mTimeSelector->sizeHint());
+	mTimeSelector->setFixedSize(mTimeSelector->tqsizeHint());
 	connect(mTimeSelector, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int)));
 	connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(repetitionToggled(bool)));
 	topLayout->addWidget(mTimeSelector, 0, TQt::AlignAuto);
@@ -174,38 +174,38 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
 	connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked()));
 	topLayout->addWidget(mButtonGroup);
 
-	TQBoxLayout* vlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing);
-	TQBoxLayout* layout = new TQHBoxLayout(vlayout, spacing);
+	TQBoxLayout* vtqlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing);
+	TQBoxLayout* tqlayout = new TQHBoxLayout(vtqlayout, spacing);
 	mCountButton = new RadioButton(i18n("&Number of repetitions:"), mButtonGroup);
-	mCountButton->setFixedSize(mCountButton->sizeHint());
+	mCountButton->setFixedSize(mCountButton->tqsizeHint());
 	TQWhatsThis::add(mCountButton,
 	      i18n("Check to specify the number of times the alarm should repeat after each recurrence"));
-	layout->addWidget(mCountButton);
+	tqlayout->addWidget(mCountButton);
 	mCount = new SpinBox(1, MAX_COUNT, 1, mButtonGroup);
-	mCount->setFixedSize(mCount->sizeHint());
+	mCount->setFixedSize(mCount->tqsizeHint());
 	mCount->setLineShiftStep(10);
 	mCount->setSelectOnStep(false);
 	connect(mCount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(countChanged(int)));
 	TQWhatsThis::add(mCount,
 	      i18n("Enter the number of times to trigger the alarm after its initial occurrence"));
-	layout->addWidget(mCount);
+	tqlayout->addWidget(mCount);
 	mCountButton->setFocusWidget(mCount);
-	layout->addStretch();
+	tqlayout->addStretch();
 
-	layout = new TQHBoxLayout(vlayout, spacing);
+	tqlayout = new TQHBoxLayout(vtqlayout, spacing);
 	mDurationButton = new RadioButton(i18n("&Duration:"), mButtonGroup);
-	mDurationButton->setFixedSize(mDurationButton->sizeHint());
+	mDurationButton->setFixedSize(mDurationButton->tqsizeHint());
 	TQWhatsThis::add(mDurationButton,
 	      i18n("Check to specify how long the alarm is to be repeated"));
-	layout->addWidget(mDurationButton);
+	tqlayout->addWidget(mDurationButton);
 	mDuration = new TimePeriod(true, mButtonGroup);
-	mDuration->setFixedSize(mDuration->sizeHint());
+	mDuration->setFixedSize(mDuration->tqsizeHint());
 	connect(mDuration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(durationChanged(int)));
 	TQWhatsThis::add(mDuration,
 	      i18n("Enter the length of time to repeat the alarm"));
-	layout->addWidget(mDuration);
+	tqlayout->addWidget(mDuration);
 	mDurationButton->setFocusWidget(mDuration);
-	layout->addStretch();
+	tqlayout->addStretch();
 
 	mCountButton->setChecked(true);
 	repetitionToggled(false);