From c6f323357ff9de3cb562eec1e843e38dbcfc029c Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Mon, 10 Jun 2013 12:49:02 +0900
Subject: [PATCH] Fixed some MSVC specific warnings

---
 taglib/toolkit/tiostream.cpp | 60 +++++++++++++++++++++++++++++-------
 taglib/toolkit/tiostream.h   | 16 +++++++---
 2 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/taglib/toolkit/tiostream.cpp b/taglib/toolkit/tiostream.cpp
index d3cdbe1b..9f6f97ed 100644
--- a/taglib/toolkit/tiostream.cpp
+++ b/taglib/toolkit/tiostream.cpp
@@ -31,6 +31,7 @@ using namespace TagLib;
 
 # include "tstring.h"
 # include "tdebug.h"
+# include "tsmartptr.h"
 # include <windows.h>
 
 namespace 
@@ -67,36 +68,73 @@ namespace
 
     return str;
   }
+
+  struct FileNameData
+  {
+    std::wstring wname;
+    std::string  name;
+  };
 }
 
-// If WinNT, stores a Unicode string into m_wname directly.
-// If Win9x, converts and stores it into m_name to avoid calling Unicode version functions.
-
-FileName::FileName(const wchar_t *name) 
-  : m_wname(SystemSupportsUnicode ? name : L"")
-  , m_name (SystemSupportsUnicode ? "" : unicodeToAnsi(name))
+class FileName::FileNamePrivate
 {
+public:
+  FileNamePrivate() 
+    : data(new FileNameData()) 
+  {
+  }
+
+  SHARED_PTR<FileNameData> data;
+};
+
+FileName::FileName()
+  : d(new FileNamePrivate())
+{
+}
+
+FileName::FileName(const wchar_t *name)
+  : d(new FileNamePrivate())
+{
+  // If WinNT, stores a Unicode string into wname directly.
+  // If Win9x, converts and stores it into name to avoid calling Unicode version functions.
+
+  if(SystemSupportsUnicode)
+    d->data->wname = name;
+  else
+    d->data->name = unicodeToAnsi(name);
 }
 
 FileName::FileName(const char *name) 
-  : m_name(name) 
+  : d(new FileNamePrivate())
 {
+  d->data->name = name;
 }
 
 FileName::FileName(const FileName &name) 
-  : m_wname(name.m_wname)
-  , m_name (name.m_name) 
+  : d(new FileNamePrivate())
 {
+  *d = *name.d;
+}
+
+FileName::~FileName()
+{
+  delete d;
+}
+
+FileName &FileName::operator=(const FileName &name)
+{
+  *d = *name.d;
+  return *this;
 }
 
 const std::wstring &FileName::wstr() const 
 { 
-  return m_wname; 
+  return d->data->wname; 
 }
 
 const std::string &FileName::str() const 
 { 
-  return m_name; 
+  return d->data->name;
 }  
 
 #endif  // _WIN32
diff --git a/taglib/toolkit/tiostream.h b/taglib/toolkit/tiostream.h
index 3c9de381..c3eed4b3 100644
--- a/taglib/toolkit/tiostream.h
+++ b/taglib/toolkit/tiostream.h
@@ -36,23 +36,31 @@
 namespace TagLib {
 
 #ifdef _WIN32
+
   class TAGLIB_EXPORT FileName
   {
   public:
+    FileName();
     FileName(const wchar_t *name);
     FileName(const char *name);
-
     FileName(const FileName &name);
 
+    ~FileName();
+
+    FileName &operator=(const FileName &name);
+
     const std::wstring &wstr() const;
     const std::string  &str() const; 
-
+    
   private:
-    const std::string  m_name;
-    const std::wstring m_wname;
+    class FileNamePrivate;
+    FileNamePrivate *d;
   };
+
 #else
+
   typedef const char *FileName;
+
 #endif
 
   //! An abstract class that provides operations on a sequence of bytes