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/wildmidi/decoder_wildmidi.cpp | 2 +- src/plugins/Input/wildmidi/decoderwildmidifactory.cpp | 2 +- src/plugins/Input/wildmidi/settingsdialog.h | 2 +- src/plugins/Input/wildmidi/wildmidihelper.cpp | 4 ++-- src/plugins/Input/wildmidi/wildmidihelper.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/Input/wildmidi') diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp index 198175d4c..f3c2e459c 100644 --- a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp +++ b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp @@ -26,7 +26,7 @@ DecoderWildMidi::DecoderWildMidi(const QString &path) : Decoder() { m_path = path; - midi_ptr = 0; + midi_ptr = nullptr; m_sample_rate = 0; } diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp index c57d14c49..540846af5 100644 --- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp +++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp @@ -92,7 +92,7 @@ MetaDataModel* DecoderWildMidiFactory::createMetaDataModel(const QString &path, { Q_UNUSED(path); Q_UNUSED(readOnly); - return 0; + return nullptr; } void DecoderWildMidiFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/wildmidi/settingsdialog.h b/src/plugins/Input/wildmidi/settingsdialog.h index 2b706f1f3..d190ebe7d 100644 --- a/src/plugins/Input/wildmidi/settingsdialog.h +++ b/src/plugins/Input/wildmidi/settingsdialog.h @@ -31,7 +31,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); diff --git a/src/plugins/Input/wildmidi/wildmidihelper.cpp b/src/plugins/Input/wildmidi/wildmidihelper.cpp index 612e544f7..812930561 100644 --- a/src/plugins/Input/wildmidi/wildmidihelper.cpp +++ b/src/plugins/Input/wildmidi/wildmidihelper.cpp @@ -26,7 +26,7 @@ extern "C"{ #include #include "wildmidihelper.h" -WildMidiHelper *WildMidiHelper::m_instance = 0; +WildMidiHelper *WildMidiHelper::m_instance = nullptr; WildMidiHelper::WildMidiHelper(QObject *parent) : QObject(parent) @@ -40,7 +40,7 @@ WildMidiHelper::~WildMidiHelper() { if(m_inited) WildMidi_Shutdown(); - m_instance = 0; + m_instance = nullptr; } bool WildMidiHelper::initialize() diff --git a/src/plugins/Input/wildmidi/wildmidihelper.h b/src/plugins/Input/wildmidi/wildmidihelper.h index 9c4141ecd..7d50775c7 100644 --- a/src/plugins/Input/wildmidi/wildmidihelper.h +++ b/src/plugins/Input/wildmidi/wildmidihelper.h @@ -29,7 +29,7 @@ class WildMidiHelper : public QObject { Q_OBJECT public: - explicit WildMidiHelper(QObject *parent = 0); + explicit WildMidiHelper(QObject *parent = nullptr); ~WildMidiHelper(); bool initialize(); void readSettings(); -- cgit v1.2.3-13-gbd6f