Fix parameter name mispatches

3rdparty/taglib/ape/apeitem.cpp

@@ -100,8 +100,8 @@ bool APE::Item::isReadOnly() const {
   return d->readOnly;
 }
 
-void APE::Item::setType(APE::Item::ItemTypes val) {
-  d->type = val;
+void APE::Item::setType(APE::Item::ItemTypes type) {
+  d->type = type;
 }
 
 APE::Item::ItemTypes APE::Item::type() const {

3rdparty/taglib/asf/asfattribute.h

@@ -104,7 +104,7 @@ class TAGLIB_EXPORT Attribute {
   /*!
    * Construct an attribute as a copy of \a other.
    */
-  Attribute(const Attribute &item);
+  Attribute(const Attribute &other);
 
   /*!
    * Copies the contents of \a other into this item.

3rdparty/taglib/asf/asftag.h

@@ -97,47 +97,47 @@ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
   /*!
    * Sets the title to \a s.
    */
-  virtual void setTitle(const String &s);
+  virtual void setTitle(const String &value);
 
   /*!
    * Sets the artist to \a s.
    */
-  virtual void setArtist(const String &s);
+  virtual void setArtist(const String &value);
 
   /*!
    * Sets the album to \a s.  If \a s is String::null then this value will be cleared.
    */
-  virtual void setAlbum(const String &s);
+  virtual void setAlbum(const String &value);
 
   /*!
    * Sets the comment to \a s.
    */
-  virtual void setComment(const String &s);
+  virtual void setComment(const String &value);
 
   /*!
    * Sets the rating to \a s.
    */
-  virtual void setRating(const String &s);
+  virtual void setRating(const String &value);
 
   /*!
    * Sets the copyright to \a s.
    */
-  virtual void setCopyright(const String &s);
+  virtual void setCopyright(const String &value);
 
   /*!
    * Sets the genre to \a s.
    */
-  virtual void setGenre(const String &s);
+  virtual void setGenre(const String &value);
 
   /*!
    * Sets the year to \a i.  If \a s is 0 then this value will be cleared.
    */
-  virtual void setYear(unsigned int i);
+  virtual void setYear(unsigned int value);
 
   /*!
    * Sets the track to \a i.  If \a s is 0 then this value will be cleared.
    */
-  virtual void setTrack(unsigned int i);
+  virtual void setTrack(unsigned int value);
 
   /*!
    * Returns true if the tag does not contain any data.
@@ -153,12 +153,12 @@ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
   /*!
    * \return True if a value for \a attribute is currently set.
    */
-  bool contains(const String &name) const;
+  bool contains(const String &key) const;
 
   /*!
    * Removes the \a key attribute from the tag
    */
-  void removeItem(const String &name);
+  void removeItem(const String &key);
 
   /*!
    * \return The list of values for the key \a name, or an empty list if no values have been set.
@@ -182,8 +182,8 @@ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
   void addAttribute(const String &name, const Attribute &attribute);
 
   PropertyMap properties() const;
-  void removeUnsupportedProperties(const StringList &properties);
-  PropertyMap setProperties(const PropertyMap &properties);
+  void removeUnsupportedProperties(const StringList &props);
+  PropertyMap setProperties(const PropertyMap &props);
 
  private:
   class TagPrivate;

3rdparty/taglib/dsdiff/dsdifffile.cpp

@@ -196,13 +196,13 @@ PropertyMap DSDIFF::File::properties() const {
 
 }
 
-void DSDIFF::File::removeUnsupportedProperties(const StringList &unsupported) {
+void DSDIFF::File::removeUnsupportedProperties(const StringList &properties) {
 
   if (d->hasID3v2)
-    d->tag.access<ID3v2::Tag>(ID3v2Index, false)->removeUnsupportedProperties(unsupported);
+    d->tag.access<ID3v2::Tag>(ID3v2Index, false)->removeUnsupportedProperties(properties);
 
   if (d->hasDiin)
-    d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->removeUnsupportedProperties(unsupported);
+    d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->removeUnsupportedProperties(properties);
 
 }
 

3rdparty/taglib/dsdiff/dsdifffile.h

@@ -141,7 +141,7 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
    * Implements the unified property interface -- import function.
    * This method forwards to ID3v2::Tag::setProperties().
    */
-  PropertyMap setProperties(const PropertyMap &);
+  PropertyMap setProperties(const PropertyMap &properties);
 
   /*!
    * Returns the AIFF::Properties for this file.
@@ -214,8 +214,8 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
   File &operator=(const File &);
 
   void removeRootChunk(const ByteVector &id);
-  void removeRootChunk(unsigned int chunk);
-  void removeChildChunk(unsigned int i, unsigned int chunk);
+  void removeRootChunk(unsigned int i);
+  void removeChildChunk(unsigned int i, unsigned int childChunkNum);
 
   /*!
    * Sets the data for the the specified chunk at root level to \a data.

3rdparty/taglib/flac/flacunknownmetadatablock.h

@@ -37,7 +37,7 @@ namespace FLAC {
 
 class TAGLIB_EXPORT UnknownMetadataBlock : public MetadataBlock {
  public:
-  UnknownMetadataBlock(int blockType, const ByteVector &data);
+  UnknownMetadataBlock(int code, const ByteVector &data);
   ~UnknownMetadataBlock();
 
   /*!

3rdparty/taglib/mod/modproperties.h

@@ -50,7 +50,7 @@ class TAGLIB_EXPORT Properties : public AudioProperties {
 
   void setChannels(int channels);
 
-  void setInstrumentCount(unsigned int sampleCount);
+  void setInstrumentCount(unsigned int instrumentCount);
   void setLengthInPatterns(unsigned char lengthInPatterns);
 
  private:

3rdparty/taglib/mp4/mp4item.cpp

@@ -93,9 +93,9 @@ MP4::Item::Item(long long value) : d(new ItemPrivate()) {
   d->m_longlong = value;
 }
 
-MP4::Item::Item(int value1, int value2) : d(new ItemPrivate()) {
-  d->m_intPair.first = value1;
-  d->m_intPair.second = value2;
+MP4::Item::Item(int first, int second) : d(new ItemPrivate()) {
+  d->m_intPair.first = first;
+  d->m_intPair.second = second;
 }
 
 MP4::Item::Item(const ByteVectorList &value) : d(new ItemPrivate()) {

3rdparty/taglib/mp4/mp4tag.h

@@ -91,8 +91,8 @@ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
   bool contains(const String &key) const;
 
   PropertyMap properties() const;
-  void removeUnsupportedProperties(const StringList &properties);
-  PropertyMap setProperties(const PropertyMap &properties);
+  void removeUnsupportedProperties(const StringList &props);
+  PropertyMap setProperties(const PropertyMap &props);
 
  private:
   AtomDataList parseData2(const Atom *atom, int expectedFlags = -1, bool freeForm = false);

3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h

@@ -98,7 +98,7 @@ class TAGLIB_EXPORT CommentsFrame : public Frame {
    *
    * \see language()
    */
-  void setLanguage(const ByteVector &languageCode);
+  void setLanguage(const ByteVector &languageEncoding);
 
   /*!
    * Sets the description of the comment to \a s.

3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h

@@ -157,7 +157,7 @@ class TAGLIB_EXPORT GeneralEncapsulatedObjectFrame : public Frame {
    * \see mimeType()
    * \see setMimeType()
    */
-  void setObject(const ByteVector &object);
+  void setObject(const ByteVector &data);
 
  protected:
   virtual void parseFields(const ByteVector &data);

3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.cpp

@@ -64,16 +64,16 @@ String OwnershipFrame::pricePaid() const {
   return d->pricePaid;
 }
 
-void OwnershipFrame::setPricePaid(const String &s) {
-  d->pricePaid = s;
+void OwnershipFrame::setPricePaid(const String &pricePaid) {
+  d->pricePaid = pricePaid;
 }
 
 String OwnershipFrame::datePurchased() const {
   return d->datePurchased;
 }
 
-void OwnershipFrame::setDatePurchased(const String &s) {
-  d->datePurchased = s;
+void OwnershipFrame::setDatePurchased(const String &datePurchased) {
+  d->datePurchased = datePurchased;
 }
 
 String OwnershipFrame::seller() const {

3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.cpp

@@ -60,24 +60,24 @@ String PopularimeterFrame::email() const {
   return d->email;
 }
 
-void PopularimeterFrame::setEmail(const String &s) {
-  d->email = s;
+void PopularimeterFrame::setEmail(const String &email) {
+  d->email = email;
 }
 
 int PopularimeterFrame::rating() const {
   return d->rating;
 }
 
-void PopularimeterFrame::setRating(int s) {
-  d->rating = s;
+void PopularimeterFrame::setRating(int rating) {
+  d->rating = rating;
 }
 
 unsigned int PopularimeterFrame::counter() const {
   return d->counter;
 }
 
-void PopularimeterFrame::setCounter(unsigned int s) {
-  d->counter = s;
+void PopularimeterFrame::setCounter(unsigned int counter) {
+  d->counter = counter;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

3rdparty/taglib/mpeg/id3v2/frames/privateframe.h

@@ -84,7 +84,7 @@ class TAGLIB_EXPORT PrivateFrame : public Frame {
   /*!
    *
    */
-  void setData(const ByteVector &v);
+  void setData(const ByteVector &data);
 
  protected:
   // Reimplementations.

3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h

@@ -172,7 +172,7 @@ class TAGLIB_EXPORT SynchronizedLyricsFrame : public Frame {
    *
    * \see language()
    */
-  void setLanguage(const ByteVector &languageCode);
+  void setLanguage(const ByteVector &languageEncoding);
 
   /*!
    * Set the timestamp format.

3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h

@@ -97,7 +97,7 @@ class TAGLIB_EXPORT UnsynchronizedLyricsFrame : public Frame {
    *
    * \see language()
    */
-  void setLanguage(const ByteVector &languageCode);
+  void setLanguage(const ByteVector &languageEncoding);
 
   /*!
    * Sets the description of the unsynchronized lyrics frame to \a s.

3rdparty/taglib/mpeg/id3v2/id3v2frame.h

@@ -398,7 +398,7 @@ class TAGLIB_EXPORT Frame::Header {
    *
    * \see tagAlterPreservation()
    */
-  void setTagAlterPreservation(bool discard);
+  void setTagAlterPreservation(bool preserve);
 
   /*!
    * Returns true if the flag for file alter preservation is set.

3rdparty/taglib/mpeg/id3v2/id3v2synchdata.h

@@ -57,7 +57,7 @@ TAGLIB_EXPORT ByteVector fromUInt(unsigned int value);
 /*!
    * Convert the data from unsynchronized data to its original format.
    */
-TAGLIB_EXPORT ByteVector decode(const ByteVector &input);
+TAGLIB_EXPORT ByteVector decode(const ByteVector &data);
 }  // namespace SynchData
 
 }  // namespace ID3v2

3rdparty/taglib/riff/aiff/aifffile.cpp

@@ -90,8 +90,8 @@ PropertyMap RIFF::AIFF::File::properties() const {
   return d->tag->properties();
 }
 
-void RIFF::AIFF::File::removeUnsupportedProperties(const StringList &unsupported) {
-  d->tag->removeUnsupportedProperties(unsupported);
+void RIFF::AIFF::File::removeUnsupportedProperties(const StringList &properties) {
+  d->tag->removeUnsupportedProperties(properties);
 }
 
 PropertyMap RIFF::AIFF::File::setProperties(const PropertyMap &properties) {

3rdparty/taglib/riff/wav/wavfile.cpp

@@ -121,8 +121,8 @@ PropertyMap RIFF::WAV::File::properties() const {
   return d->tag.properties();
 }
 
-void RIFF::WAV::File::removeUnsupportedProperties(const StringList &unsupported) {
-  d->tag.removeUnsupportedProperties(unsupported);
+void RIFF::WAV::File::removeUnsupportedProperties(const StringList &properties) {
+  d->tag.removeUnsupportedProperties(properties);
 }
 
 PropertyMap RIFF::WAV::File::setProperties(const PropertyMap &properties) {

3rdparty/taglib/tag.h

@@ -68,7 +68,7 @@ class TAGLIB_EXPORT Tag {
    * This default implementation sets only the tags for which setter methods exist in this class
    * (artist, album, ...), and only one value per key; the rest will be contained in the returned PropertyMap.
    */
-  PropertyMap setProperties(const PropertyMap &properties);
+  PropertyMap setProperties(const PropertyMap &origProps);
 
   /*!
    * Returns the track name; if no track name is present in the tag String::null will be returned.

3rdparty/taglib/toolkit/tbytevector.cpp

@@ -349,8 +349,8 @@ ByteVector::~ByteVector() {
   delete d;
 }
 
-ByteVector &ByteVector::setData(const char *s, unsigned int length) {
-  ByteVector(s, length).swap(*this);
+ByteVector &ByteVector::setData(const char *data, unsigned int length) {
+  ByteVector(data, length).swap(*this);
   return *this;
 }
 

3rdparty/taglib/toolkit/tstringlist.h

@@ -66,7 +66,7 @@ class TAGLIB_EXPORT StringList : public List<String> {
    * \note This should only be used with the 8-bit codecs Latin1 and UTF8,
    * when used with other codecs it will simply print a warning and exit.
    */
-  StringList(const ByteVectorList &vl, String::Type t = String::Latin1);
+  StringList(const ByteVectorList &bl, String::Type t = String::Latin1);
 
   /*!
    * Destroys this StringList instance.

3rdparty/taglib/trueaudio/trueaudiofile.cpp

@@ -129,8 +129,8 @@ PropertyMap TrueAudio::File::properties() const {
   return d->tag.properties();
 }
 
-void TrueAudio::File::removeUnsupportedProperties(const StringList &unsupported) {
-  d->tag.removeUnsupportedProperties(unsupported);
+void TrueAudio::File::removeUnsupportedProperties(const StringList &properties) {
+  d->tag.removeUnsupportedProperties(properties);
 }
 
 PropertyMap TrueAudio::File::setProperties(const PropertyMap &properties) {

3rdparty/taglib/wavpack/wavpackfile.cpp

@@ -113,8 +113,8 @@ PropertyMap WavPack::File::properties() const {
   return d->tag.properties();
 }
 
-void WavPack::File::removeUnsupportedProperties(const StringList &unsupported) {
-  d->tag.removeUnsupportedProperties(unsupported);
+void WavPack::File::removeUnsupportedProperties(const StringList &properties) {
+  d->tag.removeUnsupportedProperties(properties);
 }
 
 PropertyMap WavPack::File::setProperties(const PropertyMap &properties) {