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/modplug | |
| 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/modplug')
| -rw-r--r-- | src/plugins/Input/modplug/archivereader.h | 2 | ||||
| -rw-r--r-- | src/plugins/Input/modplug/decoder_modplug.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/Input/modplug/decodermodplugfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/modplug/modplugmetadatamodel.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/modplug/settingsdialog.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/Input/modplug/archivereader.h b/src/plugins/Input/modplug/archivereader.h index 3357e1142..7a714e385 100644 --- a/src/plugins/Input/modplug/archivereader.h +++ b/src/plugins/Input/modplug/archivereader.h @@ -32,7 +32,7 @@ class ArchiveReader : public QObject { Q_OBJECT public: - ArchiveReader(QObject *parent = 0); + ArchiveReader(QObject *parent = nullptr); ~ArchiveReader(); diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp index 2c386e7ee..a2924c183 100644 --- a/src/plugins/Input/modplug/decoder_modplug.cpp +++ b/src/plugins/Input/modplug/decoder_modplug.cpp @@ -39,16 +39,16 @@ // Decoder class -DecoderModPlug* DecoderModPlug::m_instance = 0; +DecoderModPlug* DecoderModPlug::m_instance = nullptr; -DecoderModPlug::DecoderModPlug(const QString &path) : Decoder(0) +DecoderModPlug::DecoderModPlug(const QString &path) : Decoder(nullptr) { m_path = path; m_freq = 0; m_bitrate = 0; m_totalTime = 0; m_chan = 0; - m_soundFile = 0; + m_soundFile = nullptr; m_sampleSize = 0; m_instance = this; m_bps = 0; @@ -60,7 +60,7 @@ DecoderModPlug::~DecoderModPlug() { deinit(); if(m_instance == this) - m_instance = 0; + m_instance = nullptr; } bool DecoderModPlug::initialize() @@ -166,7 +166,7 @@ void DecoderModPlug::deinit() { m_soundFile->Destroy(); delete m_soundFile; - m_soundFile = 0; + m_soundFile = nullptr; } m_input_buf.clear(); } diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 1e3174e88..bcba93e9c 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -73,7 +73,7 @@ QList<TrackInfo *> DecoderModPlugFactory::createPlayList(const QString &path, Tr QByteArray buffer; - ArchiveReader reader(0); + ArchiveReader reader(nullptr); if (reader.isSupported(path)) { buffer = reader.unpack(path); diff --git a/src/plugins/Input/modplug/modplugmetadatamodel.cpp b/src/plugins/Input/modplug/modplugmetadatamodel.cpp index 059901e71..9d4248dd6 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp +++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp @@ -31,7 +31,7 @@ ModPlugMetaDataModel::ModPlugMetaDataModel(const QString &path) : MetaDataModel(true) { - m_soundFile = 0; + m_soundFile = nullptr; m_path = path; ArchiveReader reader(nullptr); if(reader.isSupported(m_path)) diff --git a/src/plugins/Input/modplug/settingsdialog.h b/src/plugins/Input/modplug/settingsdialog.h index e154aaa32..bbd73129f 100644 --- a/src/plugins/Input/modplug/settingsdialog.h +++ b/src/plugins/Input/modplug/settingsdialog.h @@ -32,7 +32,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); |
