diff --git a/taglib/ape/apeitem.cpp b/taglib/ape/apeitem.cpp index 9d9647ec..0e27987d 100644 --- a/taglib/ape/apeitem.cpp +++ b/taglib/ape/apeitem.cpp @@ -127,14 +127,6 @@ void APE::Item::setBinaryData(const ByteVector &value) d->value = value; } -ByteVector APE::Item::value() const -{ - // This seems incorrect as it won't be actually rendering the value to keep it - // up to date. - - return d->value; -} - void APE::Item::setKey(const String &key) { d->key = key; @@ -188,11 +180,6 @@ int APE::Item::size() const return result; } -StringList APE::Item::toStringList() const -{ - return d->text; -} - StringList APE::Item::values() const { return d->text; diff --git a/taglib/ape/apeitem.h b/taglib/ape/apeitem.h index f7fd05e3..eb460d23 100644 --- a/taglib/ape/apeitem.h +++ b/taglib/ape/apeitem.h @@ -61,7 +61,6 @@ namespace TagLib { /*! * Constructs a text item with \a key and \a value. */ - // BIC: Remove this, StringList has a constructor from a single string Item(const String &key, const String &value); /*! @@ -107,11 +106,6 @@ namespace TagLib { */ void setBinaryData(const ByteVector &value); -#ifndef DO_NOT_DOCUMENT - /* Remove in next binary incompatible release */ - ByteVector value() const; -#endif - /*! * Sets the key for the item to \a key. */ @@ -157,11 +151,6 @@ namespace TagLib { */ String toString() const; -#ifndef DO_NOT_DOCUMENT - /* Remove in next binary incompatible release */ - StringList toStringList() const; -#endif - /*! * Returns the list of text values. */ diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp index 664ee3a8..3dcae8c0 100644 --- a/taglib/ape/apetag.cpp +++ b/taglib/ape/apetag.cpp @@ -199,7 +199,7 @@ PropertyMap APE::Tag::properties() const for(uint i = 0; i < keyConversionsSize; ++i) if(tagName == keyConversions[i][1]) tagName = keyConversions[i][0]; - properties[tagName].append(it->second.toStringList()); + properties[tagName].append(it->second.values()); } } return properties;