diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
| commit | b1057f437bf65300831a0ccb45b920787c6b318d (patch) | |
| tree | f8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /juk/playermanager.cpp | |
| parent | 4ddfca384ced9ad654213aef9dc2c3973720b980 (diff) | |
| download | tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip | |
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'juk/playermanager.cpp')
| -rw-r--r-- | juk/playermanager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index 19647278..d62c84c4 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -46,7 +46,7 @@ using namespace ActionCollection; -enum PlayerManagerStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 }; +enum PlayerManagertqStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 }; //////////////////////////////////////////////////////////////////////////////// // helper functions @@ -194,7 +194,7 @@ TQStringList PlayerManager::trackProperties() TQString PlayerManager::trackProperty(const TQString &property) const { if(!playing() && !paused()) - return TQString::null; + return TQString(); return m_file.property(property); } @@ -220,7 +220,7 @@ FileHandle PlayerManager::playingFile() const TQString PlayerManager::playingString() const { if(!playing()) - return TQString::null; + return TQString(); TQString str = m_file.tag()->artist() + " - " + m_file.tag()->title(); if(m_file.tag()->artist().isEmpty()) @@ -239,10 +239,10 @@ void PlayerManager::setStatusLabel(StatusLabel *label) m_statusLabel = label; } -KSelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static +KSelectAction *PlayerManager::playerSelectAction(TQObject *tqparent) // static { KSelectAction *action = 0; - action = new KSelectAction(i18n("&Output To"), 0, parent, "outputSelect"); + action = new KSelectAction(i18n("&Output To"), 0, tqparent, "outputSelect"); TQStringList l; #if HAVE_ARTS |