From 4998dedcf40979c107e396e10ceff6116815c749 Mon Sep 17 00:00:00 2001
From: Maxime Leblanc <maxime.leblanc@devialet.com>
Date: Wed, 9 Sep 2015 10:31:08 +0200
Subject: [PATCH] mp4tag.cpp: run astyle on added parts

---
 taglib/mp4/mp4tag.cpp | 116 ++++++++++++++++++------------------------
 1 file changed, 50 insertions(+), 66 deletions(-)

diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index 3e553a93..bfd2185e 100644
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -728,33 +728,31 @@ MP4::Tag::pictures() const
     return PictureMap();
 
   CoverArtList list = d->items["covr"].toCoverArtList();
-  if( list.isEmpty() )
-      return PictureMap();
+  if(list.isEmpty())
+    return PictureMap();
 
   PictureMap map;
-  for(CoverArtList::ConstIterator it = list.begin(); it != list.end(); ++it)
-  {
-      CoverArt art = *it;
-      String mime = "image/";
-      switch(art.format())
-      {
-      case CoverArt::BMP:
-          mime.append("bmp");
-        break;
-      case CoverArt::JPEG:
-        mime.append("jpeg");
-        break;
-      case CoverArt::GIF:
-        mime.append("gif");
-        break;
-      case CoverArt::PNG:
-        mime.append("png");
-        break;
-      case CoverArt::Unknown:
-        break;
-      }
-      Picture picture(art.data(), Picture::Other, mime);
-      map.insert(picture);
+  for(CoverArtList::ConstIterator it = list.begin(); it != list.end(); ++it) {
+    CoverArt art = *it;
+    String mime = "image/";
+    switch(art.format()) {
+    case CoverArt::BMP:
+      mime.append("bmp");
+      break;
+    case CoverArt::JPEG:
+      mime.append("jpeg");
+      break;
+    case CoverArt::GIF:
+      mime.append("gif");
+      break;
+    case CoverArt::PNG:
+      mime.append("png");
+      break;
+    case CoverArt::Unknown:
+      break;
+    }
+    Picture picture(art.data(), Picture::Other, mime);
+    map.insert(picture);
   }
   return PictureMap(map);
 }
@@ -804,48 +802,34 @@ MP4::Tag::setTrack(uint value)
 void
 MP4::Tag::setPictures(const PictureMap &l)
 {
-    CoverArtList list;
-    for(PictureMap::ConstIterator pictureMapIt = l.begin();
-        pictureMapIt != l.end();
-        ++pictureMapIt)
-    {
-        PictureList pictures = pictureMapIt->second;
-        for(PictureList::ConstIterator pictureListIt = pictures.begin();
-            pictureListIt != pictures.end();
-            ++pictureListIt)
-        {
-            Picture picture = *pictureListIt;
-            CoverArt::Format format;
-            const char* mime = picture.mime().toCString();
-            if(std::strcmp("image/", mime) == 0)
-            {
-                format = CoverArt::Unknown;
-            }
-            else if(std::strcmp("image/bmp", mime) == 0)
-            {
-                format = CoverArt::BMP;
-            }
-            else if(std::strcmp("image/png", mime) == 0)
-            {
-                format = CoverArt::PNG;
-            }
-            else if(std::strcmp("image/gif", mime) == 0)
-            {
-                format = CoverArt::GIF;
-            }
-            else if(std::strcmp("image/jpeg", mime) == 0)
-            {
-                format = CoverArt::JPEG;
-            }
-            else
-            {
-                format = CoverArt::Unknown;
-            }
-            CoverArt art(format, picture.data());
-            list.append(art);
-        }
+  CoverArtList list;
+  for(PictureMap::ConstIterator pictureMapIt = l.begin();
+      pictureMapIt != l.end();
+      ++pictureMapIt) {
+    PictureList pictures = pictureMapIt->second;
+    for(PictureList::ConstIterator pictureListIt = pictures.begin();
+        pictureListIt != pictures.end();
+        ++pictureListIt) {
+      Picture picture = *pictureListIt;
+      CoverArt::Format format;
+      const char *mime = picture.mime().toCString();
+      if(std::strcmp("image/", mime) == 0)
+        format = CoverArt::Unknown;
+      else if(std::strcmp("image/bmp", mime) == 0)
+        format = CoverArt::BMP;
+      else if(std::strcmp("image/png", mime) == 0)
+        format = CoverArt::PNG;
+      else if(std::strcmp("image/gif", mime) == 0)
+        format = CoverArt::GIF;
+      else if(std::strcmp("image/jpeg", mime) == 0)
+        format = CoverArt::JPEG;
+      else
+        format = CoverArt::Unknown;
+      CoverArt art(format, picture.data());
+      list.append(art);
     }
-    d->items["covr"] = list;
+  }
+  d->items["covr"] = list;
 }
 
 bool MP4::Tag::isEmpty() const