From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kalarm/sounddlg.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kalarm/sounddlg.cpp') diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index 691ba936f..02d3af55b 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -69,8 +69,8 @@ static const char SOUND_DIALOG_NAME[] = "SoundDialog"; SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat, - const TQString& caption, TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false), + const TQString& caption, TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false), mReadOnly(false), mArtsDispatcher(0), mPlayObject(0), @@ -120,7 +120,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad grid->addColSpacing(0, indentWidth); grid->addColSpacing(1, indentWidth); // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft; + int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; // 'Set volume' checkbox box = new TQHBox(group); @@ -133,7 +133,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad i18n("Select to choose the volume for playing the sound file.")); // Volume slider - mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box); + mVolumeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, box); mVolumeSlider->setTickmarks(TQSlider::Below); mVolumeSlider->setTickInterval(10); mVolumeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); @@ -168,7 +168,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad grid->addWidget(mFadeVolumeBox, 4, 2); label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox); label->setFixedSize(label->tqsizeHint()); - mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox); + mFadeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, mFadeVolumeBox); mFadeSlider->setTickmarks(TQSlider::Below); mFadeSlider->setTickInterval(10); mFadeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); @@ -370,7 +370,7 @@ void SoundDlg::stopPlay() if (!mLocalAudioFile.isEmpty()) { KIO::NetAccess::removeTempFile(mLocalAudioFile); // removes it only if it IS a temporary file - mLocalAudioFile = TQString::null; + mLocalAudioFile = TQString(); } mFilePlay->setPixmap(SmallIcon("player_play")); TQToolTip::add(mFilePlay, i18n("Test the sound")); @@ -412,7 +412,7 @@ bool SoundDlg::checkFile() #endif { // It's a relative path. - // Find the first sound resource that tqcontains files. + // Find the first sound resource that contains files. TQStringList soundDirs = KGlobal::dirs()->resourceDirs("sound"); if (!soundDirs.isEmpty()) { @@ -443,7 +443,7 @@ bool SoundDlg::checkFile() } #ifdef WITHOUT_ARTS KMessageBox::sorry(this, i18n("File not found")); - mFileName = TQString::null; + mFileName = TQString(); return false; #else return true; -- cgit v1.2.1