From b917024aa1ac4cb0a40164132db3c6d2913157eb Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 3 Jan 2019 07:41:04 +0000
Subject: 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
---
 src/plugins/General/mpris/mpris.h                  | 2 +-
 src/plugins/General/mpris/mpris2/player2object.cpp | 8 ++++----
 src/plugins/General/mpris/mpris2/player2object.h   | 2 +-
 src/plugins/General/mpris/mpris2/root2object.h     | 2 +-
 src/plugins/General/mpris/mprisfactory.cpp         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/plugins/General/mpris')

diff --git a/src/plugins/General/mpris/mpris.h b/src/plugins/General/mpris/mpris.h
index c6bffef50..a13ce2d96 100644
--- a/src/plugins/General/mpris/mpris.h
+++ b/src/plugins/General/mpris/mpris.h
@@ -33,7 +33,7 @@ class MPRIS : public QObject
 {
 Q_OBJECT
 public:
-    MPRIS(QObject *parent = 0);
+    MPRIS(QObject *parent = nullptr);
 
     ~MPRIS();
 };
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()));
 }
 
diff --git a/src/plugins/General/mpris/mpris2/player2object.h b/src/plugins/General/mpris/mpris2/player2object.h
index 901364181..af69844a4 100644
--- a/src/plugins/General/mpris/mpris2/player2object.h
+++ b/src/plugins/General/mpris/mpris2/player2object.h
@@ -58,7 +58,7 @@ Q_PROPERTY(bool Shuffle READ shuffle WRITE setShuffle)
 Q_PROPERTY(double Volume READ volume WRITE setVolume)
 
 public:
-    Player2Object(QObject *parent = 0);
+    Player2Object(QObject *parent = nullptr);
     virtual ~Player2Object();
     bool canControl() const;
     bool canGoNext() const;
diff --git a/src/plugins/General/mpris/mpris2/root2object.h b/src/plugins/General/mpris/mpris2/root2object.h
index c7b39892b..762e04655 100644
--- a/src/plugins/General/mpris/mpris2/root2object.h
+++ b/src/plugins/General/mpris/mpris2/root2object.h
@@ -39,7 +39,7 @@ Q_PROPERTY(QStringList SupportedMimeTypes READ supportedMimeTypes)
 Q_PROPERTY(QStringList SupportedUriSchemes READ supportedUriSchemes)
 
 public:
-    Root2Object(QObject *parent = 0);
+    Root2Object(QObject *parent = nullptr);
     virtual ~Root2Object();
 
     bool canQuit() const;
diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp
index a43139505..338b8f302 100644
--- a/src/plugins/General/mpris/mprisfactory.cpp
+++ b/src/plugins/General/mpris/mprisfactory.cpp
@@ -42,7 +42,7 @@ QObject *MPRISFactory::create(QObject *parent)
 
 QDialog *MPRISFactory::createConfigDialog(QWidget *)
 {
-    return 0;
+    return nullptr;
 }
 
 void MPRISFactory::showAbout(QWidget *parent)
-- 
cgit v1.2.3-13-gbd6f