Revert "Fixed some MSVC specific warnings"

This reverts commit 93f304a91d83ca3f58dfcdc47aecd183ee128813.

diff --git a/taglib/toolkit/tiostream.cpp b/taglib/toolkit/tiostream.cpp
index 3069bb53c8dc04c51fd5dfbb19215aeeaf05d7e8..df540ca8343c3ca57ec308aeb88d370d16f8dd24 100644 (file)
--- a/taglib/toolkit/tiostream.cpp
+++ b/taglib/toolkit/tiostream.cpp
@@ -69,73 +69,58 @@ namespace
   }
 }
 
-class FileName::FileNamePrivate
-{
-public:
-  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) 
-  : d(new FileNamePrivate())
+  : m_wname(SystemSupportsUnicode ? name : L"")
+  , m_name (SystemSupportsUnicode ? "" : unicodeToAnsi(name))
 {
-  // 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) 
-  : d(new FileNamePrivate())
+  : m_name(name) 
 {
-  d->name = name;
 }
 
 FileName::FileName(const FileName &name) 
-  : d(new FileNamePrivate(*name.d))
-{
-}
-
-FileName &FileName::operator==(const FileName &name)
+  : m_wname(name.m_wname)
+  , m_name (name.m_name) 
 {
-  *d = *name.d;
-  return *this;
 }
 
 FileName::operator const wchar_t *() const 
 { 
-  return d->wname.c_str(); 
+  return m_wname.c_str(); 
 }
 
 FileName::operator const char *() const 
 { 
-  return d->name.c_str(); 
+  return m_name.c_str(); 
 }
 
 const std::wstring &FileName::wstr() const 
 { 
-  return d->wname; 
+  return m_wname; 
 }
 
 const std::string &FileName::str() const 
 { 
-  return d->name; 
+  return m_name; 
 }  
 
 String FileName::toString() const
 {
-  if(!d->wname.empty()) {
-    return String(d->wname);
+  if(!m_wname.empty()) {
+    return String(m_wname);
   } 
-  else if(!d->name.empty()) {
-    const int len = MultiByteToWideChar(CP_ACP, 0, d->name.c_str(), -1, NULL, 0);
+  else if(!m_name.empty()) {
+    const int len = MultiByteToWideChar(CP_ACP, 0, m_name.c_str(), -1, NULL, 0);
     if(len == 0)
       return String::null;
 
     std::vector<wchar_t> buf(len);
-    MultiByteToWideChar(CP_ACP, 0, d->name.c_str(), -1, &buf[0], len);
+    MultiByteToWideChar(CP_ACP, 0, m_name.c_str(), -1, &buf[0], len);
 
     return String(&buf[0]);
   }

diff --git a/taglib/toolkit/tiostream.h b/taglib/toolkit/tiostream.h
index 22147f8a643c1999255ea0a5b1cd8500ba67c4a0..86826964499d395cd3dc1674064feb7a6b577608 100644 (file)
--- a/taglib/toolkit/tiostream.h
+++ b/taglib/toolkit/tiostream.h
@@ -40,7 +40,6 @@ namespace TagLib {
     FileName(const char *name);
 
     FileName(const FileName &name);
-    FileName &operator==(const FileName &name);
 
     operator const wchar_t *() const;
     operator const char *() const;
@@ -51,14 +50,11 @@ namespace TagLib {
     String toString() const;
 
   private:
-    class FileNamePrivate;
-    FileNamePrivate *d;
+    const std::string  m_name;
+    const std::wstring m_wname;
   };
-
 #else
-
   typedef const char *FileName;
-
 #endif
 
   //! An abstract class that provides operations on a sequence of bytes