aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/mpris/mpris2/player2object.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
commitb917024aa1ac4cb0a40164132db3c6d2913157eb (patch)
tree4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins/General/mpris/mpris2/player2object.cpp
parentbef5a901922c002815d047d276e61ec0bf8c0f46 (diff)
downloadqmmp-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/plugins/General/mpris/mpris2/player2object.cpp')
-rw-r--r--src/plugins/General/mpris/mpris2/player2object.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/mpris2/player2object.cpp
index 962d8a618..aae3cdda6 100644
--- a/src/plugins/General/mpris/mpris2/player2object.cpp
+++ b/src/plugins/General/mpris/mpris2/player2object.cpp
@@ -32,7 +32,7 @@
Player2Object::Player2Object(QObject *parent) : QDBusAbstractAdaptor(parent)
{
- m_prev_track = 0;
+ m_prev_track = nullptr;
m_previous_pos = 0;
m_core = SoundCore::instance();
m_player = MediaPlayer::instance();
@@ -49,7 +49,7 @@ Player2Object::Player2Object(QObject *parent) : QDBusAbstractAdaptor(parent)
connect(m_ui_settings, SIGNAL(shuffleChanged(bool)), SLOT(emitPropertiesChanged()));
connect(m_pl_manager, SIGNAL(currentPlayListChanged(PlayListModel*,PlayListModel*)),
SLOT(setModel(PlayListModel*,PlayListModel*)));
- setModel(m_pl_manager->currentPlayList(), 0);
+ setModel(m_pl_manager->currentPlayList(), nullptr);
updateId();
syncProperties();
}
@@ -64,7 +64,7 @@ bool Player2Object::canControl() const
bool Player2Object::canGoNext() const
{
- return m_pl_manager->currentPlayList()->nextTrack() != 0;
+ return m_pl_manager->currentPlayList()->nextTrack() != nullptr;
}
bool Player2Object::canGoPrevious() const
@@ -371,7 +371,7 @@ void Player2Object::disconnectPl()
void Player2Object::setModel(PlayListModel *selected, PlayListModel *previous)
{
if(previous)
- disconnect(previous, 0, this, 0); //disconnect previous model
+ disconnect(previous, nullptr, this, nullptr); //disconnect previous model
connect(selected, SIGNAL(listChanged(int)), SLOT(emitPropertiesChanged()));
}