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/cue/cueparser.cpp | 4 ++-- src/plugins/Input/cue/decoder_cue.cpp | 18 +++++++++--------- src/plugins/Input/cue/decodercuefactory.cpp | 2 +- src/plugins/Input/cue/settingsdialog.h | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/plugins/Input/cue') diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index 350d6f76e..b50eda92d 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.cpp @@ -49,9 +49,9 @@ CUEParser::CUEParser(const QString &path) QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("CUE"); m_dirty = settings.value("dirty_cue", false).toBool(); - QTextCodec *codec = 0; + QTextCodec *codec = nullptr; #ifdef WITH_ENCA - EncaAnalyser analyser = 0; + EncaAnalyser analyser = nullptr; if(settings.value("use_enca", false).toBool()) { analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData()); diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index e21dfdca5..ae7f06edc 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -33,27 +33,27 @@ DecoderCUE::DecoderCUE(const QString &url) : Decoder() { m_path = url; - m_decoder = 0; - m_parser = 0; + m_decoder = nullptr; + m_parser = nullptr; m_track = 0; - m_buf = 0; - m_input = 0; + m_buf = nullptr; + m_input = nullptr; } DecoderCUE::~DecoderCUE() { if(m_decoder) delete m_decoder; - m_decoder = 0; + m_decoder = nullptr; if(m_parser) delete m_parser; - m_parser = 0; + m_parser = nullptr; if(m_buf) delete [] m_buf; - m_buf = 0; + m_buf = nullptr; if(m_input) m_input->deleteLater(); - m_input = 0; + m_input = nullptr; } bool DecoderCUE::initialize() @@ -134,7 +134,7 @@ qint64 DecoderCUE::read(unsigned char *data, qint64 size) if(size >= m_buf_size) { delete[] m_buf; - m_buf = 0; + m_buf = nullptr; m_buf_size = 0; } else diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index 103f4b597..35d66e1dd 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -77,7 +77,7 @@ QList DecoderCUEFactory::createPlayList(const QString &path, TrackI MetaDataModel* DecoderCUEFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(readOnly); - return path.startsWith("cue://") ? new CUEMetaDataModel(path) : 0; + return path.startsWith("cue://") ? new CUEMetaDataModel(path) : nullptr; } void DecoderCUEFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/cue/settingsdialog.h b/src/plugins/Input/cue/settingsdialog.h index 60bdc6c07..158be59dd 100644 --- a/src/plugins/Input/cue/settingsdialog.h +++ b/src/plugins/Input/cue/settingsdialog.h @@ -30,7 +30,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); -- cgit v1.2.3-13-gbd6f