X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ccbb61aba5a0bbd93ba036ba8e1194e349064f6..bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120:/src/common/variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 86da34aa78..ad725d2e13 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -6,7 +6,7 @@
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -17,16 +17,13 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_IOSTREAMH
 #   include <fstream.h>
 #else
 #   include <fstream>
-#   ifdef _MSC_VER
-        using namespace std;
-#   endif
 #endif
 
 #include "wx/stream.h"
@@ -299,10 +296,10 @@ public:
     virtual bool Read(istream& str);
     virtual bool Write(ostream& str) const;
 
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
 
     virtual wxString GetType() const { return "long"; };
 
@@ -350,7 +347,7 @@ bool wxVariantDataLong::Read(istream& str)
     return TRUE;
 }
 
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
 bool wxVariantDataLong::Write(wxOutputStream& str) const
 {
     str << m_value;
@@ -362,7 +359,7 @@ bool wxVariantDataLong::Read(wxInputStream& str)
    str >> m_value;
    return TRUE;
 }
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
 
 bool wxVariantDataLong::Read(wxString& str)
 {
@@ -390,10 +387,10 @@ public:
     virtual bool Write(ostream& str) const;
     virtual bool Write(wxString& str) const;
     virtual bool Read(istream& str);
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
     virtual wxString GetType() const { return "double"; };
 
 protected:
@@ -440,7 +437,7 @@ bool wxVariantDataReal::Read(istream& str)
     return TRUE;
 }
 
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
 bool wxVariantDataReal::Write(wxOutputStream& str) const
 {
     str << m_value;
@@ -452,7 +449,7 @@ bool wxVariantDataReal::Read(wxInputStream& str)
     str >> (float&)m_value;
     return TRUE;
 }
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
 
 bool wxVariantDataReal::Read(wxString& str)
 {
@@ -480,10 +477,10 @@ public:
     virtual bool Write(wxString& str) const;
     virtual bool Read(wxString& str);
     virtual bool Read(istream& str);
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
     virtual wxString GetType() const { return "bool"; };
 
 protected:
@@ -531,7 +528,7 @@ bool wxVariantDataBool::Read(istream& WXUNUSED(str))
     return FALSE;
 }
 
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
 bool wxVariantDataBool::Write(wxOutputStream& str) const
 {
     str << (char)m_value;
@@ -543,7 +540,7 @@ bool wxVariantDataBool::Read(wxInputStream& str)
     str >> (char&)m_value;
     return TRUE;
 }
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
 
 bool wxVariantDataBool::Read(wxString& str)
 {
@@ -571,10 +568,10 @@ public:
     virtual bool Write(ostream& str) const;
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
     virtual wxString GetType() const { return "char"; };
 
 protected:
@@ -622,7 +619,7 @@ bool wxVariantDataChar::Read(istream& WXUNUSED(str))
     return FALSE;
 }
 
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
 bool wxVariantDataChar::Write(wxOutputStream& str) const
 {
     str << m_value;
@@ -634,7 +631,7 @@ bool wxVariantDataChar::Read(wxInputStream& str)
     str >> m_value;
     return TRUE;
 }
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
 
 bool wxVariantDataChar::Read(wxString& str)
 {
@@ -671,10 +668,10 @@ public:
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
     virtual bool Read(istream& str);
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
     virtual wxString GetType() const { return "string"; };
 
 protected:
@@ -717,7 +714,7 @@ bool wxVariantDataString::Read(istream& str)
     return TRUE;
 }
 
-#if wxUSE_STREAM
+#if wxUSE_STREAMS
 bool wxVariantDataString::Write(wxOutputStream& str) const
 {
     str << (const char*) m_value;
@@ -729,7 +726,7 @@ bool wxVariantDataString::Read(wxInputStream& str)
     str >> m_value;
     return TRUE;
 }
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS
 
 bool wxVariantDataString::Read(wxString& str)
 {