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

8 files changed, 20 insertions, 20 deletions

diff --git a/src/plugins/Transports/http/httpinputfactory.h b/src/plugins/Transports/http/httpinputfactory.h
index 215bacb56..5e5e37d52 100644
--- a/src/plugins/Transports/http/httpinputfactory.h
+++ b/src/plugins/Transports/http/httpinputfactory.h
@@ -35,7 +35,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0")
 Q_INTERFACES(InputSourceFactory)
 public:
     InputSourceProperties properties() const;
-    InputSource *create(const QString &url, QObject *parent = 0);
+    InputSource *create(const QString &url, QObject *parent = nullptr);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
     QString translation() const;
diff --git a/src/plugins/Transports/http/httpinputsource.h b/src/plugins/Transports/http/httpinputsource.h
index d109589f3..809b27ac5 100644
--- a/src/plugins/Transports/http/httpinputsource.h
+++ b/src/plugins/Transports/http/httpinputsource.h
@@ -32,7 +32,7 @@ class HTTPInputSource : public InputSource
 {
 Q_OBJECT
 public:
-    HTTPInputSource(const QString &path, QObject *parent = 0);
+    HTTPInputSource(const QString &path, QObject *parent = nullptr);
 
     QIODevice *ioDevice();
     bool initialize();
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index 258d8c035..eb54bfeb8 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -142,11 +142,11 @@ HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent)
     curl_global_init(CURL_GLOBAL_ALL);
     m_stream.buf_fill = 0;
     m_stream.buf_size = 0;
-    m_stream.buf = 0;
+    m_stream.buf = nullptr;
     m_stream.icy_meta_data = false;
     m_stream.aborted = true;
     m_stream.icy_metaint = 0;
-    m_handle = 0;
+    m_handle = nullptr;
     m_metacount = 0;
     m_meta_sent = false;
     m_ready = false;
@@ -162,8 +162,8 @@ HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent)
     if (!m_codec)
         m_codec = QTextCodec::codecForName ("UTF-8");
 #ifdef WITH_ENCA
-    m_analyser = 0;
-    m_prevCodec = 0;
+    m_analyser = nullptr;
+    m_prevCodec = nullptr;
     if(settings.value("use_enca", false).toBool())
         m_analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData());
     if(m_analyser)
@@ -182,7 +182,7 @@ HttpStreamReader::~HttpStreamReader()
     if (m_stream.buf)
         free(m_stream.buf);
 
-    m_stream.buf = 0;
+    m_stream.buf = nullptr;
 #ifdef WITH_ENCA
     if(m_analyser)
         enca_analyser_free(m_analyser);
@@ -307,7 +307,7 @@ void HttpStreamReader::abort()
     if (m_handle)
     {
         curl_easy_cleanup(m_handle);
-        m_handle = 0;
+        m_handle = nullptr;
     }
     QIODevice::close();
 }
@@ -368,15 +368,15 @@ void HttpStreamReader::run()
     // error message
     curl_easy_setopt(m_handle, CURLOPT_ERRORBUFFER, errorBuffer);
 
-    struct curl_slist *http200_aliases = curl_slist_append(NULL, "ICY");
-    struct curl_slist *http_headers = curl_slist_append(NULL, "Icy-MetaData: 1");
+    struct curl_slist *http200_aliases = curl_slist_append(nullptr, "ICY");
+    struct curl_slist *http_headers = curl_slist_append(nullptr, "Icy-MetaData: 1");
     curl_easy_setopt(m_handle, CURLOPT_HTTP200ALIASES, http200_aliases);
     curl_easy_setopt(m_handle, CURLOPT_HTTPHEADER, http_headers);
     m_mutex.lock();
     if(m_stream.buf)
     {
         free(m_stream.buf);
-        m_stream.buf = 0;
+        m_stream.buf = nullptr;
     }
     m_stream.buf_fill = 0;
     m_stream.buf_size = m_prebuffer_size * 2;
