diff --git a/taglib/ape/apeitem.cpp b/taglib/ape/apeitem.cpp index 8f73f98a..3bf90ff9 100644 --- a/taglib/ape/apeitem.cpp +++ b/taglib/ape/apeitem.cpp @@ -129,14 +129,6 @@ void APE::Item::setBinaryData(const ByteVector &value) d->text.clear(); } -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; @@ -191,11 +183,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 f36f3cb4..c5799c23 100644 --- a/taglib/ape/apeitem.h +++ b/taglib/ape/apeitem.h @@ -104,11 +104,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. */ @@ -125,7 +120,7 @@ namespace TagLib { * Sets the text value of the item to the list of values in \a value and clears * any previous contents. * - * \see toStringList() + * \see values() */ void setValues(const StringList &values); @@ -139,7 +134,7 @@ namespace TagLib { /*! * Appends \a values to extend the current list of text values. * - * \see toStringList() + * \see values() */ void appendValues(const StringList &values); @@ -155,11 +150,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. If the data type is not \a Text, always * returns an empty StringList. diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp index 489b5745..7fb4a21c 100644 --- a/taglib/ape/apetag.cpp +++ b/taglib/ape/apetag.cpp @@ -215,7 +215,7 @@ PropertyMap APE::Tag::properties() const if(tagName == t) tagName = k; } - properties[tagName].append(item.toStringList()); + properties[tagName].append(item.values()); } } return properties; diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp index 0f1d9da7..af38a6ff 100644 --- a/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/taglib/mpeg/id3v2/id3v2frame.cpp @@ -639,11 +639,6 @@ bool Frame::Header::encryption() const return d->encryption; } -bool Frame::Header::unsycronisation() const -{ - return unsynchronisation(); -} - bool Frame::Header::unsynchronisation() const { return d->unsynchronisation; diff --git a/taglib/mpeg/id3v2/id3v2frame.h b/taglib/mpeg/id3v2/id3v2frame.h index 64aa54cf..6527a8e2 100644 --- a/taglib/mpeg/id3v2/id3v2frame.h +++ b/taglib/mpeg/id3v2/id3v2frame.h @@ -410,10 +410,6 @@ namespace TagLib { */ bool encryption() const; -#ifndef DO_NOT_DOCUMENT - bool unsycronisation() const; -#endif - /*! * Returns true if unsynchronisation is enabled for this frame. */