From 5861cb8e0089f8b42a1ba89d08cbd9e7e0f617a9 Mon Sep 17 00:00:00 2001
From: Scott Wheeler <wheeler@kde.org>
Date: Wed, 7 Apr 2004 07:58:06 +0000
Subject: [PATCH] CVS_SILENT nitpicks

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@301909 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ogg/flac/oggflacfile.cpp | 26 ++++++++++++--------------
 ogg/flac/oggflacfile.h   |  3 ++-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ogg/flac/oggflacfile.cpp b/ogg/flac/oggflacfile.cpp
index 210b3b31..f2f9212d 100644
--- a/ogg/flac/oggflacfile.cpp
+++ b/ogg/flac/oggflacfile.cpp
@@ -65,7 +65,7 @@ public:
 ////////////////////////////////////////////////////////////////////////////////
 
 Ogg::FLAC::File::File(const char *file, bool readProperties,
-                 Properties::ReadStyle propertiesStyle) : Ogg::File(file)
+                      Properties::ReadStyle propertiesStyle) : Ogg::File(file)
 {
   d = new FilePrivate;
   read(readProperties, propertiesStyle);
@@ -93,7 +93,7 @@ void Ogg::FLAC::File::save()
 
   // Create FLAC metadata-block:
 
-  // Put the size in the first 32 bit ( I assume no more than 24 bit are used )
+  // Put the size in the first 32 bit (I assume no more than 24 bit are used)
 
   ByteVector v = ByteVector::fromUInt(d->xiphCommentData.size());
 
@@ -142,9 +142,8 @@ void Ogg::FLAC::File::read(bool readProperties, Properties::ReadStyle properties
 
   if(d->hasXiphComment)
     d->comment = new Ogg::XiphComment(xiphCommentData());
-  else {
-    d->comment = new Ogg::XiphComment();
-  }
+  else
+    d->comment = new Ogg::XiphComment;
 
 
   if(readProperties)
@@ -184,7 +183,7 @@ void Ogg::FLAC::File::scan()
 
   ByteVector metadataHeader = packet(ipacket);
 
-  if (metadataHeader == ByteVector::null)
+  if(metadataHeader.isNull())
     return;
 
   ByteVector header = metadataHeader.mid(0,4);
@@ -192,7 +191,7 @@ void Ogg::FLAC::File::scan()
   // Header format (from spec):
   // <1> Last-metadata-block flag
   // <7> BLOCK_TYPE
-  //	0 : STREAMINFO
+  //    0 : STREAMINFO
   //    1 : PADDING
   //    ..
   //    4 : VORBIS_COMMENT
@@ -225,17 +224,16 @@ void Ogg::FLAC::File::scan()
     overhead += length;
 
     if(blockType == 1) {
-//      debug("Ogg::FLAC::File::scan() -- Padding found");
-    } else
-    if(blockType == 4) {
-//      debug("Ogg::FLAC::File::scan() -- Vorbis-comments found");
+      // debug("Ogg::FLAC::File::scan() -- Padding found");
+    }
+    else if(blockType == 4) {
+      // debug("Ogg::FLAC::File::scan() -- Vorbis-comments found");
       d->xiphCommentData = metadataHeader.mid(4, length);
       d->hasXiphComment = true;
       d->commentPacket = ipacket;
-    } else
-    if(blockType > 5) {
-      debug("Ogg::FLAC::File::scan() -- Unknown metadata block");
     }
+    else if(blockType > 5)
+      debug("Ogg::FLAC::File::scan() -- Unknown metadata block");
 
   }
 
diff --git a/ogg/flac/oggflacfile.h b/ogg/flac/oggflacfile.h
index 3c3900af..db00dc0b 100644
--- a/ogg/flac/oggflacfile.h
+++ b/ogg/flac/oggflacfile.h
@@ -59,7 +59,8 @@ namespace TagLib {
     public:
       /*!
        * Contructs an Ogg/FLAC file from \a file.  If \a readProperties is true
-       * the file's audio properties will also be read using \a propertiesStyle.        * If false, \a propertiesStyle is ignored.
+       * the file's audio properties will also be read using \a propertiesStyle.
+       * If false, \a propertiesStyle is ignored.
        */
       File(const char *file, bool readProperties = true,
            Properties::ReadStyle propertiesStyle = Properties::Average);
-- 
2.40.0