From 04a4a6b8d42b23df3b26f5df24c18d69a2845328 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 15 Apr 2012 02:38:15 -0700 Subject: [PATCH 1/7] Rename anonymous enumeration symbols to be unique in flacfile.cpp --- taglib/flac/flacfile.cpp | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp index 3ba096f4..79acb539 100644 --- a/taglib/flac/flacfile.cpp +++ b/taglib/flac/flacfile.cpp @@ -44,7 +44,7 @@ using namespace TagLib; namespace { - enum { XiphIndex = 0, ID3v2Index = 1, ID3v1Index = 2 }; + enum { FlacXiphIndex = 0, FlacID3v2Index = 1, FlacID3v1Index = 2 }; enum { MinPaddingLength = 4096 }; enum { LastBlockFlag = 0x80 }; } @@ -144,34 +144,34 @@ PropertyMap FLAC::File::properties() const // once Tag::properties() is virtual, this case distinction could actually be done // within TagUnion. if(d->hasXiphComment) - return d->tag.access(XiphIndex, false)->properties(); + return d->tag.access(FlacXiphIndex, false)->properties(); if(d->hasID3v2) - return d->tag.access(ID3v2Index, false)->properties(); + return d->tag.access(FlacID3v2Index, false)->properties(); if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->properties(); + return d->tag.access(FlacID3v1Index, false)->properties(); return PropertyMap(); } void FLAC::File::removeUnsupportedProperties(const StringList &unsupported) { if(d->hasXiphComment) - d->tag.access(XiphIndex, false)->removeUnsupportedProperties(unsupported); + d->tag.access(FlacXiphIndex, false)->removeUnsupportedProperties(unsupported); if(d->hasID3v2) - d->tag.access(ID3v2Index, false)->removeUnsupportedProperties(unsupported); + d->tag.access(FlacID3v2Index, false)->removeUnsupportedProperties(unsupported); if(d->hasID3v1) - d->tag.access(ID3v1Index, false)->removeUnsupportedProperties(unsupported); + d->tag.access(FlacID3v1Index, false)->removeUnsupportedProperties(unsupported); } PropertyMap FLAC::File::setProperties(const PropertyMap &properties) { if(d->hasXiphComment) - return d->tag.access(XiphIndex, false)->setProperties(properties); + return d->tag.access(FlacXiphIndex, false)->setProperties(properties); else if(d->hasID3v2) - return d->tag.access(ID3v2Index, false)->setProperties(properties); + return d->tag.access(FlacID3v2Index, false)->setProperties(properties); else if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->setProperties(properties); + return d->tag.access(FlacID3v1Index, false)->setProperties(properties); else - return d->tag.access(XiphIndex, true)->setProperties(properties); + return d->tag.access(FlacXiphIndex, true)->setProperties(properties); } FLAC::Properties *FLAC::File::audioProperties() const @@ -275,21 +275,21 @@ bool FLAC::File::save() ID3v2::Tag *FLAC::File::ID3v2Tag(bool create) { - if(!create || d->tag[ID3v2Index]) - return static_cast(d->tag[ID3v2Index]); + if(!create || d->tag[FlacID3v2Index]) + return static_cast(d->tag[FlacID3v2Index]); - d->tag.set(ID3v2Index, new ID3v2::Tag); - return static_cast(d->tag[ID3v2Index]); + d->tag.set(FlacID3v2Index, new ID3v2::Tag); + return static_cast(d->tag[FlacID3v2Index]); } ID3v1::Tag *FLAC::File::ID3v1Tag(bool create) { - return d->tag.access(ID3v1Index, create); + return d->tag.access(FlacID3v1Index, create); } Ogg::XiphComment *FLAC::File::xiphComment(bool create) { - return d->tag.access(XiphIndex, create); + return d->tag.access(FlacXiphIndex, create); } void FLAC::File::setID3v2FrameFactory(const ID3v2::FrameFactory *factory) @@ -310,12 +310,12 @@ void FLAC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle if(d->ID3v2Location >= 0) { - d->tag.set(ID3v2Index, new ID3v2::Tag(this, d->ID3v2Location, d->ID3v2FrameFactory)); + d->tag.set(FlacID3v2Index, new ID3v2::Tag(this, d->ID3v2Location, d->ID3v2FrameFactory)); d->ID3v2OriginalSize = ID3v2Tag()->header()->completeTagSize(); if(ID3v2Tag()->header()->tagSize() <= 0) - d->tag.set(ID3v2Index, 0); + d->tag.set(FlacID3v2Index, 0); else d->hasID3v2 = true; } @@ -325,7 +325,7 @@ void FLAC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle d->ID3v1Location = findID3v1(); if(d->ID3v1Location >= 0) { - d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); + d->tag.set(FlacID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); d->hasID3v1 = true; } @@ -337,9 +337,9 @@ void FLAC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle return; if(d->hasXiphComment) - d->tag.set(XiphIndex, new Ogg::XiphComment(xiphCommentData())); + d->tag.set(FlacXiphIndex, new Ogg::XiphComment(xiphCommentData())); else - d->tag.set(XiphIndex, new Ogg::XiphComment); + d->tag.set(FlacXiphIndex, new Ogg::XiphComment); if(readProperties) d->properties = new Properties(streamInfoData(), streamLength(), propertiesStyle); From 742a3a1dbbe6e92478fa1a29429eafe592069e52 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 15 Apr 2012 02:39:19 -0700 Subject: [PATCH 2/7] Rename anonymous enumeration symbols to be unique in mpcfile.cpp --- taglib/mpc/mpcfile.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/taglib/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp index ca9471ae..ff965bb6 100644 --- a/taglib/mpc/mpcfile.cpp +++ b/taglib/mpc/mpcfile.cpp @@ -39,7 +39,7 @@ using namespace TagLib; namespace { - enum { APEIndex, ID3v1Index }; + enum { MPCAPEIndex, MPCID3v1Index }; } class MPC::File::FilePrivate @@ -117,26 +117,26 @@ TagLib::Tag *MPC::File::tag() const PropertyMap MPC::File::properties() const { if(d->hasAPE) - return d->tag.access(APEIndex, false)->properties(); + return d->tag.access(MPCAPEIndex, false)->properties(); if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->properties(); + return d->tag.access(MPCID3v1Index, false)->properties(); return PropertyMap(); } void MPC::File::removeUnsupportedProperties(const StringList &properties) { if(d->hasAPE) - d->tag.access(APEIndex, false)->removeUnsupportedProperties(properties); + d->tag.access(MPCAPEIndex, false)->removeUnsupportedProperties(properties); if(d->hasID3v1) - d->tag.access(ID3v1Index, false)->removeUnsupportedProperties(properties); + d->tag.access(MPCID3v1Index, false)->removeUnsupportedProperties(properties); } PropertyMap MPC::File::setProperties(const PropertyMap &properties) { if(d->hasAPE) - return d->tag.access(APEIndex, false)->setProperties(properties); + return d->tag.access(MPCAPEIndex, false)->setProperties(properties); else if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->setProperties(properties); + return d->tag.access(MPCID3v1Index, false)->setProperties(properties); else return d->tag.access(APE, true)->setProperties(properties); } @@ -225,18 +225,18 @@ bool MPC::File::save() ID3v1::Tag *MPC::File::ID3v1Tag(bool create) { - return d->tag.access(ID3v1Index, create); + return d->tag.access(MPCID3v1Index, create); } APE::Tag *MPC::File::APETag(bool create) { - return d->tag.access(APEIndex, create); + return d->tag.access(MPCAPEIndex, create); } void MPC::File::strip(int tags) { if(tags & ID3v1) { - d->tag.set(ID3v1Index, 0); + d->tag.set(MPCID3v1Index, 0); APETag(true); } @@ -246,7 +246,7 @@ void MPC::File::strip(int tags) } if(tags & APE) { - d->tag.set(APEIndex, 0); + d->tag.set(MPCAPEIndex, 0); if(!ID3v1Tag()) APETag(true); @@ -270,7 +270,7 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty d->ID3v1Location = findID3v1(); if(d->ID3v1Location >= 0) { - d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); + d->tag.set(MPCID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); d->hasID3v1 = true; } @@ -281,7 +281,7 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty d->APELocation = findAPE(); if(d->APELocation >= 0) { - d->tag.set(APEIndex, new APE::Tag(this, d->APELocation)); + d->tag.set(MPCAPEIndex, new APE::Tag(this, d->APELocation)); d->APESize = APETag()->footer()->completeTagSize(); d->APELocation = d->APELocation + APETag()->footer()->size() - d->APESize; From 0907e86a94df336b8ba3fa95b87c9da616960ee6 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 15 Apr 2012 02:40:23 -0700 Subject: [PATCH 3/7] Rename anonymous enumeration symbols to be unique in apefile.cpp --- taglib/ape/apefile.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp index 44f459e9..cb652242 100644 --- a/taglib/ape/apefile.cpp +++ b/taglib/ape/apefile.cpp @@ -47,7 +47,7 @@ using namespace TagLib; namespace { - enum { APEIndex, ID3v1Index }; + enum { ApeAPEIndex, ApeID3v1Index }; } class APE::File::FilePrivate @@ -113,28 +113,28 @@ TagLib::Tag *APE::File::tag() const PropertyMap APE::File::properties() const { if(d->hasAPE) - return d->tag.access(APEIndex, false)->properties(); + return d->tag.access(ApeAPEIndex, false)->properties(); if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->properties(); + return d->tag.access(ApeID3v1Index, false)->properties(); return PropertyMap(); } void APE::File::removeUnsupportedProperties(const StringList &properties) { if(d->hasAPE) - d->tag.access(APEIndex, false)->removeUnsupportedProperties(properties); + d->tag.access(ApeAPEIndex, false)->removeUnsupportedProperties(properties); if(d->hasID3v1) - d->tag.access(ID3v1Index, false)->removeUnsupportedProperties(properties); + d->tag.access(ApeID3v1Index, false)->removeUnsupportedProperties(properties); } PropertyMap APE::File::setProperties(const PropertyMap &properties) { if(d->hasAPE) - return d->tag.access(APEIndex, false)->setProperties(properties); + return d->tag.access(ApeAPEIndex, false)->setProperties(properties); else if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->setProperties(properties); + return d->tag.access(ApeID3v1Index, false)->setProperties(properties); else - return d->tag.access(APEIndex, true)->setProperties(properties); + return d->tag.access(ApeAPEIndex, true)->setProperties(properties); } APE::Properties *APE::File::audioProperties() const @@ -213,23 +213,23 @@ bool APE::File::save() ID3v1::Tag *APE::File::ID3v1Tag(bool create) { - return d->tag.access(ID3v1Index, create); + return d->tag.access(ApeID3v1Index, create); } APE::Tag *APE::File::APETag(bool create) { - return d->tag.access(APEIndex, create); + return d->tag.access(ApeAPEIndex, create); } void APE::File::strip(int tags) { if(tags & ID3v1) { - d->tag.set(ID3v1Index, 0); + d->tag.set(ApeID3v1Index, 0); APETag(true); } if(tags & APE) { - d->tag.set(APEIndex, 0); + d->tag.set(ApeAPEIndex, 0); if(!ID3v1Tag()) APETag(true); @@ -247,7 +247,7 @@ void APE::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty d->ID3v1Location = findID3v1(); if(d->ID3v1Location >= 0) { - d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); + d->tag.set(ApeID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); d->hasID3v1 = true; } @@ -256,7 +256,7 @@ void APE::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty d->APELocation = findAPE(); if(d->APELocation >= 0) { - d->tag.set(APEIndex, new APE::Tag(this, d->APELocation)); + d->tag.set(ApeAPEIndex, new APE::Tag(this, d->APELocation)); d->APESize = APETag()->footer()->completeTagSize(); d->APELocation = d->APELocation + APETag()->footer()->size() - d->APESize; d->hasAPE = true; From 1bde4cea09dc8819c2da29fa60cfc66c1eca179d Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 15 Apr 2012 02:40:46 -0700 Subject: [PATCH 4/7] Rename anonymous enumeration symbols to be unique in wavpackfile.cpp --- taglib/wavpack/wavpackfile.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp index 2addabae..49f7923e 100644 --- a/taglib/wavpack/wavpackfile.cpp +++ b/taglib/wavpack/wavpackfile.cpp @@ -43,7 +43,7 @@ using namespace TagLib; namespace { - enum { APEIndex, ID3v1Index }; + enum { WavAPEIndex, WavID3v1Index }; } class WavPack::File::FilePrivate @@ -109,18 +109,18 @@ TagLib::Tag *WavPack::File::tag() const PropertyMap WavPack::File::properties() const { if(d->hasAPE) - return d->tag.access(APEIndex, false)->properties(); + return d->tag.access(WavAPEIndex, false)->properties(); if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->properties(); + return d->tag.access(WavID3v1Index, false)->properties(); return PropertyMap(); } PropertyMap WavPack::File::setProperties(const PropertyMap &properties) { if(d->hasAPE) - return d->tag.access(APEIndex, false)->setProperties(properties); + return d->tag.access(WavAPEIndex, false)->setProperties(properties); else if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->setProperties(properties); + return d->tag.access(WavID3v1Index, false)->setProperties(properties); else return d->tag.access(APE, true)->setProperties(properties); } @@ -201,23 +201,23 @@ bool WavPack::File::save() ID3v1::Tag *WavPack::File::ID3v1Tag(bool create) { - return d->tag.access(ID3v1Index, create); + return d->tag.access(WavID3v1Index, create); } APE::Tag *WavPack::File::APETag(bool create) { - return d->tag.access(APEIndex, create); + return d->tag.access(WavAPEIndex, create); } void WavPack::File::strip(int tags) { if(tags & ID3v1) { - d->tag.set(ID3v1Index, 0); + d->tag.set(WavID3v1Index, 0); APETag(true); } if(tags & APE) { - d->tag.set(APEIndex, 0); + d->tag.set(WavAPEIndex, 0); if(!ID3v1Tag()) APETag(true); @@ -235,7 +235,7 @@ void WavPack::File::read(bool readProperties, Properties::ReadStyle /* propertie d->ID3v1Location = findID3v1(); if(d->ID3v1Location >= 0) { - d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); + d->tag.set(WavID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); d->hasID3v1 = true; } @@ -244,7 +244,7 @@ void WavPack::File::read(bool readProperties, Properties::ReadStyle /* propertie d->APELocation = findAPE(); if(d->APELocation >= 0) { - d->tag.set(APEIndex, new APE::Tag(this, d->APELocation)); + d->tag.set(WavAPEIndex, new APE::Tag(this, d->APELocation)); d->APESize = APETag()->footer()->completeTagSize(); d->APELocation = d->APELocation + APETag()->footer()->size() - d->APESize; d->hasAPE = true; From 5081e3cf4f22b9cf3e81cdb07b41bd45c988e264 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 15 Apr 2012 02:41:27 -0700 Subject: [PATCH 5/7] Rename anonymous enumeration symbols to be unique trueaudiofile.cpp --- taglib/trueaudio/trueaudiofile.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/taglib/trueaudio/trueaudiofile.cpp b/taglib/trueaudio/trueaudiofile.cpp index e10f6fa5..9efc6e9d 100644 --- a/taglib/trueaudio/trueaudiofile.cpp +++ b/taglib/trueaudio/trueaudiofile.cpp @@ -43,7 +43,7 @@ using namespace TagLib; namespace { - enum { ID3v2Index = 0, ID3v1Index = 1 }; + enum { TrueAudioID3v2Index = 0, TrueAudioID3v1Index = 1 }; } class TrueAudio::File::FilePrivate @@ -133,20 +133,20 @@ PropertyMap TrueAudio::File::properties() const // once Tag::properties() is virtual, this case distinction could actually be done // within TagUnion. if(d->hasID3v2) - return d->tag.access(ID3v2Index, false)->properties(); + return d->tag.access(TrueAudioID3v2Index, false)->properties(); if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->properties(); + return d->tag.access(TrueAudioID3v1Index, false)->properties(); return PropertyMap(); } PropertyMap TrueAudio::File::setProperties(const PropertyMap &properties) { if(d->hasID3v2) - return d->tag.access(ID3v2Index, false)->setProperties(properties); + return d->tag.access(TrueAudioID3v2Index, false)->setProperties(properties); else if(d->hasID3v1) - return d->tag.access(ID3v1Index, false)->setProperties(properties); + return d->tag.access(TrueAudioID3v1Index, false)->setProperties(properties); else - return d->tag.access(ID3v2Index, true)->setProperties(properties); + return d->tag.access(TrueAudioID3v2Index, true)->setProperties(properties); } TrueAudio::Properties *TrueAudio::File::audioProperties() const @@ -210,23 +210,23 @@ bool TrueAudio::File::save() ID3v1::Tag *TrueAudio::File::ID3v1Tag(bool create) { - return d->tag.access(ID3v1Index, create); + return d->tag.access(TrueAudioID3v1Index, create); } ID3v2::Tag *TrueAudio::File::ID3v2Tag(bool create) { - return d->tag.access(ID3v2Index, create); + return d->tag.access(TrueAudioID3v2Index, create); } void TrueAudio::File::strip(int tags) { if(tags & ID3v1) { - d->tag.set(ID3v1Index, 0); + d->tag.set(TrueAudioID3v1Index, 0); ID3v2Tag(true); } if(tags & ID3v2) { - d->tag.set(ID3v2Index, 0); + d->tag.set(TrueAudioID3v2Index, 0); if(!ID3v1Tag()) ID3v2Tag(true); @@ -246,12 +246,12 @@ void TrueAudio::File::read(bool readProperties, Properties::ReadStyle /* propert if(d->ID3v2Location >= 0) { - d->tag.set(ID3v2Index, new ID3v2::Tag(this, d->ID3v2Location, d->ID3v2FrameFactory)); + d->tag.set(TrueAudioID3v2Index, new ID3v2::Tag(this, d->ID3v2Location, d->ID3v2FrameFactory)); d->ID3v2OriginalSize = ID3v2Tag()->header()->completeTagSize(); if(ID3v2Tag()->header()->tagSize() <= 0) - d->tag.set(ID3v2Index, 0); + d->tag.set(TrueAudioID3v2Index, 0); else d->hasID3v2 = true; } @@ -261,7 +261,7 @@ void TrueAudio::File::read(bool readProperties, Properties::ReadStyle /* propert d->ID3v1Location = findID3v1(); if(d->ID3v1Location >= 0) { - d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); + d->tag.set(TrueAudioID3v1Index, new ID3v1::Tag(this, d->ID3v1Location)); d->hasID3v1 = true; } From c22791318c0aaa17ed8b347622a1fe379b469c2d Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 15 Apr 2012 07:57:02 -0700 Subject: [PATCH 6/7] Resolve ambiguous File symbol in apetag.cpp --- taglib/ape/apetag.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp index 0676c9b6..7a16f3f2 100644 --- a/taglib/ape/apetag.cpp +++ b/taglib/ape/apetag.cpp @@ -48,7 +48,7 @@ class APE::Tag::TagPrivate public: TagPrivate() : file(0), footerLocation(-1), tagLength(0) {} - File *file; + TagLib::File *file; long footerLocation; long tagLength; @@ -66,7 +66,7 @@ APE::Tag::Tag() : TagLib::Tag() d = new TagPrivate; } -APE::Tag::Tag(File *file, long footerLocation) : TagLib::Tag() +APE::Tag::Tag(TagLib::File *file, long footerLocation) : TagLib::Tag() { d = new TagPrivate; d->file = file; From 26f458b87fe0c54e03e342cb926b60af79977f94 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 15 Apr 2012 07:58:50 -0700 Subject: [PATCH 7/7] Resolve scope resolution for APE::Footer definitions in apefooter.cpp --- taglib/ape/apefooter.cpp | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/taglib/ape/apefooter.cpp b/taglib/ape/apefooter.cpp index 1eaab254..68864901 100644 --- a/taglib/ape/apefooter.cpp +++ b/taglib/ape/apefooter.cpp @@ -35,7 +35,7 @@ using namespace TagLib; using namespace APE; -class Footer::FooterPrivate +class APE::Footer::FooterPrivate { public: FooterPrivate() : version(0), @@ -64,12 +64,12 @@ public: // static members //////////////////////////////////////////////////////////////////////////////// -TagLib::uint Footer::size() +TagLib::uint APE::Footer::size() { return FooterPrivate::size; } -ByteVector Footer::fileIdentifier() +ByteVector APE::Footer::fileIdentifier() { return ByteVector::fromCString("APETAGEX"); } @@ -78,63 +78,63 @@ ByteVector Footer::fileIdentifier() // public members //////////////////////////////////////////////////////////////////////////////// -Footer::Footer() +APE::Footer::Footer() { d = new FooterPrivate; } -Footer::Footer(const ByteVector &data) +APE::Footer::Footer(const ByteVector &data) { d = new FooterPrivate; parse(data); } -Footer::~Footer() +APE::Footer::~Footer() { delete d; } -TagLib::uint Footer::version() const +TagLib::uint APE::Footer::version() const { return d->version; } -bool Footer::headerPresent() const +bool APE::Footer::headerPresent() const { return d->headerPresent; } -bool Footer::footerPresent() const +bool APE::Footer::footerPresent() const { return d->footerPresent; } -bool Footer::isHeader() const +bool APE::Footer::isHeader() const { return d->isHeader; } -void Footer::setHeaderPresent(bool b) const +void APE::Footer::setHeaderPresent(bool b) const { d->headerPresent = b; } -TagLib::uint Footer::itemCount() const +TagLib::uint APE::Footer::itemCount() const { return d->itemCount; } -void Footer::setItemCount(uint s) +void APE::Footer::setItemCount(uint s) { d->itemCount = s; } -TagLib::uint Footer::tagSize() const +TagLib::uint APE::Footer::tagSize() const { return d->tagSize; } -TagLib::uint Footer::completeTagSize() const +TagLib::uint APE::Footer::completeTagSize() const { if(d->headerPresent) return d->tagSize + d->size; @@ -142,22 +142,22 @@ TagLib::uint Footer::completeTagSize() const return d->tagSize; } -void Footer::setTagSize(uint s) +void APE::Footer::setTagSize(uint s) { d->tagSize = s; } -void Footer::setData(const ByteVector &data) +void APE::Footer::setData(const ByteVector &data) { parse(data); } -ByteVector Footer::renderFooter() const +ByteVector APE::Footer::renderFooter() const { return render(false); } -ByteVector Footer::renderHeader() const +ByteVector APE::Footer::renderHeader() const { if (!d->headerPresent) return ByteVector(); @@ -168,7 +168,7 @@ ByteVector Footer::renderHeader() const // protected members //////////////////////////////////////////////////////////////////////////////// -void Footer::parse(const ByteVector &data) +void APE::Footer::parse(const ByteVector &data) { if(data.size() < size()) return; @@ -197,7 +197,7 @@ void Footer::parse(const ByteVector &data) } -ByteVector Footer::render(bool isHeader) const +ByteVector APE::Footer::render(bool isHeader) const { ByteVector v;