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/Input/sid/decoder_sid.cpp | 4 ++-- src/plugins/Input/sid/decodersidfactory.cpp | 2 +- src/plugins/Input/sid/settingsdialog.h | 2 +- src/plugins/Input/sid/sidhelper.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/plugins/Input/sid') diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp index 6fa67f577..889c762d3 100644 --- a/src/plugins/Input/sid/decoder_sid.cpp +++ b/src/plugins/Input/sid/decoder_sid.cpp @@ -32,7 +32,7 @@ #include "decoder_sid.h" // Decoder class -DecoderSID::DecoderSID(SidDatabase *db, const QString &url) : Decoder(), m_tune(0) +DecoderSID::DecoderSID(SidDatabase *db, const QString &url) : Decoder(), m_tune(nullptr) { m_db = db; m_url = url; @@ -102,7 +102,7 @@ bool DecoderSID::initialize() qDebug("DecoderSID: song length: %d", m_length); - sidbuilder *rs = 0; + sidbuilder *rs = nullptr; if(settings.value("engine", "residfp").toString() == "residfp") { rs = new ReSIDfpBuilder("ReSIDfp builder"); diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp index fa54057d8..c30c7ff6b 100644 --- a/src/plugins/Input/sid/decodersidfactory.cpp +++ b/src/plugins/Input/sid/decodersidfactory.cpp @@ -100,7 +100,7 @@ MetaDataModel* DecoderSIDFactory::createMetaDataModel(const QString &path, bool { Q_UNUSED(path); Q_UNUSED(readOnly); - return 0; + return nullptr; } void DecoderSIDFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/sid/settingsdialog.h b/src/plugins/Input/sid/settingsdialog.h index 8bbdf3fec..01f784692 100644 --- a/src/plugins/Input/sid/settingsdialog.h +++ b/src/plugins/Input/sid/settingsdialog.h @@ -31,7 +31,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(SidDatabase *db, QWidget *parent = 0); + SettingsDialog(SidDatabase *db, QWidget *parent = nullptr); virtual ~SettingsDialog(); diff --git a/src/plugins/Input/sid/sidhelper.cpp b/src/plugins/Input/sid/sidhelper.cpp index 999edcbcf..9700b671f 100644 --- a/src/plugins/Input/sid/sidhelper.cpp +++ b/src/plugins/Input/sid/sidhelper.cpp @@ -24,7 +24,7 @@ SIDHelper::SIDHelper(SidDatabase *db) { - m_tune = 0; + m_tune = nullptr; m_db = db; } @@ -32,7 +32,7 @@ SIDHelper::~SIDHelper() { if(m_tune) delete m_tune; - m_tune = 0; + m_tune = nullptr; } SidTune *SIDHelper::load(const QString &url) @@ -40,7 +40,7 @@ SidTune *SIDHelper::load(const QString &url) if(m_tune) { delete m_tune; - m_tune = 0; + m_tune = nullptr; } QString path = url; int track = 1; -- cgit v1.2.3-13-gbd6f