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

3 files changed, 17 insertions, 17 deletions

diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp
index 29bd4b119..0f2c14df2 100644
--- a/src/plugins/Input/flac/decoder_flac.cpp
+++ b/src/plugins/Input/flac/decoder_flac.cpp
@@ -266,13 +266,13 @@ DecoderFLAC::DecoderFLAC(const QString &path, QIODevice *i)
 {
     m_path = path;
     m_data = new flac_data;
-    m_data->decoder = NULL;
+    m_data->decoder = nullptr;
     m_data->input = i;
-    m_parser = 0;
+    m_parser = nullptr;
     length_in_bytes = 0;
     m_totalBytes = 0;
     m_sz = 0;
-    m_buf = 0;
+    m_buf = nullptr;
     m_offset = 0;
     m_track = 0;
 }
@@ -286,11 +286,11 @@ DecoderFLAC::~DecoderFLAC()
         if (m_data->decoder)
             FLAC__stream_decoder_delete(m_data->decoder);
         delete m_data;
-        m_data = 0;
+        m_data = nullptr;
     }
     if(m_buf)
         delete[] m_buf;
-    m_buf = 0;
+    m_buf = nullptr;
 }
 
 bool DecoderFLAC::initialize()
@@ -506,7 +506,7 @@ qint64 DecoderFLAC::read(unsigned char *buf, qint64 size)
             if(size >= m_buf_size)
             {
                 delete[] m_buf;
-                m_buf = 0;
+                m_buf = nullptr;
                 m_buf_size = 0;
             }
             else
@@ -547,11 +547,11 @@ void DecoderFLAC::deinit()
     {
         m_data->input->close();
         delete m_data->input;
-        m_data->input = 0;
+        m_data->input = nullptr;
     };
     if(m_parser)
         delete m_parser;
-    m_parser = 0;
+    m_parser = nullptr;
 }
 
 const QString DecoderFLAC::nextURL() const
diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp
index 02ae1f6bf..28aec227a 100644
--- a/src/plugins/Input/flac/decoderflacfactory.cpp
+++ b/src/plugins/Input/flac/decoderflacfactory.cpp
@@ -91,11 +91,11 @@ QList<TrackInfo*> DecoderFLACFactory::createPlayList(const QString &path, TrackI
     if(parts == TrackInfo::NoParts)
         return QList<TrackInfo *>() << info;
 
-    TagLib::Ogg::XiphComment *tag = 0;
-    TagLib::FLAC::Properties *ap = 0;
+    TagLib::Ogg::XiphComment *tag = nullptr;
+    TagLib::FLAC::Properties *ap = nullptr;
 
-    TagLib::FLAC::File *flacFile = 0;
-    TagLib::Ogg::FLAC::File *oggFlacFile = 0;
+    TagLib::FLAC::File *flacFile = nullptr;
+    TagLib::Ogg::FLAC::File *oggFlacFile = nullptr;
 
     TagLib::FileStream stream(QStringToFileName(path), true);
 
@@ -200,7 +200,7 @@ MetaDataModel* DecoderFLACFactory::createMetaDataModel(const QString &path, bool
     if (!path.contains("://") || path.startsWith("flac://"))
         return new FLACMetaDataModel(path, readOnly);
     else
-        return 0;
+        return nullptr;
 }
 
 void DecoderFLACFactory::showSettings(QWidget *)
diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index ca06512b9..0457d22ef 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -38,9 +38,9 @@ FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly)
     : MetaDataModel(true)
 #endif
 {
-    m_file = 0;
-    m_stream = 0;
-    m_tag = 0;
+    m_file = nullptr;
+    m_stream = nullptr;
+    m_tag = nullptr;
 
     if(path.startsWith("flac://"))
     {
@@ -81,7 +81,7 @@ FLACMetaDataModel::~FLACMetaDataModel()
     if(m_file)
     {
         delete m_file;
-        m_file = 0;
+        m_file = nullptr;
     }
     if(m_stream)
         delete m_stream;