From 9e41939eb1e84818520f536dbaf619fc2976a707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lalinsky@gmail.com>
Date: Sun, 4 Nov 2012 10:03:02 +0100
Subject: [PATCH] Rename MPEG::XingHeader::xingHeaderOffset

---
 taglib/mpeg/mpegproperties.cpp | 4 ++--
 taglib/mpeg/xingheader.cpp     | 4 ++--
 taglib/mpeg/xingheader.h       | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/taglib/mpeg/mpegproperties.cpp b/taglib/mpeg/mpegproperties.cpp
index 7fdc918b..5bd3953e 100644
--- a/taglib/mpeg/mpegproperties.cpp
+++ b/taglib/mpeg/mpegproperties.cpp
@@ -203,8 +203,8 @@ void MPEG::Properties::read()
   // Check for a Xing header that will help us in gathering information about a
   // VBR stream.
 
-  int xingHeaderOffset = MPEG::XingHeader::xingHeaderOffset(firstHeader.version(),
-                                                            firstHeader.channelMode());
+  int xingHeaderOffset = MPEG::XingHeader::offset(firstHeader.version(),
+                                                  firstHeader.channelMode());
 
   d->file->seek(first + xingHeaderOffset);
   d->xingHeader = new XingHeader(d->file->readBlock(16));
diff --git a/taglib/mpeg/xingheader.cpp b/taglib/mpeg/xingheader.cpp
index 1ba932de..b34082a5 100644
--- a/taglib/mpeg/xingheader.cpp
+++ b/taglib/mpeg/xingheader.cpp
@@ -71,8 +71,8 @@ TagLib::uint MPEG::XingHeader::totalSize() const
   return d->size;
 }
 
-int MPEG::XingHeader::xingHeaderOffset(TagLib::MPEG::Header::Version v,
-                                       TagLib::MPEG::Header::ChannelMode c)
+int MPEG::XingHeader::offset(TagLib::MPEG::Header::Version v,
+                             TagLib::MPEG::Header::ChannelMode c)
 {
   if(v == MPEG::Header::Version1) {
     if(c == MPEG::Header::SingleChannel)
diff --git a/taglib/mpeg/xingheader.h b/taglib/mpeg/xingheader.h
index ffe7494d..0875135e 100644
--- a/taglib/mpeg/xingheader.h
+++ b/taglib/mpeg/xingheader.h
@@ -81,9 +81,8 @@ namespace TagLib {
        * Returns the offset for the start of this Xing header, given the
        * version and channels of the frame
        */
-      // BIC: rename to offset()
-      static int xingHeaderOffset(TagLib::MPEG::Header::Version v,
-                                  TagLib::MPEG::Header::ChannelMode c);
+      static int offset(TagLib::MPEG::Header::Version v,
+                        TagLib::MPEG::Header::ChannelMode c);
 
     private:
       XingHeader(const XingHeader &);