X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b8bd8182ca5ec9ed42d531b80fda479c2a2d7a1..312cd9e93d7c0bf201e52297741e8e12a7298fc9:/src/common/datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index cab308f18e..433c90472a 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux 
+// Copyright:   (c) Guilhem Lavaux
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -29,7 +29,7 @@
 // ---------------------------------------------------------------------------
 
 wxDataInputStream::wxDataInputStream(wxInputStream& s)
-  : wxFilterInputStream(s)
+  : m_input(&s), m_be_order(FALSE)
 {
 }
 
@@ -39,31 +39,33 @@ wxDataInputStream::~wxDataInputStream()
 
 wxUint32 wxDataInputStream::Read32()
 {
-  char buf[4];
+  wxUint32 i32;
 
-  Read(buf, 4);
+  m_input->Read(&i32, 4);
 
-  return (wxUint32)buf[0] |
-         ((wxUint32)buf[1] << 8) |
-         ((wxUint32)buf[2] << 16) |
-         ((wxUint32)buf[3] << 24);
+  if (m_be_order)
+    return wxUINT32_SWAP_ON_LE(i32);
+  else
+    return wxUINT32_SWAP_ON_BE(i32);
 }
 
 wxUint16 wxDataInputStream::Read16()
 {
-  char buf[2];
+  wxUint16 i16;
 
-  Read(buf, 2);
+  m_input->Read(&i16, 2);
 
-  return (wxUint16)buf[0] |
-         ((wxUint16)buf[1] << 8);
+  if (m_be_order)
+    return wxUINT16_SWAP_ON_LE(i16);
+  else
+    return wxUINT16_SWAP_ON_BE(i16);
 }
 
 wxUint8 wxDataInputStream::Read8()
 {
   wxUint8 buf;
 
-  Read((char *)&buf, 1);
+  m_input->Read(&buf, 1);
   return (wxUint8)buf;
 }
 
@@ -75,60 +77,78 @@ double wxDataInputStream::ReadDouble()
 #if wxUSE_APPLE_IEEE
   char buf[10];
 
-  Read(buf, 10);
+  m_input->Read(buf, 10);
   return ConvertFromIeeeExtended((unsigned char *)buf);
 #else
   return 0.0;
 #endif
 }
 
-wxString wxDataInputStream::ReadLine()
-{
-  char c, last_endl = 0;
-  bool end_line = FALSE;
-  wxString line;
-
-  while (!end_line) {
-    c = GetC();
-    if (LastError() != wxStream_NOERROR)
-      break;
-
-    switch (c) {
-    case '\n':
-      end_line = TRUE;
-      break;
-    case '\r':
-      last_endl = '\r';
-      break;
-    default:
-      if (last_endl == '\r') {
-        end_line = TRUE;
-        InputStreamBuffer()->WriteBack(c);
-        break;
-      }
-      line += c;
-      break;
-    } 
-  }
-  return line;
-}
-
 wxString wxDataInputStream::ReadString()
 {
-  wxString wx_string;
-  char *string;
-  unsigned long len;
+  wxString s;
+  size_t len;
 
   len = Read32();
-  string = new char[len+1];
 
-  Read(string, len);
+  m_input->Read(s.GetWriteBuf(len), len);
+  s.UngetWriteBuf();
+
+  return s;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
+{
+  s = ReadString();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c)
+{
+  c = (wxInt8)Read8();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxInt16& i)
+{
+  i = (wxInt16)Read16();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxInt32& i)
+{
+  i = (wxInt32)Read32();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint8& c)
+{
+  c = Read8();
+  return *this;
+}
 
-  string[len] = 0;
-  wx_string = string;
-  delete string;
+wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i)
+{
+  i = Read16();
+  return *this;
+}
 
-  return wx_string;
+wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
+{
+  i = Read32();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(double& i)
+{
+  i = ReadDouble();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(float& f)
+{
+  f = (float)ReadDouble();
+  return *this;
 }
 
 // ---------------------------------------------------------------------------
@@ -136,7 +156,7 @@ wxString wxDataInputStream::ReadString()
 // ---------------------------------------------------------------------------
 
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
- : wxFilterOutputStream(s)
+  : m_output(&s), m_be_order(FALSE)
 {
 }
 
@@ -146,44 +166,37 @@ wxDataOutputStream::~wxDataOutputStream()
 
 void wxDataOutputStream::Write32(wxUint32 i)
 {
-  char buf[4];
+  wxUint32 i32;
 
-  buf[0] = i & 0xff;
-  buf[1] = (i >> 8) & 0xff;
-  buf[2] = (i >> 16) & 0xff;
-  buf[3] = (i >> 24) & 0xff;
-  Write(buf, 4);
+  if (m_be_order)
+    i32 = wxUINT32_SWAP_ON_LE(i);
+  else
+    i32 = wxUINT32_SWAP_ON_BE(i);
+  m_output->Write(&i32, 4);
 }
 
 void wxDataOutputStream::Write16(wxUint16 i)
 {
-  char buf[2];
+  wxUint16 i16;
 
-  buf[0] = i & 0xff;
-  buf[1] = (i >> 8) & 0xff;
-  Write(buf, 2);
+  if (m_be_order)
+    i16 = wxUINT16_SWAP_ON_LE(i);
+  else
+    i16 = wxUINT16_SWAP_ON_BE(i);
+
+  m_output->Write(&i16, 2);
 }
 
 void wxDataOutputStream::Write8(wxUint8 i)
 {
-  Write(&i, 1);
-}
-
-void wxDataOutputStream::WriteLine(const wxString& line)
-{
-#ifdef __WXMSW__
-  wxString tmp_string = line + _T("\r\n");
-#else
-  wxString tmp_string = line + _T('\n');
-#endif
-
-  Write((const wxChar *) tmp_string, tmp_string.Length()*sizeof(wxChar));
+  m_output->Write(&i, 1);
 }
 
 void wxDataOutputStream::WriteString(const wxString& string)
 {
+  const wxWX2MBbuf buf = string.mb_str();
   Write32(string.Length());
-  Write((const wxChar *) string, string.Length()*sizeof(wxChar));
+  m_output->Write(buf, string.Len());
 }
 
 // Must be at global scope for VC++ 5
@@ -196,12 +209,75 @@ void wxDataOutputStream::WriteDouble(double d)
 #if wxUSE_APPLE_IEEE
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
-#  pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
- buf[0] = '\0';
+#ifndef __VMS__
+# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
+#endif
+   buf[0] = '\0';
 #endif
-  Write(buf, 10);
+  m_output->Write(buf, 10);
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
+{
+  Write32(wxStrlen(string));
+  m_output->Write((const char *)string, wxStrlen(string)*sizeof(wxChar));
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxString& string)
+{
+  WriteString(string);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt8 c)
+{
+  Write8((wxUint8)c);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt16 i)
+{
+  Write16((wxUint16)i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt32 i)
+{
+  Write32((wxUint32)i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint8 c)
+{
+  Write8(c);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint16 i)
+{
+  Write16(i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i)
+{
+  Write32(i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(double f)
+{
+  WriteDouble(f);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(float f)
+{
+  WriteDouble((double)f);
+  return *this;
 }
 
 #endif
   // wxUSE_STREAMS
-  
+