diff --git a/3rdparty/taglib/mpeg/mpegfile.cpp b/3rdparty/taglib/mpeg/mpegfile.cpp
index 92200dd67..95aa20899 100644
--- a/3rdparty/taglib/mpeg/mpegfile.cpp
+++ b/3rdparty/taglib/mpeg/mpegfile.cpp
@@ -40,9 +40,11 @@
 using namespace Strawberry_TagLib::TagLib;
 
 namespace {
-enum { ID3v2Index = 0,
+enum {
+  ID3v2Index = 0,
   APEIndex = 1,
-  ID3v1Index = 2 };
+  ID3v1Index = 2
+};
 }
 
 class MPEG::File::FilePrivate {
diff --git a/3rdparty/taglib/toolkit/tfile.cpp b/3rdparty/taglib/toolkit/tfile.cpp
index 8989fd8b6..fa07b8557 100644
--- a/3rdparty/taglib/toolkit/tfile.cpp
+++ b/3rdparty/taglib/toolkit/tfile.cpp
@@ -70,14 +70,14 @@ using namespace Strawberry_TagLib::TagLib;
 
 class File::FilePrivate {
  public:
-  FilePrivate(IOStream* _stream, bool _owner) : stream(_stream), streamOwner(_owner), valid(true) {}
+  FilePrivate(IOStream *_stream, bool _owner) : stream(_stream), streamOwner(_owner), valid(true) {}
 
   ~FilePrivate() {
     if (streamOwner)
       delete stream;
   }
 
-  IOStream* stream;
+  IOStream *stream;
   bool streamOwner;
   bool valid;
 };
@@ -88,7 +88,7 @@ class File::FilePrivate {
 
 File::File(const FileName fileName) : d(new FilePrivate(new FileStream(fileName), true)) {}
 
-File::File(IOStream* stream) : d(new FilePrivate(stream, false)) {}
+File::File(IOStream *stream) : d(new FilePrivate(stream, false)) {}
 
 File::~File() {
   delete d;
@@ -234,7 +234,7 @@ void File::writeBlock(const ByteVector& data) {
   d->stream->writeBlock(data);
 }
 
-long File::find(const ByteVector& pattern, long fromOffset, const ByteVector& before) {
+long File::find(const ByteVector &pattern, long fromOffset, const ByteVector &before) {
 
   if (!d->stream || pattern.size() > bufferSize())
     return -1;
@@ -331,7 +331,7 @@ long File::find(const ByteVector& pattern, long fromOffset, const ByteVector& be
 }
 
 
-long File::rfind(const ByteVector& pattern, long fromOffset, const ByteVector& before) {
+long File::rfind(const ByteVector &pattern, long fromOffset, const ByteVector &before) {
 
   if (!d->stream || pattern.size() > bufferSize())
     return -1;
diff --git a/3rdparty/taglib/toolkit/tfile.h b/3rdparty/taglib/toolkit/tfile.h
index dc8972b00..eabbc97e2 100644
--- a/3rdparty/taglib/toolkit/tfile.h
+++ b/3rdparty/taglib/toolkit/tfile.h
@@ -184,9 +184,7 @@ class TAGLIB_EXPORT File {
    * \note This has the practical limitation that \a pattern can not be longer
    * than the buffer size used by readBlock().  Currently this is 1024 bytes.
    */
-  long rfind(const ByteVector &pattern,
-    long fromOffset = 0,
-    const ByteVector &before = ByteVector());
+  long rfind(const ByteVector &pattern, long fromOffset = 0, const ByteVector &before = ByteVector());
 
   /*!
    * Insert \a data at position \a start in the file overwriting \a replace bytes of the original content.
@@ -248,7 +246,7 @@ class TAGLIB_EXPORT File {
    *
    * \note Constructor is protected since this class should only be instantiated through subclasses.
    */
-  explicit File(FileName file);
+  explicit File(const FileName fileName);
 
   /*!
    * Construct a File object and use the \a stream instance.