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/archive | |
| 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/archive')
| -rw-r--r-- | src/plugins/Input/archive/archiveinputdevice.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/Input/archive/archiveinputdevice.h | 4 | ||||
| -rw-r--r-- | src/plugins/Input/archive/decoder_archive.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/Input/archive/decoderarchivefactory.cpp | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/Input/archive/archiveinputdevice.cpp b/src/plugins/Input/archive/archiveinputdevice.cpp index 6056dca98..8d10647ab 100644 --- a/src/plugins/Input/archive/archiveinputdevice.cpp +++ b/src/plugins/Input/archive/archiveinputdevice.cpp @@ -23,8 +23,8 @@ ArchiveInputDevice::ArchiveInputDevice(const QString &url, QObject *parent) : QIODevice(parent) { - m_archive = 0; - m_entry = 0; + m_archive = nullptr; + m_entry = nullptr; QString filePath = url.section("#", -1); QString archivePath = url; archivePath.remove(QRegExp("^.+://")); @@ -74,7 +74,7 @@ ArchiveInputDevice::~ArchiveInputDevice() { archive_read_close(m_archive); archive_read_free(m_archive); - m_archive = 0; + m_archive = nullptr; } } diff --git a/src/plugins/Input/archive/archiveinputdevice.h b/src/plugins/Input/archive/archiveinputdevice.h index eab4747eb..e6c31fdda 100644 --- a/src/plugins/Input/archive/archiveinputdevice.h +++ b/src/plugins/Input/archive/archiveinputdevice.h @@ -30,8 +30,8 @@ class ArchiveInputDevice : public QIODevice { Q_OBJECT public: - ArchiveInputDevice(const QString &url, QObject *parent = 0); - ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = 0); + ArchiveInputDevice(const QString &url, QObject *parent = nullptr); + ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = nullptr); virtual ~ArchiveInputDevice(); bool seek(qint64 pos); diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp index d4cd7933d..fa5bcf292 100644 --- a/src/plugins/Input/archive/decoder_archive.cpp +++ b/src/plugins/Input/archive/decoder_archive.cpp @@ -27,8 +27,8 @@ DecoderArchive::DecoderArchive(const QString &url) { m_url = url; - m_decoder = 0; - m_input = 0; + m_decoder = nullptr; + m_input = nullptr; } DecoderArchive::~DecoderArchive() @@ -36,12 +36,12 @@ DecoderArchive::~DecoderArchive() if(m_decoder) { delete m_decoder; - m_decoder = 0; + m_decoder = nullptr; } if(m_input) { delete m_input; - m_input = 0; + m_input = nullptr; } } @@ -80,7 +80,7 @@ bool DecoderArchive::initialize() return false; } - DecoderFactory *factory = 0; + DecoderFactory *factory = nullptr; if(filtered.size() == 1) factory = filtered.first(); else diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp index 50a994229..2b0f6ce25 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.cpp +++ b/src/plugins/Input/archive/decoderarchivefactory.cpp @@ -56,7 +56,7 @@ Decoder *DecoderArchiveFactory::create(const QString &url, QIODevice *) QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *) { QList<TrackInfo *> list; - struct archive_entry *entry = 0; + struct archive_entry *entry = nullptr; struct archive *a = archive_read_new(); archive_read_support_filter_all(a); @@ -109,7 +109,7 @@ QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, Tr .arg(archivePath) .arg(filePath)); - ArchiveInputDevice dev(a, entry, 0); + ArchiveInputDevice dev(a, entry, nullptr); ArchiveTagReader reader(&dev, list.last()->path()); if(parts & TrackInfo::MetaData) @@ -140,7 +140,7 @@ MetaDataModel* DecoderArchiveFactory::createMetaDataModel(const QString &path, b { Q_UNUSED(path); Q_UNUSED(readOnly); - return 0; + return nullptr; } void DecoderArchiveFactory::showSettings(QWidget *) |
