A few more nitpicks.

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@331315 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/mpc/apetag.cpp b/mpc/apetag.cpp
index e71b86c3c390f129cfd33d9e1b89abe8e0912413..83362a2b599340b94cb79f75a54b31d909306c5d 100644 (file)
--- a/mpc/apetag.cpp
+++ b/mpc/apetag.cpp
@@ -247,7 +247,7 @@ void APE::Tag::setYear(uint i)
 
 void APE::Tag::setTrack(uint i)
 {
-  if(i <=0 )
+  if(i <= 0)
     removeComment("Track");
   else
     d->items["Track"] = String::number(i);
@@ -255,7 +255,7 @@ void APE::Tag::setTrack(uint i)
 
 void APE::Tag::removeComment(const String &key) {
   Map<String,String>::Iterator it = d->items.find(key);
-  if (it != d->items.end())
+  if(it != d->items.end())
     d->items.erase(it);
 }
 
@@ -267,7 +267,7 @@ void APE::Tag::addComment(const String &key, const String &value)
     d->items[key] = value;
 }
 
-TagLib::uint APE::Tag::tagSize(ByteVector footer)
+TagLib::uint APE::Tag::tagSize(const ByteVector &footer)
 {
   // The reported length (excl. header)
 
@@ -293,11 +293,11 @@ void APE::Tag::read()
 
     // parse footer and some initial sanity checking
     if(footer.size() == 32 && footer.mid(0, 8) == "APETAGEX") {
-      uint length = footer.mid(12,4).toUInt(false);
-      uint count = footer.mid(16,4).toUInt(false);
+      uint length = footer.mid(12, 4).toUInt(false);
+      uint count = footer.mid(16, 4).toUInt(false);
       d->tagLength = length;
-      d->file->seek(d->tagOffset + 32 -length);
-      ByteVector data = d->file->readBlock(length-32);
+      d->file->seek(d->tagOffset + 32 - length);
+      ByteVector data = d->file->readBlock(length - 32);
       parse(data, count);
     }
     else

diff --git a/mpc/apetag.h b/mpc/apetag.h
index 1540da7f9e817573915dd9fabf807369c63c6e1d..bf87d53322845eafe83c7cf4b5c64fc0b6e52e46 100644 (file)
--- a/mpc/apetag.h
+++ b/mpc/apetag.h
@@ -67,7 +67,7 @@ namespace TagLib {
       /*!
        * Returns the size of the tag calculated based on the footer.
        */
-      static uint tagSize(ByteVector footer);
+      static uint tagSize(const ByteVector &footer);
 
       // Reimplementations.
 

diff --git a/mpc/mpcfile.cpp b/mpc/mpcfile.cpp
index ef635af459c37c33b7f8581a817bf4b8cf1d9782..4a9d8add78d285499a3bac0a602d7b12994b4294 100644 (file)
--- a/mpc/mpcfile.cpp
+++ b/mpc/mpcfile.cpp
@@ -133,7 +133,7 @@ bool MPC::File::save()
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void MPC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
+void MPC::File::read(bool readProperties, Properties::ReadStyle /* propertiesStyle */)
 {
   // Look for an APE tag
 

diff --git a/mpc/mpcproperties.cpp b/mpc/mpcproperties.cpp
index 328b5c4088567503f68ffd4b2511abe97b49252a..ef966faacffb8f39f21686f1784b0dfb65c35c2c 100644 (file)
--- a/mpc/mpcproperties.cpp
+++ b/mpc/mpcproperties.cpp
@@ -31,7 +31,7 @@ using namespace TagLib;
 class MPC::Properties::PropertiesPrivate
 {
 public:
-  PropertiesPrivate(ByteVector d, long st, ReadStyle s) :
+  PropertiesPrivate(const ByteVector &d, long st, ReadStyle s) :
     data(d),
     streamLength(st),
     style(s),
@@ -106,7 +106,7 @@ static const unsigned short sftable [4] = { 44100, 48000, 37800, 32000 };
 
 void MPC::Properties::read()
 {
-  if(d->data.mid(0,3) != "MP+")
+  if(d->data.mid(0, 3) != "MP+")
     return;
 
   d->version = d->data[3] & 15;
@@ -137,5 +137,4 @@ void MPC::Properties::read()
 
   if(!d->bitrate)
     d->bitrate = ((d->streamLength * 8L) / d->length) / 1000;
-
 }