FLAC: Remove unused formal parameters.

diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp
index 2483caf2689b53ab957ccbbeb8990127496a7bc3..dbf0d7674594f7a2a8a26e3051cbf56b337a627b 100644 (file)
--- a/taglib/flac/flacfile.cpp
+++ b/taglib/flac/flacfile.cpp
@@ -101,33 +101,32 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-FLAC::File::File(FileName file, bool readProperties,
-                 Properties::ReadStyle propertiesStyle) :
-  TagLib::File(file)
+FLAC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
+  TagLib::File(file),
+  d(new FilePrivate())
 {
-  d = new FilePrivate;
   if(isOpen())
-    read(readProperties, propertiesStyle);
+    read(readProperties);
 }
 
 FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
-                 bool readProperties, Properties::ReadStyle propertiesStyle) :
-  TagLib::File(file)
+                 bool readProperties, Properties::ReadStyle) :
+  TagLib::File(file),
+  d(new FilePrivate())
 {
-  d = new FilePrivate;
   d->ID3v2FrameFactory = frameFactory;
   if(isOpen())
-    read(readProperties, propertiesStyle);
+    read(readProperties);
 }
 
 FLAC::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
-                 bool readProperties, Properties::ReadStyle propertiesStyle) :
-  TagLib::File(stream)
+                 bool readProperties, Properties::ReadStyle) :
+  TagLib::File(stream),
+  d(new FilePrivate())
 {
-  d = new FilePrivate;
   d->ID3v2FrameFactory = frameFactory;
   if(isOpen())
-    read(readProperties, propertiesStyle);
+    read(readProperties);
 }
 
 FLAC::File::~File()
@@ -364,7 +363,7 @@ bool FLAC::File::hasID3v2Tag() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void FLAC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
+void FLAC::File::read(bool readProperties)
 {
   // Look for an ID3v2 tag
 
@@ -416,7 +415,7 @@ void FLAC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle
     else
       streamLength = File::length() - d->streamStart;
 
-    d->properties = new Properties(infoData, streamLength, propertiesStyle);
+    d->properties = new Properties(infoData, streamLength);
   }
 }
 

diff --git a/taglib/flac/flacfile.h b/taglib/flac/flacfile.h
index 367a5bf2d974ed0f38b5e16e1bc83be90439057b..e2d158429a5a7316ef1f3b5069bf35f3b566ec8e 100644 (file)
--- a/taglib/flac/flacfile.h
+++ b/taglib/flac/flacfile.h
@@ -290,7 +290,7 @@ namespace TagLib {
       File(const File &);
       File &operator=(const File &);
 
-      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
+      void read(bool readProperties);
       void scan();
       long findID3v2();
       long findID3v1();

diff --git a/taglib/flac/flacproperties.cpp b/taglib/flac/flacproperties.cpp
index f46eadaf778daa2378136c7f51967eea8f76bbdc..efc9fa1b4a5a322b2cbe827e0ce75d59f192eb9e 100644 (file)
--- a/taglib/flac/flacproperties.cpp
+++ b/taglib/flac/flacproperties.cpp
@@ -62,7 +62,7 @@ FLAC::Properties::Properties(ByteVector data, long streamLength, ReadStyle style
   read(data, streamLength);
 }
 
-FLAC::Properties::Properties(File *file, ReadStyle style) :
+FLAC::Properties::Properties(File *, ReadStyle style) :
   AudioProperties(style),
   d(new PropertiesPrivate())
 {