From 7c4c455a40c45d5f459f8fcd003f42f578f274f1 Mon Sep 17 00:00:00 2001 From: Scott Wheeler Date: Tue, 3 Jul 2012 12:26:20 +0200 Subject: [PATCH] Use '0' here instead of 'NULL' 0 is used throughout the rest of the TagLib source, and generally preferred in C++: http://www2.research.att.com/~bs/bs_faq2.html#null --- taglib/mpeg/id3v2/id3v2tag.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp index c6fe7b74..662fd159 100644 --- a/taglib/mpeg/id3v2/id3v2tag.cpp +++ b/taglib/mpeg/id3v2/id3v2tag.cpp @@ -355,7 +355,7 @@ void ID3v2::Tag::removeUnsupportedProperties(const StringList &properties) // delete all unknown frames of given type FrameList l = frameList(id); for(FrameList::ConstIterator fit = l.begin(); fit != l.end(); fit++) - if (dynamic_cast(*fit) != NULL) + if (dynamic_cast(*fit) != 0) removeFrame(*fit); } else if(it->size() == 4){ ByteVector id = it->data(String::Latin1); @@ -365,7 +365,7 @@ void ID3v2::Tag::removeUnsupportedProperties(const StringList &properties) if(it->size() <= 5) continue; // invalid specification String description = it->substr(5); - Frame *frame = NULL; + Frame *frame = 0; if(id == "TXXX") frame = UserTextIdentificationFrame::find(this, description); else if(id == "WXXX") -- 2.40.0