From f3ecfa11bbe90c9cc761185f83ae4af6649eca35 Mon Sep 17 00:00:00 2001 From: Scott Wheeler Date: Thu, 12 Sep 2019 11:19:39 +0200 Subject: [PATCH] Completely remove `StripAll` from the API I'd imagined it being useful for calls to `strip()`, but it's not actually used there since that's an OR-ed together set of flags representing which tags to strip. --- taglib/mpeg/mpegfile.cpp | 2 +- taglib/riff/wav/wavfile.cpp | 2 +- taglib/toolkit/tfile.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp index 613690ef..472cbdad 100644 --- a/taglib/mpeg/mpegfile.cpp +++ b/taglib/mpeg/mpegfile.cpp @@ -244,7 +244,7 @@ bool MPEG::File::save(int tags, StripTags strip, ID3v2::Version version, Duplica // Remove all the tags not going to be saved. - if(strip == StripOthers || strip == StripAll) + if(strip == StripOthers) File::strip(~tags, false); if(ID3v2 & tags) { diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp index 6e00f827..3dce70b1 100644 --- a/taglib/riff/wav/wavfile.cpp +++ b/taglib/riff/wav/wavfile.cpp @@ -169,7 +169,7 @@ bool RIFF::WAV::File::save(TagTypes tags, StripTags strip, ID3v2::Version versio return false; } - if(strip == StripOthers || strip == StripAll) + if(strip == StripOthers) File::strip(static_cast(AllTags & ~tags)); if(tags & ID3v2) { diff --git a/taglib/toolkit/tfile.h b/taglib/toolkit/tfile.h index 3b6ff621..4243fe7a 100644 --- a/taglib/toolkit/tfile.h +++ b/taglib/toolkit/tfile.h @@ -67,7 +67,6 @@ namespace TagLib { */ enum StripTags { StripNone, //