From 8a5d5ad952052d90b78e157c1c5311a2b1cad64e Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 23 Apr 2020 21:51:14 +0200
Subject: [PATCH] Fix some compile warnings in taglib

---
 3rdparty/taglib/mod/modfilebase.cpp     | 8 ++++----
 3rdparty/taglib/toolkit/tfilestream.cpp | 2 +-
 3rdparty/taglib/xm/xmfile.cpp           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3rdparty/taglib/mod/modfilebase.cpp b/3rdparty/taglib/mod/modfilebase.cpp
index f53ea5ee..95624ab2 100644
--- a/3rdparty/taglib/mod/modfilebase.cpp
+++ b/3rdparty/taglib/mod/modfilebase.cpp
@@ -60,9 +60,9 @@ bool Mod::FileBase::readString(String &s, unsigned long size)
   return true;
 }
 
-void Mod::FileBase::writeByte(unsigned char byte)
+void Mod::FileBase::writeByte(unsigned char _byte)
 {
-  ByteVector data(1, byte);
+  ByteVector data(1, _byte);
   writeBlock(data);
 }
 
@@ -86,11 +86,11 @@ void Mod::FileBase::writeU32B(unsigned long number)
   writeBlock(ByteVector::fromUInt(number, true));
 }
 
-bool Mod::FileBase::readByte(unsigned char &byte)
+bool Mod::FileBase::readByte(unsigned char &_byte)
 {
   ByteVector data(readBlock(1));
   if(data.size() < 1) return false;
-  byte = data[0];
+  _byte = data[0];
   return true;
 }
 
diff --git a/3rdparty/taglib/toolkit/tfilestream.cpp b/3rdparty/taglib/toolkit/tfilestream.cpp
index cbb6c815..9b23a250 100644
--- a/3rdparty/taglib/toolkit/tfilestream.cpp
+++ b/3rdparty/taglib/toolkit/tfilestream.cpp
@@ -58,7 +58,7 @@ namespace
 #endif
   }
 
-  FileHandle openFile(const int fileDescriptor, bool readOnly)
+  FileHandle openFile(const int, bool)
   {
     return InvalidFileHandle;
   }
diff --git a/3rdparty/taglib/xm/xmfile.cpp b/3rdparty/taglib/xm/xmfile.cpp
index 9e246e4e..e942e75a 100644
--- a/3rdparty/taglib/xm/xmfile.cpp
+++ b/3rdparty/taglib/xm/xmfile.cpp
@@ -151,7 +151,7 @@ private:
 class ByteReader : public ValueReader<unsigned char>
 {
 public:
-  explicit ByteReader(unsigned char &byte) : ValueReader<unsigned char>(byte) {}
+  explicit ByteReader(unsigned char &_byte) : ValueReader<unsigned char>(_byte) {}
 
   unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit)
   {