From 0501fbdd72e2aaeb05dadab02b592c4bace13899 Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Sat, 1 Aug 2015 00:33:56 +0900 Subject: [PATCH] AIFF: Remove unused formal parameters. --- taglib/riff/aiff/aifffile.cpp | 25 +++++++++++-------------- taglib/riff/aiff/aifffile.h | 2 +- taglib/riff/aiff/aiffproperties.cpp | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp index 6a6a84e8..35eedd8e 100644 --- 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 8a5b45d3..a79d76b2 100644 --- 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 6112e0d8..e345fb0c 100644 --- 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()) {