AIFF: Remove unused formal parameters.

diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp
index 6a6a84e84d6fc5c32f5e8af58bd7f3d4ee68b7d6..35eedd8e350d1863f8156df3dec5ba7cd27008f0 100644 (file)
--- a/taglib/riff/aiff/aifffile.cpp
+++ b/taglib/riff/aiff/aifffile.cpp
@@ -40,10 +40,7 @@ public:
     properties(0),
     tag(0),
     tagChunkID("ID3 "),
-    hasID3v2(false)
-  {
-
-  }
+    hasID3v2(false) {}
 
   ~FilePrivate()
   {
@@ -62,20 +59,20 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-RIFF::AIFF::File::File(FileName file, bool readProperties,
-                       Properties::ReadStyle propertiesStyle) : RIFF::File(file, BigEndian)
+RIFF::AIFF::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
+  RIFF::File(file, BigEndian),
+  d(new FilePrivate())
 {
-  d = new FilePrivate;
   if(isOpen())
-    read(readProperties, propertiesStyle);
+    read(readProperties);
 }
 
-RIFF::AIFF::File::File(IOStream *stream, bool readProperties,
-                       Properties::ReadStyle propertiesStyle) : RIFF::File(stream, BigEndian)
+RIFF::AIFF::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
+  RIFF::File(stream, BigEndian),
+  d(new FilePrivate())
 {
-  d = new FilePrivate;
   if(isOpen())
-    read(readProperties, propertiesStyle);
+    read(readProperties);
 }
 
 RIFF::AIFF::File::~File()
@@ -135,7 +132,7 @@ bool RIFF::AIFF::File::hasID3v2Tag() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void RIFF::AIFF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
+void RIFF::AIFF::File::read(bool readProperties)
 {
   for(uint i = 0; i < chunkCount(); ++i) {
     const ByteVector name = chunkName(i);
@@ -155,5 +152,5 @@ void RIFF::AIFF::File::read(bool readProperties, Properties::ReadStyle propertie
     d->tag = new ID3v2::Tag();
 
   if(readProperties)
-    d->properties = new Properties(this, propertiesStyle);
+    d->properties = new Properties(this, Properties::Average);
 }

diff --git a/taglib/riff/aiff/aifffile.h b/taglib/riff/aiff/aifffile.h
index 8a5b45d352b2ffd46269ac01a791e8b57224d3eb..a79d76b2be0af8c7b38538fcb5383a21d36e633e 100644 (file)
--- a/taglib/riff/aiff/aifffile.h
+++ b/taglib/riff/aiff/aifffile.h
@@ -130,7 +130,7 @@ namespace TagLib {
         File(const File &);
         File &operator=(const File &);
 
-        void read(bool readProperties, Properties::ReadStyle propertiesStyle);
+        void read(bool readProperties);
 
         friend class Properties;
 

diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp
index 6112e0d8fb89a3ee4cfdb2e70b37e0564026b4da..e345fb0c098c1cc896424729b52a813fa41f56e4 100644 (file)
--- a/taglib/riff/aiff/aiffproperties.cpp
+++ b/taglib/riff/aiff/aiffproperties.cpp
@@ -57,7 +57,7 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-RIFF::AIFF::Properties::Properties(const ByteVector & /*data*/, ReadStyle style) :
+RIFF::AIFF::Properties::Properties(const ByteVector &, ReadStyle style) :
   AudioProperties(style),
   d(new PropertiesPrivate())
 {