From c352425ee708412f514d383ba5744fbc429228e6 Mon Sep 17 00:00:00 2001
From: Michael Helmling <michaelhelmling@posteo.de>
Date: Sat, 30 Jul 2016 13:47:46 +0200
Subject: [PATCH] Adjust version macros to TagLib naming conventions; use
 dedicated namespace

---
 taglib/toolkit/taglib.cpp | 37 +++++++++++++++-------------
 taglib/toolkit/taglib.h   | 51 +++++++++++++++++++++------------------
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/taglib/toolkit/taglib.cpp b/taglib/toolkit/taglib.cpp
index ffae16eb..e65a6e77 100644
--- a/taglib/toolkit/taglib.cpp
+++ b/taglib/toolkit/taglib.cpp
@@ -4,31 +4,34 @@
 
 using namespace TagLib;
 
-String TagLib::GetVersionString()
+
+String TagLib::Version::string()
 {
   return String::number(TAGLIB_MAJOR_VERSION)
       + "." + String::number(TAGLIB_MINOR_VERSION)
       + "." + String::number(TAGLIB_PATCH_VERSION);
 }
 
-unsigned int TagLib::GetMajorVersion()
-{
-  return TAGLIB_MAJOR_VERSION;
-}
-
-unsigned int TagLib::GetMinorVersion()
-{
-  return TAGLIB_MINOR_VERSION;
-}
-
-unsigned int TagLib::GetPatchVersion()
-{
-  return TAGLIB_PATCH_VERSION;
-}
-
-unsigned int TagLib::GetVersion()
+unsigned int TagLib::Version::combined()
 {
   return (TAGLIB_MAJOR_VERSION << 16)
           || (TAGLIB_MINOR_VERSION << 8)
           || (TAGLIB_PATCH_VERSION << 4);
 }
+
+
+unsigned int (TagLib::Version::major)()
+{
+  return TAGLIB_MAJOR_VERSION;
+}
+
+unsigned int (TagLib::Version::minor)()
+{
+  return TAGLIB_MINOR_VERSION;
+}
+
+unsigned int TagLib::Version::patch()
+{
+  return TAGLIB_PATCH_VERSION;
+}
+
diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h
index 3a5ca016..7cc3718c 100644
--- a/taglib/toolkit/taglib.h
+++ b/taglib/toolkit/taglib.h
@@ -54,34 +54,37 @@ namespace TagLib
     BigEndian
   };
   class String;
-  /*!
-   * Returns the version as a string in the form
-   * (Major Version).(Minor Version).(Patch Version), e.g. "4.2.0".
-   */
-  String GetVersionString();
+  namespace Version
+  {
+    /*!
+     * Returns the version as a string in the form
+     * (Major Version).(Minor Version).(Patch Version), e.g. "4.2.0".
+     */
+    String string();
 
-  /*!
-   * Returns the version as an unsigned integer in the form
-   * (Major Version << 16) | (Minor Version << 8) | (Patch Version), e.g. 0x040200
-   * Use this for simple and consistent version comparison, e.g.
-   *     if (TagLib::GetVersion() <= ((1 << 16) | (11 << 8))) return false;
-   */
-  unsigned int GetVersion();
+    /*!
+     * Returns the version as an unsigned integer in the form
+     * (Major Version << 16) | (Minor Version << 8) | (Patch Version), e.g. 0x040200
+     * Use this for simple and consistent version comparison, e.g.
+     *     if (TagLib::GetVersion() <= ((1 << 16) | (11 << 8))) return false;
+     */
+    unsigned int combined();
 
-  /*!
-   * Returns the major version, e.g. 4
-   */
-  unsigned int GetMajorVersion();
+    /*!
+     * Returns the major version, e.g. 4
+     */
+    unsigned int (major)();
 
-  /*!
-   * Returns the minor version, e.g. 2
-   */
-  unsigned int GetMinorVersion();
+    /*!
+     * Returns the minor version, e.g. 2
+     */
+    unsigned int (minor)();
 
-  /*!
-   * Returns the patch version, e.g. 0
-   */
-  unsigned int GetPatchVersion();
+    /*!
+     * Returns the patch version, e.g. 0
+     */
+    unsigned int patch();
+  }
 }
 
 /*!