Fixed some MSVC specific warnings

diff --git a/taglib/toolkit/tiostream.cpp b/taglib/toolkit/tiostream.cpp
index 2832e414b00c4baa320dd7c36143820c5a4efa92..ee4e4a610fe16fa0e0b65c50ba3e142083e2df30 100644 (file)
--- a/taglib/toolkit/tiostream.cpp
+++ b/taglib/toolkit/tiostream.cpp
@@ -69,44 +69,59 @@ namespace
   }
 }
 
-// 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.
+class FileName::FileNamePrivate
+{
+public:
+  std::wstring wname;
+  std::string  name;
+};
 
 FileName::FileName(const wchar_t *name) 
-  : m_wname(SystemSupportsUnicode ? name : L"")
-  , m_name (SystemSupportsUnicode ? "" : unicodeToAnsi(name))
+  : d(new FileNamePrivate())
 {
+  // If Windows NT, stores a Unicode string directly.
+  // If Windows 9x, stores it converting into an ANSI string.
+  if(SystemSupportsUnicode)
+    d->wname = name;
+  else
+    d->name = unicodeToAnsi(name);
 }
 
 FileName::FileName(const char *name) 
-  : m_name(name) 
+  : d(new FileNamePrivate())
 {
+  d->name = name;
 }
 
 FileName::FileName(const FileName &name) 
-  : m_wname(name.m_wname)
-  , m_name (name.m_name) 
+  : d(new FileNamePrivate(*name.d))
+{
+}
+
+FileName &FileName::operator==(const FileName &name)
 {
+  *d = *name.d;
+  return *this;
 }
 
 FileName::operator const wchar_t *() const 
 { 
-  return m_wname.c_str(); 
+  return d->wname.c_str(); 
 }
 
 FileName::operator const char *() const 
 { 
-  return m_name.c_str(); 
+  return d->name.c_str(); 
 }
 
 const std::wstring &FileName::wstr() const 
 { 
-  return m_wname; 
+  return d->wname; 
 }
 
 const std::string &FileName::str() const 
 { 
-  return m_name; 
+  return d->name; 
 }  
 
 #endif  // _WIN32

diff --git a/taglib/toolkit/tiostream.h b/taglib/toolkit/tiostream.h
index 2cb809777fda95a78bc01f484298a0009a8a4650..498b3a4522432e1e8a0ed6052e249fc7f1519081 100644 (file)
--- a/taglib/toolkit/tiostream.h
+++ b/taglib/toolkit/tiostream.h
@@ -40,6 +40,7 @@ namespace TagLib {
     FileName(const char *name);
 
     FileName(const FileName &name);
+    FileName &operator==(const FileName &name);
 
     operator const wchar_t *() const;
     operator const char *() const;
@@ -48,11 +49,14 @@ namespace TagLib {
     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