diff --git a/taglib/mpeg/id3v2/frames/chapterframe.cpp b/taglib/mpeg/id3v2/frames/chapterframe.cpp
index 8c5514e2..b1741cd2 100644
--- a/taglib/mpeg/id3v2/frames/chapterframe.cpp
+++ b/taglib/mpeg/id3v2/frames/chapterframe.cpp
@@ -183,11 +183,11 @@ PropertyMap ChapterFrame::asProperties() const
   PropertyMap map;
 
   map.unsupportedData().append(frameID() + String("/") + d->elementID);
-  
+
   return map;
 }
 
-ChapterFrame *ChapterFrame::findByElementID(const Tag *tag, const ByteVector &eID) // static
+ChapterFrame *ChapterFrame::findByElementID(const ID3v2::Tag *tag, const ByteVector &eID) // static
 {
   ID3v2::FrameList comments = tag->frameList("CHAP");
 
@@ -238,7 +238,7 @@ void ChapterFrame::parseFields(const ByteVector &data)
 
     embPos += frame->size() + Frame::headerSize(4);
     addEmbeddedFrame(frame);
-  }   
+  }
 }
 
 ByteVector ChapterFrame::renderFields() const
@@ -253,7 +253,7 @@ ByteVector ChapterFrame::renderFields() const
   FrameList l = d->embeddedFrameList;
   for(FrameList::Iterator it = l.begin(); it != l.end(); ++it)
     data.append((*it)->render());
-  
+
   return data;
 }
 
diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
index f986eb9a..26f5a541 100644
--- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
@@ -184,7 +184,7 @@ PropertyMap TableOfContentsFrame::asProperties() const
   PropertyMap map;
 
   map.unsupportedData().append(frameID() + String("/") + d->elementID);
-  
+
   return map;
 }
 
@@ -204,7 +204,7 @@ TableOfContentsFrame *TableOfContentsFrame::findByElementID(const ID3v2::Tag *ta
   return 0;
 }
 
-TableOfContentsFrame *TableOfContentsFrame::findTopLevel(const Tag *tag) // static
+TableOfContentsFrame *TableOfContentsFrame::findTopLevel(const ID3v2::Tag *tag) // static
 {
   ID3v2::FrameList tablesOfContents = tag->frameList("CTOC");
 
@@ -240,7 +240,7 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
     childElementID.append(char(0));
     d->childElements.append(childElementID);
   }
-  
+
   size -= pos;
   while((uint)embPos < size - Frame::headerSize(4))
   {
@@ -257,7 +257,7 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
 
     embPos += frame->size() + Frame::headerSize(4);
     addEmbeddedFrame(frame);
-  }   
+  }
 }
 
 ByteVector TableOfContentsFrame::renderFields() const
@@ -280,7 +280,7 @@ ByteVector TableOfContentsFrame::renderFields() const
   FrameList l = d->embeddedFrameList;
   for(FrameList::Iterator it = l.begin(); it != l.end(); ++it)
     data.append((*it)->render());
-  
+
   return data;
 }