3 files changed, 9 insertions, 8 deletions
diff --git a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
index c31e1076..86f8e355 100644
--- a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
+++ b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
@@ -136,7 +136,7 @@ void AttachedPictureFrame::parseFields(const ByteVector &data)
   int pos = 1;
 
   d->mimeType = readStringField(data, String::Latin1, &pos);
-  /* Now we need at least two more bytes available */	
+  /* Now we need at least two more bytes available */
   if (uint(pos) + 1 >= data.size()) {
     debug("Truncated picture frame.");
     return;
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index e1850833..6bd8b204 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -185,13 +185,13 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader)
 
   // ID3v2.2 Attached Picture
 
-	if(frameID == "PIC") {
+  if(frameID == "PIC") {
     AttachedPictureFrame *f = new AttachedPictureFrameV22(data, header);
     d->setTextEncoding(f);
     return f;
   }
 
-	// Relative Volume Adjustment (frames 4.11)
+  // Relative Volume Adjustment (frames 4.11)
 
   if(frameID == "RVA2")
     return new RelativeVolumeFrame(data, header);
diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp
index 9786c99a..a3bad823 100644
--- a/taglib/mpeg/mpegfile.cpp
+++ b/taglib/mpeg/mpegfile.cpp
@@ -201,7 +201,7 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
       // APE tag location has changed, update if it exists
 
       if(APETag())
-	findAPE();
+        findAPE();
     }
     else if(stripOthers)
       success = strip(ID3v2, false) && success;
@@ -239,9 +239,10 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
       else {
         seek(0, End);
         d->APELocation = tell();
-	d->APEFooterLocation = d->APELocation
-	  + d->tag.access<APE::Tag>(APEIndex, false)->footer()->completeTagSize()
-	  - APE::Footer::size();
+        APE::Tag *apeTag = d->tag.access<APE::Tag>(APEIndex, false);
+        d->APEFooterLocation = d->APELocation
+                               + apeTag->footer()->completeTagSize()
+                               - APE::Footer::size();
         writeBlock(APETag()->render());
         d->APEOriginalSize = APETag()->footer()->completeTagSize();
         d->hasAPE = true;
@@ -587,7 +588,7 @@ void MPEG::File::findAPE()
       seek(d->APEFooterLocation);
       APE::Footer footer(readBlock(APE::Footer::size()));
       d->APELocation = d->APEFooterLocation - footer.completeTagSize()
-	+ APE::Footer::size();
+                       + APE::Footer::size();
       return;
     }
   }