diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-01-03 07:41:04 +0000 |
| commit | b917024aa1ac4cb0a40164132db3c6d2913157eb (patch) | |
| tree | 4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins/Input/wavpack | |
| parent | bef5a901922c002815d047d276e61ec0bf8c0f46 (diff) | |
| download | qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.gz qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.bz2 qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.zip | |
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
Diffstat (limited to 'src/plugins/Input/wavpack')
| -rw-r--r-- | src/plugins/Input/wavpack/decoder_wavpack.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/Input/wavpack/decoderwavpackfactory.cpp | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index e97e1b95b..5ca7a1c50 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -38,9 +38,9 @@ DecoderWavPack::DecoderWavPack(const QString &path) m_path = path; m_totalTime = 0.0; m_chan = 0; - m_context = 0; - m_parser = 0; - m_output_buf = 0; + m_context = nullptr; + m_parser = nullptr; + m_output_buf = nullptr; m_length_in_bytes = 0; m_totalBytes = 0; m_frame_size = 0; @@ -54,7 +54,7 @@ DecoderWavPack::~DecoderWavPack() deinit(); if (m_output_buf) delete [] m_output_buf; - m_output_buf = 0; + m_output_buf = nullptr; } bool DecoderWavPack::initialize() @@ -79,7 +79,7 @@ bool DecoderWavPack::initialize() qWarning("DecoderWavPack: error: %s", err); return false; } - int cue_len = WavpackGetTagItem (m_context, "cuesheet", NULL, 0); + int cue_len = WavpackGetTagItem (m_context, "cuesheet", nullptr, 0); char *value; if (cue_len) { @@ -173,10 +173,10 @@ void DecoderWavPack::deinit() m_chan = 0; if (m_context) WavpackCloseFile (m_context); - m_context = 0; + m_context = nullptr; if(m_parser) delete m_parser; - m_parser = 0; + m_parser = nullptr; } void DecoderWavPack::seek(qint64 time) diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index f63ccc54d..139fe7494 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -96,7 +96,7 @@ QList<TrackInfo *> DecoderWavPackFactory::createPlayList(const QString &path, Tr if(parts & TrackInfo::MetaData) { - cue_len = WavpackGetTagItem (ctx, "cuesheet", NULL, 0); + cue_len = WavpackGetTagItem (ctx, "cuesheet", nullptr, 0); if (cue_len) { delete info; @@ -165,7 +165,7 @@ MetaDataModel* DecoderWavPackFactory::createMetaDataModel(const QString &path, b if (!path.contains("://") || path.startsWith("wvpack://")) return new WavPackMetaDataModel(path, readOnly); else - return 0; + return nullptr; } void DecoderWavPackFactory::showSettings(QWidget *) |
