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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/Input/gme/decoder_gme.cpp b/src/plugins/Input/gme/decoder_gme.cpp
index 3eca96348..4de43f802 100644
--- a/src/plugins/Input/gme/decoder_gme.cpp
+++ b/src/plugins/Input/gme/decoder_gme.cpp
@@ -26,7 +26,7 @@
 DecoderGme::DecoderGme(const QString &path) : Decoder()
 {
     m_path = path;
-    m_emu = 0;
+    m_emu = nullptr;
 }
 
 DecoderGme::~DecoderGme()
@@ -44,7 +44,7 @@ bool DecoderGme::initialize()
     {
         qWarning("DecoderGme: track number is out of range");
         gme_delete(m_emu);
-        m_emu = 0;
+        m_emu = nullptr;
         return false;
     }
     gme_start_track(m_emu, track - 1);
diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp
index cbd7fed44..50fee26a1 100644
--- a/src/plugins/Input/gme/decodergmefactory.cpp
+++ b/src/plugins/Input/gme/decodergmefactory.cpp
@@ -89,7 +89,7 @@ MetaDataModel* DecoderGmeFactory::createMetaDataModel(const QString &path, bool
 {
     Q_UNUSED(path);
     Q_UNUSED(readOnly);
-    return 0;
+    return nullptr;
 }
 
 void DecoderGmeFactory::showSettings(QWidget *parent)
diff --git a/src/plugins/Input/gme/gmehelper.cpp b/src/plugins/Input/gme/gmehelper.cpp
index 04a335701..fad5274f5 100644
--- a/src/plugins/Input/gme/gmehelper.cpp
+++ b/src/plugins/Input/gme/gmehelper.cpp
@@ -25,7 +25,7 @@
 
 GmeHelper::GmeHelper()
 {
-     m_emu = 0;
+     m_emu = nullptr;
 
      QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
      m_fade_length = settings.value("GME/fadeout_length", 7000).toInt();
@@ -37,41 +37,41 @@ GmeHelper::~GmeHelper()
 {
     if(m_emu)
         gme_delete(m_emu);
-    m_emu = 0;
+    m_emu = nullptr;
 }
 
 Music_Emu *GmeHelper::load(const QString &url, int sample_rate)
 {
     if(m_emu)
         gme_delete(m_emu);
-    m_emu = 0;
+    m_emu = nullptr;
     QString path = url;
     if(url.contains("://"))
     {
         path.remove("gme://");
         path.remove(QRegExp("#\\d+$"));
     }
-    const char *err = 0;
+    const char *err = nullptr;
     gme_type_t file_type;
     if((err = gme_identify_file(qPrintable(path),&file_type)))
     {
         qWarning("GmeHelper: %s", err);
-        return 0;
+        return nullptr;
     }
     if(!file_type)
     {
         qWarning("DecoderGme: unsupported music type");
-        return 0;
+        return nullptr;
     }
     if(!(m_emu = gme_new_emu(file_type, sample_rate)))
     {
         qWarning("GmeHelper: out of memory");
-        return 0;
+        return nullptr;
     }
     if((err = gme_load_file(m_emu, qPrintable(path))))
     {
         qWarning("GmeHelper: %s", err);
-        return 0;
+        return nullptr;
     }
     QString m3u_path = path.left(path.lastIndexOf("."));
     m3u_path.append(".m3u");
diff --git a/src/plugins/Input/gme/settingsdialog.h b/src/plugins/Input/gme/settingsdialog.h
index c320153b7..5b4df41da 100644
--- a/src/plugins/Input/gme/settingsdialog.h
+++ b/src/plugins/Input/gme/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit SettingsDialog(QWidget *parent = 0);
+    explicit SettingsDialog(QWidget *parent = nullptr);
     ~SettingsDialog();
 
 public slots: