Minor improvement.

[wxWidgets.git] / src / common / datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index d83f968795578e4d6d070a71fe207ef8d7ddd325..771d9c32d2cb0b637b93e83179ba3268ad745bd0 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -37,34 +37,34 @@ wxDataInputStream::~wxDataInputStream()
 {
 }
 
 {
 }
 

-unsigned long wxDataInputStream::Read32()
+wxUint32 wxDataInputStream::Read32()

 {
   char buf[4];
 
   Read(buf, 4);
 
 {
   char buf[4];
 
   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);
 
 {
   char buf[2];
 
   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;
+  Read((char *)&buf, 1);
+  return (wxUint8)buf;

 }
 
 // Must be at global scope for VC++ 5
 }
 
 // Must be at global scope for VC++ 5


@@ -82,37 +82,6 @@ double wxDataInputStream::ReadDouble()
 #endif
 }
 
 #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;
 wxString wxDataInputStream::ReadString()
 {
   wxString wx_string;


@@ -144,7 +113,7 @@ wxDataOutputStream::~wxDataOutputStream()
 {
 }
 
 {
 }
 

-void wxDataOutputStream::Write32(unsigned long i)
+void wxDataOutputStream::Write32(wxUint32 i)

 {
   char buf[4];
 
 {
   char buf[4];
 


@@ -155,7 +124,7 @@ void wxDataOutputStream::Write32(unsigned long i)
   Write(buf, 4);
 }
 
   Write(buf, 4);
 }
 

-void wxDataOutputStream::Write16(unsigned short i)
+void wxDataOutputStream::Write16(wxUint16 i)

 {
   char buf[2];
 
 {
   char buf[2];
 


@@ -164,22 +133,11 @@ void wxDataOutputStream::Write16(unsigned short i)
   Write(buf, 2);
 }
 
   Write(buf, 2);
 }
 

-void wxDataOutputStream::Write8(unsigned char i)
+void wxDataOutputStream::Write8(wxUint8 i)

 {
   Write(&i, 1);
 }
 
 {
   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));
-}
-

 void wxDataOutputStream::WriteString(const wxString& string)
 {
   Write32(string.Length());
 void wxDataOutputStream::WriteString(const wxString& string)
 {
   Write32(string.Length());