From 8a22c7ce7590eafcde8ec3294d2ca6fca4e024e2 Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Fri, 15 Nov 2013 16:51:48 +0900
Subject: [PATCH] Removed some redundant code from String::operator==()

---
 taglib/toolkit/tstring.cpp | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 26a16643..03c350cd 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -155,11 +155,6 @@ public:
   {
   }
 
-  StringPrivate(const std::wstring &s) 
-    : data(new std::wstring(s)) 
-  {
-  }
-
   StringPrivate(size_t n, wchar_t c) 
     : data(new std::wstring(n, c)) 
   {
@@ -651,54 +646,43 @@ String &String::operator=(const String &s)
 
 String &String::operator=(const std::string &s)
 {
-  d->data.reset(new std::wstring());
-  copyFromLatin1(s.c_str(), s.length());
-
+  *this = String(s);
   return *this;
 }
 
 String &String::operator=(const std::wstring &s)
 {
-  d->data.reset(new std::wstring(s));
+  *this = String(s);
   return *this;
 }
 
 String &String::operator=(const wchar_t *s)
 {
-  d->data.reset(new std::wstring());
-  copyFromUTF16(s, ::wcslen(s), WCharByteOrder);
-
+  *this = String(s);
   return *this;
 }
 
 String &String::operator=(char c)
 {
-  d->data.reset(new std::wstring(1, c));
+  *this = String(c);
   return *this;
 }
 
 String &String::operator=(wchar_t c)
 {
-  d->data.reset(new std::wstring(1, c));
+  *this = String(c);
   return *this;
 }
 
 String &String::operator=(const char *s)
 {
-  d->data.reset(new std::wstring());
-  copyFromLatin1(s, ::strlen(s));
-
+  *this = String(s);
   return *this;
 }
 
 String &String::operator=(const ByteVector &v)
 {
-  d->data.reset(new std::wstring());
-  copyFromLatin1(v.data(), v.size());
-
-  // If we hit a null in the ByteVector, shrink the string again.
-  d->data->resize(::wcslen(d->data->c_str()));
-
+  *this = String(v);
   return *this;
 }