taglib: Remove unused functions + add virtual and explicit

3rdparty/taglib/toolkit/tbytevector.cpp

@@ -283,8 +283,6 @@ class ByteVector::ByteVectorPrivate {
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-ByteVector ByteVector::null;
-
 ByteVector ByteVector::fromCString(const char *s, unsigned int length) {
   if (length == 0xffffffff)
     return ByteVector(s, static_cast<unsigned int>(::strlen(s)));
@@ -618,67 +616,10 @@ ByteVector::ConstReverseIterator ByteVector::rend() const {
 
 }
 
-bool ByteVector::isNull() const {
-  return (d == null.d);
-}
-
 bool ByteVector::isEmpty() const {
   return (d->length == 0);
 }
 
-unsigned int ByteVector::checksum() const {
-  static const unsigned int crcTable[256] = {
-    0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
-    0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
-    0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
-    0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
-    0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
-    0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
-    0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
-    0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
-    0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
-    0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
-    0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
-    0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
-    0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4,
-    0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
-    0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
-    0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
-    0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
-    0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
-    0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
-    0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
-    0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
-    0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
-    0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
-    0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
-    0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
-    0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
-    0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
-    0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
-    0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
-    0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
-    0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
-    0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
-    0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
-    0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
-    0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
-    0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
-    0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
-    0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
-    0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
-    0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
-    0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
-    0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
-    0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
-  };
-
-  unsigned int sum = 0;
-  for (ByteVector::ConstIterator it = begin(); it != end(); ++it)
-    sum = (sum << 8) ^ crcTable[((sum >> 24) & 0xff) ^ static_cast<unsigned char>(*it)];
-  return sum;
-}
-
 unsigned int ByteVector::toUInt(bool mostSignificantByteFirst) const {
   return toNumber<unsigned int>(*this, 0, mostSignificantByteFirst);
 }

3rdparty/taglib/toolkit/tbytevector.h

@@ -54,12 +54,12 @@ class TAGLIB_EXPORT ByteVector {
   /*!
    * Constructs an empty byte vector.
    */
-  ByteVector();
+  explicit ByteVector();
 
   /*!
    * Construct a vector of size \a size with all values set to \a value by default.
    */
-  ByteVector(unsigned int size, char value = 0);
+  explicit ByteVector(unsigned int size, char value = 0);
 
   /*!
    * Constructs a byte vector that is a copy of \a v.
@@ -69,7 +69,7 @@ class TAGLIB_EXPORT ByteVector {
   /*!
    * Constructs a byte vector that is a copy of \a v.
    */
-  ByteVector(const ByteVector &v, unsigned int offset, unsigned int length);
+  explicit ByteVector(const ByteVector &v, unsigned int offset, unsigned int length);
 
   /*!
    * Constructs a byte vector that contains \a c.
@@ -79,7 +79,7 @@ class TAGLIB_EXPORT ByteVector {
   /*!
    * Constructs a byte vector that copies \a data for up to \a length bytes.
    */
-  ByteVector(const char *data, unsigned int length);
+  explicit ByteVector(const char *data, unsigned int length);
 
   /*!
    * Constructs a byte vector that copies \a data up to the first null byte.
@@ -158,8 +158,7 @@ class TAGLIB_EXPORT ByteVector {
    * Optionally, if you only want to search for part of the pattern you can specify an offset within the pattern to start from.
    * Also, you can specify to only check for the first \a patternLength bytes of \a pattern with the \a patternLength argument.
    */
-  bool containsAt(const ByteVector &pattern, unsigned int offset,
-    unsigned int patternOffset = 0, unsigned int patternLength = 0xffffffff) const;
+  bool containsAt(const ByteVector &pattern, unsigned int offset, unsigned int patternOffset = 0, unsigned int patternLength = 0xffffffff) const;
 
   /*!
    * Returns true if the vector starts with \a pattern.
@@ -258,18 +257,6 @@ class TAGLIB_EXPORT ByteVector {
    */
   ConstReverseIterator rend() const;
 
-  /*!
-   * Returns true if the vector is null.
-   *
-   * \note A vector may be empty without being null.  So do not use this method to check if the vector is empty.
-   *
-   * \see isEmpty()
-   *
-   * \deprecated
-   */
-  // BIC: remove
-  bool isNull() const;
-
   /*!
    * Returns true if the ByteVector is empty.
    *
@@ -278,14 +265,6 @@ class TAGLIB_EXPORT ByteVector {
    */
   bool isEmpty() const;
 
-  /*!
-   * Returns a CRC checksum of the byte vector's data.
-   *
-   * \note This uses an uncommon variant of CRC32 specializes in Ogg.
-   */
-  // BIC: Remove or make generic.
-  unsigned int checksum() const;
-
   /*!
    * Converts the first 4 bytes of the vector to an unsigned integer.
    *
@@ -546,17 +525,6 @@ class TAGLIB_EXPORT ByteVector {
    */
   void swap(ByteVector &v);
 
-  /*!
-   * A static, empty ByteVector which is convenient and fast (since returning an empty or "null" value does not require instantiating a new ByteVector).
-   *
-   * \warning Do not modify this variable.  It will mess up the internal state
-   * of TagLib.
-   *
-   * \deprecated
-   */
-  // BIC: remove
-  static ByteVector null;
-
   /*!
    * Returns a hex-encoded copy of the byte vector.
    */

3rdparty/taglib/toolkit/tbytevectorlist.h

@@ -44,7 +44,7 @@ class TAGLIB_EXPORT ByteVectorList : public List<ByteVector> {
   /*!
    * Construct an empty ByteVectorList.
    */
-  ByteVectorList();
+  explicit ByteVectorList();
 
   /*!
    * Destroys this ByteVectorList instance.

3rdparty/taglib/toolkit/tbytevectorstream.h

@@ -45,7 +45,7 @@ class TAGLIB_EXPORT ByteVectorStream : public IOStream {
   /*!
    * Construct a File object and opens the \a file.  \a file should be a be a C-string in the local file system encoding.
    */
-  ByteVectorStream(const ByteVector &data);
+  explicit ByteVectorStream(const ByteVector &data);
 
   /*!
    * Destroys this ByteVectorStream instance.

3rdparty/taglib/toolkit/tdebuglistener.h

@@ -42,7 +42,7 @@ namespace TagLib {
  */
 class TAGLIB_EXPORT DebugListener {
  public:
-  DebugListener();
+  explicit DebugListener();
   virtual ~DebugListener();
 
   /*!
@@ -53,8 +53,8 @@ class TAGLIB_EXPORT DebugListener {
 
  private:
   // Noncopyable
-  DebugListener(const DebugListener &);
-  DebugListener &operator=(const DebugListener &);
+  explicit DebugListener(const DebugListener&);
+  DebugListener &operator=(const DebugListener&);
 };
 
 /*!

3rdparty/taglib/toolkit/tfile.h

@@ -104,16 +104,14 @@ class TAGLIB_EXPORT File {
    * to remove (a subset of) them.
    * For files that contain more than one tag (e.g. an MP3 with both an ID3v1 and an ID3v2
    * tag) only the most "modern" one will be exported (ID3v2 in this case).
-   * BIC: Will be made virtual in future releases.
    */
-  PropertyMap properties() const;
+  virtual PropertyMap properties() const;
 
   /*!
    * Removes unsupported properties, or a subset of them, from the file's metadata.
    * The parameter \a properties must contain only entries from properties().unsupportedData().
-   * BIC: Will be mad virtual in future releases.
    */
-  void removeUnsupportedProperties(const StringList &properties);
+  virtual void removeUnsupportedProperties(const StringList &properties);
 
   /*!
    * Sets the tags of this File to those specified in \a properties. Calls the
@@ -127,9 +125,8 @@ class TAGLIB_EXPORT File {
    * (ID3v2 for MP3 files). Older formats will be updated as well, if they exist, but won't
    * be taken into account for the return value of this function.
    * See the documentation of the subclass implementations for detailed descriptions.
-   * BIC: will become pure virtual in the future
    */
-  PropertyMap setProperties(const PropertyMap &properties);
+  virtual PropertyMap setProperties(const PropertyMap &properties);
 
   /*!
    * Returns a pointer to this file's audio properties.
@@ -251,7 +248,7 @@ class TAGLIB_EXPORT File {
    *
    * \note Constructor is protected since this class should only be instantiated through subclasses.
    */
-  File(FileName file);
+  explicit File(FileName file);
 
   /*!
    * Construct a File object and use the \a stream instance.
@@ -260,7 +257,7 @@ class TAGLIB_EXPORT File {
    *
    * \note Constructor is protected since this class should only be instantiated through subclasses.
    */
-  File(IOStream *stream);
+  explicit File(IOStream *stream);
 
   /*!
    * Marks the file as valid or invalid.
@@ -280,8 +277,8 @@ class TAGLIB_EXPORT File {
   static unsigned int bufferSize();
 
  private:
-  File(const File &);
-  File &operator=(const File &);
+  explicit File(const File&);
+  File &operator=(const File&);
 
   class FilePrivate;
   FilePrivate *d;

3rdparty/taglib/toolkit/tfilestream.h

@@ -51,12 +51,12 @@ class TAGLIB_EXPORT FileStream : public IOStream {
    * Construct a File object and opens the \a file.
    * \a file should be a be a C-string in the local file system encoding.
    */
-  FileStream(FileName file, bool openReadOnly = false);
+  explicit FileStream(FileName file, bool openReadOnly = false);
 
   /*!
    * Construct a File object and opens the \a file using file descriptor.
    */
-  FileStream(int fileDescriptor, bool openReadOnly = false);
+  explicit FileStream(int fileDescriptor, bool openReadOnly = false);
 
   /*!
    * Destroys this FileStream instance.

3rdparty/taglib/toolkit/tiostream.h

@@ -36,10 +36,10 @@ namespace TagLib {
 #ifdef _WIN32
 class TAGLIB_EXPORT FileName {
  public:
-  FileName(const wchar_t *name);
-  FileName(const char *name);
+  explicit FileName(const wchar_t *name);
+  explicit FileName(const char *name);
 
-  FileName(const FileName &name);
+  explicit FileName(const FileName &name);
 
   operator const wchar_t *() const;
   operator const char *() const;
@@ -73,7 +73,7 @@ class TAGLIB_EXPORT IOStream {
     End
   };
 
-  IOStream();
+  explicit IOStream();
 
   /*!
    * Destroys this IOStream instance.
@@ -153,8 +153,8 @@ class TAGLIB_EXPORT IOStream {
   virtual void truncate(long length) = 0;
 
  private:
-  IOStream(const IOStream &);
-  IOStream &operator=(const IOStream &);
+  explicit IOStream(const IOStream&);
+  IOStream &operator=(const IOStream&);
 };
 
 }  // namespace TagLib

3rdparty/taglib/toolkit/tlist.h

@@ -61,7 +61,7 @@ template<class T> class List {
   /*!
    * Constructs an empty list.
    */
-  List();
+  explicit List();
 
   /*!
    * Make a shallow, implicitly shared, copy of \a l.

3rdparty/taglib/toolkit/tlist.tcc

@@ -52,8 +52,8 @@ template <class T>
 template <class TP> class List<T>::ListPrivate  : public ListPrivateBase
 {
 public:
-  ListPrivate() : ListPrivateBase() {}
-  ListPrivate(const std::list<TP> &l) : ListPrivateBase(), list(l) {}
+  explicit ListPrivate() : ListPrivateBase() {}
+  explicit ListPrivate(const std::list<TP> &l) : ListPrivateBase(), list(l) {}
   void clear() {
     list.clear();
   }
@@ -66,8 +66,8 @@ template <class T>
 template <class TP> class List<T>::ListPrivate<TP *>  : public ListPrivateBase
 {
 public:
-  ListPrivate() : ListPrivateBase() {}
-  ListPrivate(const std::list<TP *> &l) : ListPrivateBase(), list(l) {}
+  explicit ListPrivate() : ListPrivateBase() {}
+  explicit ListPrivate(const std::list<TP *> &l) : ListPrivateBase(), list(l) {}
   ~ListPrivate() {
     clear();
   }

3rdparty/taglib/toolkit/tmap.h

@@ -60,7 +60,7 @@ template<class Key, class T> class Map {
   /*!
    * Constructs an empty Map.
    */
-  Map();
+  explicit Map();
 
   /*!
    * Make a shallow, implicitly shared, copy of \a m.

3rdparty/taglib/toolkit/tmap.tcc

@@ -37,12 +37,12 @@ template <class Key, class T>
 template <class KeyP, class TP>
 class Map<Key, T>::MapPrivate : public RefCounterOld {
 public:
-  MapPrivate() : RefCounterOld() {}
+  explicit MapPrivate() : RefCounterOld() {}
 #ifdef WANT_CLASS_INSTANTIATION_OF_MAP
-  MapPrivate(const std::map<class KeyP, class TP>& m) : RefCounterOld(), map(m) {}
+  explicit MapPrivate(const std::map<class KeyP, class TP>& m) : RefCounterOld(), map(m) {}
   std::map<class KeyP, class TP> map;
 #else
-  MapPrivate(const std::map<KeyP, TP>& m) : RefCounterOld(), map(m) {}
+  explicit MapPrivate(const std::map<KeyP, TP>& m) : RefCounterOld(), map(m) {}
   std::map<KeyP, TP> map;
 #endif
 };

3rdparty/taglib/toolkit/tpropertymap.h

@@ -107,7 +107,7 @@ class TAGLIB_EXPORT PropertyMap : public SimplePropertyMap {
   typedef SimplePropertyMap::Iterator Iterator;
   typedef SimplePropertyMap::ConstIterator ConstIterator;
 
-  PropertyMap();
+  explicit PropertyMap();
 
   /*!
    * Creates a PropertyMap initialized from a SimplePropertyMap.

3rdparty/taglib/toolkit/trefcounter.h

@@ -58,7 +58,7 @@ namespace TagLib {
 
 class TAGLIB_EXPORT RefCounter {
  public:
-  RefCounter();
+  explicit RefCounter();
   virtual ~RefCounter();
 
   void ref();
@@ -73,7 +73,7 @@ class TAGLIB_EXPORT RefCounter {
 // BIC this old class is needed by tlist.tcc and tmap.tcc
 class RefCounterOld {
  public:
-  RefCounterOld() : refCount(1) {}
+  explicit RefCounterOld() : refCount(1) {}
 
 #  ifdef TAGLIB_ATOMIC_MAC
   void ref() {

3rdparty/taglib/toolkit/tstring.cpp

@@ -158,8 +158,6 @@ class String::StringPrivate : public RefCounter {
   std::string cstring;
 };
 
-String String::null;
-
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
@@ -400,10 +398,6 @@ bool String::isEmpty() const {
   return d->data.empty();
 }
 
-bool String::isNull() const {
-  return d == null.d;
-}
-
 ByteVector String::data(Type t) const {
 
   switch (t) {
@@ -476,10 +470,6 @@ ByteVector String::data(Type t) const {
 
 }
 
-int String::toInt() const {
-  return toInt(nullptr);
-}
-
 int String::toInt(bool *ok) const {
 
   const wchar_t *begin = d->data.c_str();

3rdparty/taglib/toolkit/tstring.h

@@ -117,7 +117,7 @@ class TAGLIB_EXPORT String {
   /*!
    * Constructs an empty String.
    */
-  String();
+  explicit String();
 
   /*!
    * Make a shallow, implicitly shared, copy of \a s.
@@ -306,18 +306,6 @@ class TAGLIB_EXPORT String {
    */
   bool isEmpty() const;
 
-  /*!
-   * Returns true if this string is null -- i.e. it is a copy of the String::null string.
-   *
-   * \note A string can be empty and not null.  So do not use this method to check if the string is empty.
-   *
-   * \see isEmpty()
-   *
-   * \deprecated
-   */
-  // BIC: remove
-  bool isNull() const;
-
   /*!
    * Returns a ByteVector containing the string's data.
    * If \a t is Latin1 or UTF8, this will return a vector of 8 bit characters, otherwise it will use 16 bit characters.
@@ -328,21 +316,13 @@ class TAGLIB_EXPORT String {
    */
   ByteVector data(Type t) const;
 
-  /*!
-   * Convert the string to an integer.
-   *
-   * Returns the integer if the conversion was successful or 0 if the string does not represent a number.
-   */
-  // BIC: merge with the method below
-  int toInt() const;
-
   /*!
    * Convert the string to an integer.
    *
    * If the conversion was successful, it sets the value of \a *ok to true and returns the integer.
    * Otherwise it sets \a *ok to false and the result is undefined.
    */
-  int toInt(bool *ok) const;
+  int toInt(bool *ok = nullptr) const;
 
   /*!
    * Returns a string with the leading and trailing whitespace stripped.
@@ -480,16 +460,6 @@ class TAGLIB_EXPORT String {
    */
   bool operator<(const String &s) const;
 
-  /*!
-   * A null string provided for convenience.
-   *
-   * \warning Do not modify this variable.  It will mess up the internal state of TagLib.
-   *
-   * \deprecated
-   */
-  // BIC: remove
-  static String null;
-
  protected:
   /*!
    * If this String is being shared via implicit sharing, do a deep copy of the data and separate from the shared members.

3rdparty/taglib/toolkit/tstringlist.h

@@ -47,7 +47,7 @@ class TAGLIB_EXPORT StringList : public List<String> {
   /*!
    * Constructs an empty StringList.
    */
-  StringList();
+  explicit StringList();
 
   /*!
    * Make a shallow, implicitly shared, copy of \a l.