From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 kalarm/soundpicker.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kalarm/soundpicker.cpp')

diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index caa13d88d..ed55b8112 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -20,7 +20,7 @@
 
 #include "kalarm.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqregexp.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
@@ -64,7 +64,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name)
 	mTypeBox->setSpacing(KDialog::spacingHint());
 
 	TQLabel* label = new TQLabel(i18n("An audio sound", "&Sound:"), mTypeBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 
 	// Sound type combo box
 	// The order of combo box entries must correspond with the 'Type' enum.
@@ -81,7 +81,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name)
 	// Sound file picker button
 	mFilePicker = new PushButton(this);
 	mFilePicker->setPixmap(SmallIcon("playsound"));
-	mFilePicker->setFixedSize(mFilePicker->sizeHint());
+	mFilePicker->setFixedSize(mFilePicker->tqsizeHint());
 	connect(mFilePicker, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
 	TQToolTip::add(mFilePicker, i18n("Configure sound file"));
 	TQWhatsThis::add(mFilePicker, i18n("Configure a sound file to play when the alarm is displayed."));
@@ -114,9 +114,9 @@ void SoundPicker::showSpeak(bool show)
 	if (show == mSpeakShowing)
 		return;    // no change
 	TQString whatsThis = "<p>" + i18n("Choose a sound to play when the message is displayed.")
-	                  + "<br>" + i18n("%1: the message is displayed silently.").arg("<b>" + i18n_None() + "</b>")
-	                  + "<br>" + i18n("%1: a simple beep is sounded.").arg("<b>" + i18n_Beep() + "</b>")
-	                  + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").arg("<b>" + i18n_File() + "</b>");
+	                  + "<br>" + i18n("%1: the message is displayed silently.").tqarg("<b>" + i18n_None() + "</b>")
+	                  + "<br>" + i18n("%1: a simple beep is sounded.").tqarg("<b>" + i18n_Beep() + "</b>")
+	                  + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").tqarg("<b>" + i18n_File() + "</b>");
 	if (!show  &&  mTypeCombo->currentItem() == SPEAK)
 		mTypeCombo->setCurrentItem(NONE);
 	if (mTypeCombo->count() == SPEAK+1)
@@ -124,7 +124,7 @@ void SoundPicker::showSpeak(bool show)
 	if (show)
 	{
 		mTypeCombo->insertItem(i18n_Speak());
-		whatsThis += "<br>" + i18n("%1: the message text is spoken.").arg("<b>" + i18n_Speak() + "</b>") + "</p>";
+		whatsThis += "<br>" + i18n("%1: the message text is spoken.").tqarg("<b>" + i18n_Speak() + "</b>") + "</p>";
 	}
 	TQWhatsThis::add(mTypeBox, whatsThis + "</p>");
 	mSpeakShowing = show;
@@ -283,7 +283,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi
 		defaultDir = kdeSoundDir;
 	}
 #ifdef WITHOUT_ARTS
-	TQString filter = TQString::fromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").arg(i18n("Sound Files")).arg(i18n("All Files"));
+	TQString filter = TQString::tqfromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").tqarg(i18n("Sound Files")).tqarg(i18n("All Files"));
 #else
 	TQStringList filters = KDE::PlayObjectFactory::mimeTypes();
 	TQString filter = filters.join(" ");
-- 
cgit v1.2.1