diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
| commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
| tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kalarm/soundpicker.cpp | |
| parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
| download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip | |
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
Diffstat (limited to 'kalarm/soundpicker.cpp')
| -rw-r--r-- | kalarm/soundpicker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index ec09c2b86..25d871c41 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -55,8 +55,8 @@ TQString SoundPicker::i18n_Speak() { return i18n("Speak"); } TQString SoundPicker::i18n_File() { return i18n("Sound file"); } -SoundPicker::SoundPicker(TQWidget* parent, const char* name) - : TQFrame(parent, name) +SoundPicker::SoundPicker(TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name) { setFrameStyle(TQFrame::NoFrame); TQHBoxLayout* soundLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); @@ -144,7 +144,7 @@ SoundPicker::Type SoundPicker::sound() const */ TQString SoundPicker::file() const { - return (mTypeCombo->currentItem() == PLAY_FILE) ? mFile : TQString::null; + return (mTypeCombo->currentItem() == PLAY_FILE) ? mFile : TQString(); } /****************************************************************************** |