From e93696f573b877c9ac9dca09ee6abd0f2bb07851 Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Fri, 22 Mar 2013 01:41:32 +0900
Subject: [PATCH] Make String:null and ByteVector::null const.

---
 taglib/toolkit/tbytevector.cpp | 2 +-
 taglib/toolkit/tbytevector.h   | 3 ++-
 taglib/toolkit/tstring.cpp     | 2 +-
 taglib/toolkit/tstring.h       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index b982609f..313e2a90 100644
--- a/taglib/toolkit/tbytevector.cpp
+++ b/taglib/toolkit/tbytevector.cpp
@@ -320,7 +320,7 @@ public:
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-ByteVector ByteVector::null;
+const ByteVector ByteVector::null;
 
 ByteVector ByteVector::fromCString(const char *s, uint length)
 {
diff --git a/taglib/toolkit/tbytevector.h b/taglib/toolkit/tbytevector.h
index 039b47ed..fc4b6039 100644
--- a/taglib/toolkit/tbytevector.h
+++ b/taglib/toolkit/tbytevector.h
@@ -424,7 +424,8 @@ namespace TagLib {
      * A static, empty ByteVector which is convenient and fast (since returning
      * an empty or "null" value does not require instantiating a new ByteVector).
      */
-    static ByteVector null;
+    static const ByteVector null;
+
 
     /*!
      * Returns a hex-encoded copy of the byte vector.
diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index d6256a7b..fc6b101a 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -124,7 +124,7 @@ public:
   std::string cstring;
 };
 
-String String::null;
+const String String::null;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
index 13234f7f..43f2643c 100644
--- a/taglib/toolkit/tstring.h
+++ b/taglib/toolkit/tstring.h
@@ -474,7 +474,7 @@ namespace TagLib {
     /*!
      * A null string provided for convenience.
      */
-    static String null;
+    static const String null;
 
   protected:
     /*!