diff --git a/3rdparty/taglib/fileref.cpp b/3rdparty/taglib/fileref.cpp index 5ec4dc06d..2e6a1f5e3 100644 --- a/3rdparty/taglib/fileref.cpp +++ b/3rdparty/taglib/fileref.cpp @@ -74,7 +74,7 @@ namespace return file; } - return 0; + return nullptr; } // Detect the file type based on the file extension. @@ -98,7 +98,7 @@ namespace // that a default file type resolver is created. if(ext.isEmpty()) - return 0; + return nullptr; // .oga can be any audio in the Ogg container. So leave it to content-based detection. @@ -142,7 +142,7 @@ namespace if(ext == "DSF") return new DSF::File(stream, readAudioProperties, audioPropertiesStyle); - return 0; + return nullptr; } // Detect the file type based on the actual content of the stream. @@ -194,7 +194,7 @@ namespace delete file; } - return 0; + return nullptr; } // Internal function that supports FileRef::create(). @@ -220,7 +220,7 @@ namespace ext = s.substr(pos + 1).upper(); if(ext.isEmpty()) - return 0; + return nullptr; if(ext == "MP3") return new MPEG::File(fileName, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle); @@ -270,7 +270,7 @@ namespace if(ext == "DSF") return new DSF::File(fileName, readAudioProperties, audioPropertiesStyle); - return 0; + return nullptr; } } @@ -335,7 +335,7 @@ Tag *FileRef::tag() const { if(isNull()) { debug("FileRef::tag() - Called without a valid file."); - return 0; + return nullptr; } return d->file->tag(); } @@ -344,7 +344,7 @@ AudioProperties *FileRef::audioProperties() const { if(isNull()) { debug("FileRef::audioProperties() - Called without a valid file."); - return 0; + return nullptr; } return d->file->audioProperties(); } diff --git a/3rdparty/taglib/mp4/mp4atom.cpp b/3rdparty/taglib/mp4/mp4atom.cpp index 20709212e..106af7eb5 100644 --- a/3rdparty/taglib/mp4/mp4atom.cpp +++ b/3rdparty/taglib/mp4/mp4atom.cpp @@ -118,7 +118,7 @@ MP4::Atom::find(const char *name1, const char *name2, const char *name3, const c return (*it)->find(name2, name3, name4); } } - return 0; + return nullptr; } MP4::AtomList @@ -178,7 +178,7 @@ MP4::Atoms::find(const char *name1, const char *name2, const char *name3, const return (*it)->find(name2, name3, name4); } } - return 0; + return nullptr; } MP4::AtomList diff --git a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp index 69fe1df0a..36d2d4fa3 100644 --- a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp +++ b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp @@ -236,7 +236,7 @@ ChapterFrame *ChapterFrame::findByElementID(const ID3v2::Tag *tag, const ByteVec return frame; } - return 0; + return nullptr; } void ChapterFrame::parseFields(const ByteVector &data) diff --git a/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp index 815e5e1a1..fa7114e5d 100644 --- a/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp +++ b/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp @@ -136,7 +136,7 @@ CommentsFrame *CommentsFrame::findByDescription(const ID3v2::Tag *tag, const Str return frame; } - return 0; + return nullptr; } //////////////////////////////////////////////////////////////////////////////// diff --git a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp index efe89d171..6f2449ec5 100644 --- a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp +++ b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp @@ -258,7 +258,7 @@ TableOfContentsFrame *TableOfContentsFrame::findByElementID(const ID3v2::Tag *ta return frame; } - return 0; + return nullptr; } TableOfContentsFrame *TableOfContentsFrame::findTopLevel(const ID3v2::Tag *tag) // static @@ -274,7 +274,7 @@ TableOfContentsFrame *TableOfContentsFrame::findTopLevel(const ID3v2::Tag *tag) return frame; } - return 0; + return nullptr; } void TableOfContentsFrame::parseFields(const ByteVector &data) diff --git a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp index 61cf6ed8b..d5a88bb3f 100644 --- a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp +++ b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp @@ -410,7 +410,7 @@ UserTextIdentificationFrame *UserTextIdentificationFrame::find( if(f && f->description() == description) return f; } - return 0; + return nullptr; } //////////////////////////////////////////////////////////////////////////////// diff --git a/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp index fcb855b2e..2e360f0ec 100644 --- a/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp +++ b/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp @@ -114,7 +114,7 @@ UniqueFileIdentifierFrame *UniqueFileIdentifierFrame::findByOwner(const ID3v2::T return frame; } - return 0; + return nullptr; } void UniqueFileIdentifierFrame::parseFields(const ByteVector &data) diff --git a/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp index eafae171c..0d4bb1776 100644 --- a/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp +++ b/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp @@ -134,7 +134,7 @@ UnsynchronizedLyricsFrame *UnsynchronizedLyricsFrame::findByDescription(const ID if(frame && frame->description() == d) return frame; } - return 0; + return nullptr; } //////////////////////////////////////////////////////////////////////////////// // protected members diff --git a/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.cpp index 543b5184d..7ddb090f0 100644 --- a/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.cpp +++ b/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.cpp @@ -185,7 +185,7 @@ UserUrlLinkFrame *UserUrlLinkFrame::find(ID3v2::Tag *tag, const String &descript if(f && f->description() == description) return f; } - return 0; + return nullptr; } //////////////////////////////////////////////////////////////////////////////// diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp index 9347ab869..aaa1f21f0 100644 --- a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -140,7 +140,7 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader) header->frameSize() > data.size()) { delete header; - return 0; + return nullptr; } #ifndef NO_ITUNES_HACKS @@ -157,7 +157,7 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader) for(ByteVector::ConstIterator it = frameID.begin(); it != frameID.end(); it++) { if( (*it < 'A' || *it > 'Z') && (*it < '0' || *it > '9') ) { delete header; - return 0; + return nullptr; } } diff --git a/3rdparty/taglib/mpeg/mpegfile.cpp b/3rdparty/taglib/mpeg/mpegfile.cpp index 66e701195..dd695e18f 100644 --- a/3rdparty/taglib/mpeg/mpegfile.cpp +++ b/3rdparty/taglib/mpeg/mpegfile.cpp @@ -89,8 +89,8 @@ namespace public: explicit AdapterFile(IOStream *stream) : File(stream) {} - Tag *tag() const { return 0; } - AudioProperties *audioProperties() const { return 0; } + Tag *tag() const { return nullptr; } + AudioProperties *audioProperties() const { return nullptr; } bool save() { return false; } }; } diff --git a/3rdparty/taglib/ogg/oggpage.cpp b/3rdparty/taglib/ogg/oggpage.cpp index 414d3d530..fa8b6dcb4 100644 --- a/3rdparty/taglib/ogg/oggpage.cpp +++ b/3rdparty/taglib/ogg/oggpage.cpp @@ -272,7 +272,7 @@ List Ogg::Page::paginate(const ByteVectorList &packets, Ogg::Page* Ogg::Page::getCopyWithNewPageSequenceNumber(int /*sequenceNumber*/) { debug("Ogg::Page::getCopyWithNewPageSequenceNumber() -- This function is obsolete. Returning null."); - return 0; + return nullptr; } ////////////////////////////////////////////////////////////////////////////////