From b917024aa1ac4cb0a40164132db3c6d2913157eb Mon Sep 17 00:00:00 2001 From: trialuser02 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/scrobbler/scrobbler.cpp | 18 +++++++++--------- src/plugins/General/scrobbler/scrobbler.h | 4 ++-- src/plugins/General/scrobbler/scrobblerhandler.h | 2 +- src/plugins/General/scrobbler/settingsdialog.h | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/plugins/General/scrobbler') diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp index 468a88bd6..6082b237a 100644 --- a/src/plugins/General/scrobbler/scrobbler.cpp +++ b/src/plugins/General/scrobbler/scrobbler.cpp @@ -82,9 +82,9 @@ void ScrobblerResponse::parse(QIODevice *device) Scrobbler::Scrobbler(const QString &scrobblerUrl, const QString &name, QObject *parent) : QObject(parent) { - m_notificationReply = 0; + m_notificationReply = nullptr; m_submitedSongs = 0; - m_submitReply = 0; + m_submitReply = nullptr; m_previousState = Qmmp::Stopped; m_elapsed = 0; m_scrobblerUrl = scrobblerUrl; @@ -211,7 +211,7 @@ void Scrobbler::processResponse(QNetworkReply *reply) if (reply == m_submitReply) { - m_submitReply = 0; + m_submitReply = nullptr; if (response.status == "ok") { qDebug("Scrobbler[%s]: submited %d song(s)", qPrintable(m_name), m_submitedSongs); @@ -248,7 +248,7 @@ void Scrobbler::processResponse(QNetworkReply *reply) } else if (reply == m_notificationReply) { - m_notificationReply = 0; + m_notificationReply = nullptr; if(response.status == "ok") { qDebug("Scrobbler[%s]: Now-Playing notification done", qPrintable(m_name)); @@ -386,8 +386,8 @@ void Scrobbler::sendNotification(const SongInfo &info) ScrobblerAuth::ScrobblerAuth(const QString &scrobblerUrl, const QString &authUrl, const QString &name, QObject *parent) : QObject(parent) { - m_getTokenReply = 0; - m_getSessionReply = 0; + m_getTokenReply = nullptr; + m_getSessionReply = nullptr; m_scrobblerUrl = scrobblerUrl; m_authUrl = authUrl; m_name = name; @@ -522,7 +522,7 @@ void ScrobblerAuth::processResponse(QNetworkReply *reply) if (reply == m_getTokenReply) { - m_getTokenReply = 0; + m_getTokenReply = nullptr; if(response.status == "ok") { m_token = response.token; @@ -548,7 +548,7 @@ void ScrobblerAuth::processResponse(QNetworkReply *reply) } else if(reply == m_getSessionReply) { - m_getSessionReply = 0; + m_getSessionReply = nullptr; m_session.clear(); if(response.status == "ok") { @@ -586,7 +586,7 @@ void ScrobblerAuth::processResponse(QNetworkReply *reply) } else if(reply == m_checkSessionReply) { - m_checkSessionReply = 0; + m_checkSessionReply = nullptr; if(response.status == "ok") { qDebug("ScrobblerAuth[%s]: session ok", qPrintable(m_name)); diff --git a/src/plugins/General/scrobbler/scrobbler.h b/src/plugins/General/scrobbler/scrobbler.h index d87a92778..8efb39098 100644 --- a/src/plugins/General/scrobbler/scrobbler.h +++ b/src/plugins/General/scrobbler/scrobbler.h @@ -56,7 +56,7 @@ class Scrobbler : public QObject { Q_OBJECT public: - Scrobbler(const QString &scrobblerUrl, const QString &name,QObject *parent = 0); + Scrobbler(const QString &scrobblerUrl, const QString &name,QObject *parent = nullptr); ~Scrobbler(); private slots: @@ -93,7 +93,7 @@ class ScrobblerAuth : public QObject Q_OBJECT public: explicit ScrobblerAuth(const QString &scrobblerUrl, const QString &authUrl, - const QString &name, QObject *parent = 0); + const QString &name, QObject *parent = nullptr); void getToken(); void getSession(); void checkSession(const QString &session); diff --git a/src/plugins/General/scrobbler/scrobblerhandler.h b/src/plugins/General/scrobbler/scrobblerhandler.h index b9eb37aa4..9a923bf87 100644 --- a/src/plugins/General/scrobbler/scrobblerhandler.h +++ b/src/plugins/General/scrobbler/scrobblerhandler.h @@ -33,7 +33,7 @@ class ScrobblerHandler : public QObject Q_OBJECT public: - ScrobblerHandler(QObject *parent = 0); + ScrobblerHandler(QObject *parent = nullptr); ~ScrobblerHandler(); }; diff --git a/src/plugins/General/scrobbler/settingsdialog.h b/src/plugins/General/scrobbler/settingsdialog.h index 953bc330f..b82af0029 100644 --- a/src/plugins/General/scrobbler/settingsdialog.h +++ b/src/plugins/General/scrobbler/settingsdialog.h @@ -32,7 +32,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); -- cgit v1.2.3-13-gbd6f