From fdbfa6d6f682fb067442384bc69bbd319ee305c1 Mon Sep 17 00:00:00 2001
From: Scott Wheeler <wheeler@kde.org>
Date: Tue, 22 Jan 2008 17:33:48 +0000
Subject: [PATCH] pedantry

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@764837 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 taglib/mpeg/id3v2/frames/urllinkframe.cpp | 17 ++++++++++-------
 taglib/mpeg/id3v2/frames/urllinkframe.h   |  6 ++++--
 taglib/mpeg/id3v2/id3v2framefactory.cpp   |  3 ++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/taglib/mpeg/id3v2/frames/urllinkframe.cpp b/taglib/mpeg/id3v2/frames/urllinkframe.cpp
index 2e9ac593..a58e3c87 100644
--- a/taglib/mpeg/id3v2/frames/urllinkframe.cpp
+++ b/taglib/mpeg/id3v2/frames/urllinkframe.cpp
@@ -31,12 +31,14 @@
 using namespace TagLib;
 using namespace ID3v2;
 
-class UrlLinkFrame::UrlLinkFramePrivate {
+class UrlLinkFrame::UrlLinkFramePrivate
+{
 public:
   String url;
 };
 
-class UserUrlLinkFrame::UserUrlLinkFramePrivate {
+class UserUrlLinkFrame::UserUrlLinkFramePrivate
+{
 public:
   UserUrlLinkFramePrivate() : textEncoding(String::Latin1) {}
   String::Type textEncoding;
@@ -138,7 +140,7 @@ void UserUrlLinkFrame::setDescription(const String &s)
 
 void UserUrlLinkFrame::parseFields(const ByteVector &data)
 {
-  if (data.size() < 2) {
+  if(data.size() < 2) {
     debug("A user URL link frame must contain at least 2 bytes.");
     return;
   }
@@ -148,16 +150,17 @@ void UserUrlLinkFrame::parseFields(const ByteVector &data)
   d->textEncoding = String::Type(data[0]);
   pos += 1;
 
-  if (d->textEncoding == String::Latin1 || d->textEncoding == String::UTF8) {
+  if(d->textEncoding == String::Latin1 || d->textEncoding == String::UTF8) {
     int offset = data.find(textDelimiter(d->textEncoding), pos);
-    if (offset < pos)
+    if(offset < pos)
       return;
 
     d->description = String(data.mid(pos, offset - pos), d->textEncoding);
     pos = offset + 1;
-  } else {
+  }
+  else {
     int len = data.mid(pos).find(textDelimiter(d->textEncoding), 0, 2);
-    if (len < 0)
+    if(len < 0)
       return;
 
     d->description = String(data.mid(pos, len), d->textEncoding);
diff --git a/taglib/mpeg/id3v2/frames/urllinkframe.h b/taglib/mpeg/id3v2/frames/urllinkframe.h
index 8ff2ec95..092451b5 100644
--- a/taglib/mpeg/id3v2/frames/urllinkframe.h
+++ b/taglib/mpeg/id3v2/frames/urllinkframe.h
@@ -37,7 +37,8 @@ namespace TagLib {
     /*!
      * An implementation of ID3v2 URL link frames.
      */
-    class UrlLinkFrame : public Frame {
+    class UrlLinkFrame : public Frame
+    {
       friend class FrameFactory;
 
     public:
@@ -91,7 +92,8 @@ namespace TagLib {
      *
      * This description identifies the frame and must be unique.
      */
-    class UserUrlLinkFrame : public UrlLinkFrame {
+    class UserUrlLinkFrame : public UrlLinkFrame
+    {
       friend class FrameFactory;
 
     public:
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index 3595cc46..8bbfde96 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -193,7 +193,8 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader)
   if(frameID.startsWith("W")) {
     if(frameID != "WXXX") {
       return new UrlLinkFrame(data, header);
-    } else {
+    }
+    else {
       UserUrlLinkFrame *f = new UserUrlLinkFrame(data, header);
       if(d->useDefaultEncoding)
         f->setTextEncoding(d->defaultEncoding);