diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
| commit | b917024aa1ac4cb0a40164132db3c6d2913157eb (patch) | |
| tree | 4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/qmmpui/mediaplayer.cpp | |
| parent | bef5a901922c002815d047d276e61ec0bf8c0f46 (diff) | |
| download | qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.gz qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.bz2 qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.zip | |
fixed build with -Werror=zero-as-null-pointer-constant
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8572 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/qmmpui/mediaplayer.cpp')
| -rw-r--r-- | src/qmmpui/mediaplayer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp index 8dd0fbf61..f9a6f85ef 100644 --- a/src/qmmpui/mediaplayer.cpp +++ b/src/qmmpui/mediaplayer.cpp @@ -27,7 +27,7 @@ #include "qmmpuisettings.h" #include "mediaplayer.h" -MediaPlayer *MediaPlayer::m_instance = 0; +MediaPlayer *MediaPlayer::m_instance = nullptr; MediaPlayer::MediaPlayer(QObject *parent) : QObject(parent) @@ -35,8 +35,8 @@ MediaPlayer::MediaPlayer(QObject *parent) if(m_instance) qFatal("StateHandler: only one instance is allowed"); m_instance = this; - m_pl_manager = 0; - m_core = 0; + m_pl_manager = nullptr; + m_core = nullptr; m_skips = 0; m_finishTimer = new QTimer(this); m_finishTimer->setSingleShot(true); @@ -57,7 +57,7 @@ MediaPlayer::MediaPlayer(QObject *parent) MediaPlayer::~MediaPlayer() { - m_instance = 0; + m_instance = nullptr; } MediaPlayer* MediaPlayer::instance() @@ -142,7 +142,7 @@ void MediaPlayer::playNext() void MediaPlayer::updateNextUrl() { m_nextUrl.clear(); - PlayListTrack *track = 0; + PlayListTrack *track = nullptr; if(m_settings->isRepeatableTrack()) track = m_pl_manager->currentPlayList()->currentTrack(); else if(!m_settings->isNoPlayListAdvance()) |