X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3622daa901777a33969d8bc04e2d62dee14d164..d78b3d64143f165857922e1e695ba4164d61869f:/src/common/datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 93850acd65..a13eb8cd3a 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -17,17 +17,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
+#if wxUSE_STREAMS
 
 #include "wx/datstrm.h"
 
+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------
+
 wxDataInputStream::wxDataInputStream(wxInputStream& s)
-  : wxFilterInputStream(s)
+  : m_input(&s)
 {
 }
 
@@ -35,34 +37,34 @@ wxDataInputStream::~wxDataInputStream()
 {
 }
 
-unsigned long wxDataInputStream::Read32()
+wxUint32 wxDataInputStream::Read32()
 {
   char buf[4];
 
-  Read(buf, 4);
+  m_input->Read(buf, 4);
 
-  return (unsigned long)buf[0] |
-         ((unsigned long)buf[1] << 8) |
-         ((unsigned long)buf[2] << 16) |
-         ((unsigned long)buf[3] << 24);
+  return (wxUint32)buf[0] |
+         ((wxUint32)buf[1] << 8) |
+         ((wxUint32)buf[2] << 16) |
+         ((wxUint32)buf[3] << 24);
 }
 
-unsigned short wxDataInputStream::Read16()
+wxUint16 wxDataInputStream::Read16()
 {
   char buf[2];
 
-  Read(buf, 2);
+  m_input->Read(buf, 2);
 
-  return (unsigned short)buf[0] |
-         ((unsigned short)buf[1] << 8);
+  return (wxUint16)buf[0] |
+         ((wxUint16)buf[1] << 8);
 }
 
-unsigned char wxDataInputStream::Read8()
+wxUint8 wxDataInputStream::Read8()
 {
-  char buf;
+  wxUint8 buf;
 
-  Read(&buf, 1);
-  return (unsigned char)buf;
+  m_input->Read((char *)&buf, 1);
+  return (wxUint8)buf;
 }
 
 // Must be at global scope for VC++ 5
@@ -70,44 +72,16 @@ extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
 
 double wxDataInputStream::ReadDouble()
 {
-#if USE_APPLE_IEEE
+#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();
-    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;
@@ -117,7 +91,7 @@ wxString wxDataInputStream::ReadString()
   len = Read32();
   string = new char[len+1];
 
-  Read(string, len);
+  m_input->Read(string, len);
 
   string[len] = 0;
   wx_string = string;
@@ -125,9 +99,67 @@ wxString wxDataInputStream::ReadString()
 
   return wx_string;
 }
+  
+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;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i)
+{
+  i = Read16();
+  return *this;
+}
+
+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;
+}
+
+// ---------------------------------------------------------------------------
+// wxDataOutputStream
+// ---------------------------------------------------------------------------
 
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
- : wxFilterOutputStream(s)
+  : m_output(&s)
 {
 }
 
@@ -135,7 +167,7 @@ wxDataOutputStream::~wxDataOutputStream()
 {
 }
 
-void wxDataOutputStream::Write32(unsigned long i)
+void wxDataOutputStream::Write32(wxUint32 i)
 {
   char buf[4];
 
@@ -143,38 +175,27 @@ void wxDataOutputStream::Write32(unsigned long i)
   buf[1] = (i >> 8) & 0xff;
   buf[2] = (i >> 16) & 0xff;
   buf[3] = (i >> 24) & 0xff;
-  Write(buf, 4);
+  m_output->Write(buf, 4);
 }
 
-void wxDataOutputStream::Write16(unsigned short i)
+void wxDataOutputStream::Write16(wxUint16 i)
 {
   char buf[2];
 
   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
-  Write(buf, 2);
+  m_output->Write(buf, 2);
 }
 
-void wxDataOutputStream::Write8(unsigned char i)
+void wxDataOutputStream::Write8(wxUint8 i)
 {
-  Write(&i, 1);
-}
-
-void wxDataOutputStream::WriteLine(const wxString& line)
-{
-#ifdef __WXMSW__
-  wxString tmp_string = line + "\r\n";
-#else
-  wxString tmp_string = line + '\n';
-#endif
-
-  Write((const char *) tmp_string, tmp_string.Length());
+  m_output->Write(&i, 1);
 }
 
 void wxDataOutputStream::WriteString(const wxString& string)
 {
   Write32(string.Length());
-  Write((const char *) string, string.Length());
+  m_output->Write((const wxChar *) string, string.Length()*sizeof(wxChar));
 }
 
 // Must be at global scope for VC++ 5
@@ -184,11 +205,76 @@ void wxDataOutputStream::WriteDouble(double d)
 {
   char buf[10];
 
-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
-#  pragma warning "wxDataStream::WriteDouble() not using IeeeExtended - will not work!"
+#  pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
  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
+