diff --git a/src/plugins/Transports/http/settingsdialog.h b/src/plugins/Transports/http/settingsdialog.h
index ae6c66f1b..d85dc2d69 100644
--- a/src/plugins/Transports/http/settingsdialog.h
+++ b/src/plugins/Transports/http/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
 {
 Q_OBJECT
 public:
-    SettingsDialog(QWidget *parent = 0);
+    SettingsDialog(QWidget *parent = nullptr);
 
     ~SettingsDialog();
 
diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h
index d9f083262..da9698eb6 100644
--- a/src/plugins/Transports/mms/mmsinputfactory.h
+++ b/src/plugins/Transports/mms/mmsinputfactory.h
@@ -35,7 +35,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0")
 Q_INTERFACES(InputSourceFactory)
 public:
     InputSourceProperties properties() const;
-    InputSource *create(const QString &url, QObject *parent = 0);
+    InputSource *create(const QString &url, QObject *parent = nullptr);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
     QString translation() const;
diff --git a/src/plugins/Transports/mms/mmsinputsource.h b/src/plugins/Transports/mms/mmsinputsource.h
index c7105a6c5..d125a2c45 100644
--- a/src/plugins/Transports/mms/mmsinputsource.h
+++ b/src/plugins/Transports/mms/mmsinputsource.h
@@ -32,7 +32,7 @@ class MMSInputSource : public InputSource
 {
 Q_OBJECT
 public:
-    MMSInputSource(const QString &path, QObject *parent = 0);
+    MMSInputSource(const QString &path, QObject *parent = nullptr);
 
     QIODevice *ioDevice();
     bool initialize();
diff --git a/src/plugins/Transports/mms/mmsstreamreader.cpp b/src/plugins/Transports/mms/mmsstreamreader.cpp
index 73bb1bdbb..1acbbdb4c 100644
--- a/src/plugins/Transports/mms/mmsstreamreader.cpp
+++ b/src/plugins/Transports/mms/mmsstreamreader.cpp
@@ -31,7 +31,7 @@ MMSStreamReader::MMSStreamReader(const QString &url, MMSInputSource *parent) : Q
 {
     m_parent = parent;
     m_url = url;
-    m_handle = 0;
+    m_handle = nullptr;
     m_aborted = false;
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     m_prebuf_size = settings.value("MMS/buffer_size",384).toInt() * 1024;
@@ -47,7 +47,7 @@ MMSStreamReader::~MMSStreamReader()
     qDebug("%s", Q_FUNC_INFO);
     abort();
     free(m_buffer);
-    m_buffer = 0;
+    m_buffer = nullptr;
     m_buffer_at = 0;
     m_buffer_size = 0;
 }
@@ -128,7 +128,7 @@ void MMSStreamReader::abort()
     m_ready = false;
     if (m_handle)
         mmsx_close(m_handle);
-    m_handle = 0;
+    m_handle = nullptr;
 }
 
 qint64 MMSStreamReader::bytesAvailable() const
@@ -140,7 +140,7 @@ void MMSStreamReader::run()
 {
     int to_read = 1024;
     char prebuf[to_read];
-    m_handle = mmsx_connect (0, 0, m_url.toLocal8Bit().constData(), 128 * 1024);
+    m_handle = mmsx_connect (nullptr, nullptr, m_url.toLocal8Bit().constData(), 128 * 1024);
     if(!m_handle)
     {
         qWarning("MMSStreamReader: connection failed");
@@ -168,7 +168,7 @@ void MMSStreamReader::run()
             m_buffer = (char *)realloc(m_buffer, m_buffer_size);
         }
         m_mutex.unlock();
-        len = mmsx_read (0, m_handle, prebuf, to_read);
+        len = mmsx_read (nullptr, m_handle, prebuf, to_read);
         m_mutex.lock();
         if(len < 0)
         {
diff --git a/src/plugins/Transports/mms/settingsdialog.h b/src/plugins/Transports/mms/settingsdialog.h
index cbf94c84d..8d109b132 100644
--- a/src/plugins/Transports/mms/settingsdialog.h
+++ b/src/plugins/Transports/mms/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
 {
 Q_OBJECT
 public:
-    SettingsDialog(QWidget *parent = 0);
+    SettingsDialog(QWidget *parent = nullptr);
 
     ~SettingsDialog();