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

1 files changed, 21 insertions, 21 deletions

diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index c7a6adcfb..0359810f2 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqhbox.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqwhatsthis.h>
@@ -78,14 +78,14 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 {
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
-	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint());
 
 	// File play button
 	TQHBox* box = new TQHBox(page);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	mFilePlay = new TQPushButton(box);
 	mFilePlay->setPixmap(SmallIcon("player_play"));
-	mFilePlay->setFixedSize(mFilePlay->tqsizeHint());
+	mFilePlay->setFixedSize(mFilePlay->sizeHint());
 	connect(mFilePlay, TQT_SIGNAL(clicked()), TQT_SLOT(playSound()));
 	TQToolTip::add(mFilePlay, i18n("Test the sound"));
 	TQWhatsThis::add(mFilePlay, i18n("Play the selected sound file."));
@@ -98,36 +98,36 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	// File browse button
 	mFileBrowseButton = new PushButton(box);
 	mFileBrowseButton->setPixmap(SmallIcon("fileopen"));
-	mFileBrowseButton->setFixedSize(mFileBrowseButton->tqsizeHint());
+	mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint());
 	connect(mFileBrowseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
 	TQToolTip::add(mFileBrowseButton, i18n("Choose a file"));
 	TQWhatsThis::add(mFileBrowseButton, i18n("Select a sound file to play."));
 
 	// Sound repetition checkbox
 	mRepeatCheckbox = new CheckBox(i18n_p_Repeat(), page);
-	mRepeatCheckbox->setFixedSize(mRepeatCheckbox->tqsizeHint());
+	mRepeatCheckbox->setFixedSize(mRepeatCheckbox->sizeHint());
 	TQWhatsThis::add(mRepeatCheckbox,
 	      i18n("If checked, the sound file will be played repeatedly for as long as the message is displayed."));
-	tqlayout->addWidget(mRepeatCheckbox);
+	layout->addWidget(mRepeatCheckbox);
 
 	// Volume
 	TQGroupBox* group = new TQGroupBox(i18n("Volume"), page);
-	tqlayout->addWidget(group);
+	layout->addWidget(group);
 	TQGridLayout* grid = new TQGridLayout(group, 4, 3, marginHint(), spacingHint());
 	grid->addRowSpacing(0, fontMetrics().height() - marginHint() + spacingHint());
 	grid->setColStretch(2, 1);
 	int indentWidth = 3 * KDialog::spacingHint();
 	grid->addColSpacing(0, indentWidth);
 	grid->addColSpacing(1, indentWidth);
-	// 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;
 
 	// 'Set volume' checkbox
 	box = new TQHBox(group);
 	box->setSpacing(spacingHint());
 	grid->addMultiCellWidget(box, 1, 1, 0, 2);
 	mVolumeCheckbox = new CheckBox(i18n_v_SetVolume(), box);
-	mVolumeCheckbox->setFixedSize(mVolumeCheckbox->tqsizeHint());
+	mVolumeCheckbox->setFixedSize(mVolumeCheckbox->sizeHint());
 	connect(mVolumeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotVolumeToggled(bool)));
 	TQWhatsThis::add(mVolumeCheckbox,
 	      i18n("Select to choose the volume for playing the sound file."));
@@ -136,30 +136,30 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box);
 	mVolumeSlider->setTickmarks(TQSlider::Below);
 	mVolumeSlider->setTickInterval(10);
-	mVolumeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+	mVolumeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 	TQWhatsThis::add(mVolumeSlider, i18n("Choose the volume for playing the sound file."));
 	mVolumeCheckbox->setFocusWidget(mVolumeSlider);
 
 	// Fade checkbox
 	mFadeCheckbox = new CheckBox(i18n("Fade"), group);
-	mFadeCheckbox->setFixedSize(mFadeCheckbox->tqsizeHint());
+	mFadeCheckbox->setFixedSize(mFadeCheckbox->sizeHint());
 	connect(mFadeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFadeToggled(bool)));
 	TQWhatsThis::add(mFadeCheckbox,
 	      i18n("Select to fade the volume when the sound file first starts to play."));
-	grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, tqalignment);
+	grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, alignment);
 
 	// Fade time
 	mFadeBox = new TQHBox(group);
 	mFadeBox->setSpacing(spacingHint());
-	grid->addWidget(mFadeBox, 3, 2, tqalignment);
+	grid->addWidget(mFadeBox, 3, 2, alignment);
 	TQLabel* label = new TQLabel(i18n("Time period over which to fade the sound", "Fade time:"), mFadeBox);
-	label->setFixedSize(label->tqsizeHint());
+	label->setFixedSize(label->sizeHint());
 	mFadeTime = new SpinBox(1, 999, 1, mFadeBox);
 	mFadeTime->setLineShiftStep(10);
-	mFadeTime->setFixedSize(mFadeTime->tqsizeHint());
+	mFadeTime->setFixedSize(mFadeTime->sizeHint());
 	label->setBuddy(mFadeTime);
 	label = new TQLabel(i18n("seconds"), mFadeBox);
-	label->setFixedSize(label->tqsizeHint());
+	label->setFixedSize(label->sizeHint());
 	TQWhatsThis::add(mFadeBox, i18n("Enter how many seconds to fade the sound before reaching the set volume."));
 
 	// Fade slider
@@ -167,11 +167,11 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	mFadeVolumeBox->setSpacing(spacingHint());
 	grid->addWidget(mFadeVolumeBox, 4, 2);
 	label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox);
-	label->setFixedSize(label->tqsizeHint());
+	label->setFixedSize(label->sizeHint());
 	mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox);
 	mFadeSlider->setTickmarks(TQSlider::Below);
 	mFadeSlider->setTickInterval(10);
-	mFadeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+	mFadeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 	label->setBuddy(mFadeSlider);
 	TQWhatsThis::add(mFadeVolumeBox, i18n("Choose the initial volume for playing the sound file."));
 
@@ -299,7 +299,7 @@ void SoundDlg::playSound()
 	||  !KIO::NetAccess::download(url, mLocalAudioFile, mmw))
 	{
 		kdError(5950) << "SoundDlg::playAudio(): Open failure: " << mFileName << endl;
-		KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mFileName));
+		KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mFileName));
 		return;
 	}
 	mPlayTimer = new TQTimer(this);