speed optimizations: some functions now use wxString::Alloc, wxTextFile::Read

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 15a5ef78a8e74e92e6573546149534cb1364cd6b..f5fdaa1bd42cbeed45f41f1c33971dc190598680 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -44,9 +44,6 @@ unsigned long wxDataInputStream::Read32()
 {
   char buf[4];
 
 {
   char buf[4];
 

-  if (!m_parent_i_stream)
-    return 0;
-

   Read(buf, 4);
 
   return (unsigned long)buf[0] |
   Read(buf, 4);
 
   return (unsigned long)buf[0] |


@@ -59,9 +56,6 @@ unsigned short wxDataInputStream::Read16()
 {
   char buf[2];
 
 {
   char buf[2];
 

-  if (!m_parent_i_stream)
-    return 0;
-

   Read(buf, 2);
 
   return (unsigned short)buf[0] |
   Read(buf, 2);
 
   return (unsigned short)buf[0] |


@@ -72,9 +66,6 @@ unsigned char wxDataInputStream::Read8()
 {
   char buf;
 
 {
   char buf;
 

-  if (!m_parent_i_stream)
-    return 0;
-

   Read(&buf, 1);
   return (unsigned char)buf;
 }
   Read(&buf, 1);
   return (unsigned char)buf;
 }


@@ -87,9 +78,6 @@ double wxDataInputStream::ReadDouble()
 #if USE_APPLE_IEEE
   char buf[10];
 
 #if USE_APPLE_IEEE
   char buf[10];
 

-  if (!m_parent_i_stream)
-    return 0.0;
-

   Read(buf, 10);
   return ConvertFromIeeeExtended((unsigned char *)buf);
 #else
   Read(buf, 10);
   return ConvertFromIeeeExtended((unsigned char *)buf);
 #else


@@ -101,9 +89,6 @@ wxString wxDataInputStream::ReadLine()
 {
   char i_strg[255];
 
 {
   char i_strg[255];
 

-  if (!m_parent_i_stream)
-    return "";
-

   // TODO: Implement ReadLine
   return i_strg;
 }
   // TODO: Implement ReadLine
   return i_strg;
 }


@@ -114,9 +99,6 @@ wxString wxDataInputStream::ReadString()
   char *string;
   unsigned long len;
 
   char *string;
   unsigned long len;
 

-  if (!m_parent_i_stream)
-    return "";
-

   len = Read32();
   string = new char[len+1];
 
   len = Read32();
   string = new char[len+1];
 


@@ -134,13 +116,14 @@ wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
 {
 }
 
 {
 }
 

+wxDataOutputStream::~wxDataOutputStream()
+{
+}
+

 void wxDataOutputStream::Write32(unsigned long i)
 {
   char buf[4];
 
 void wxDataOutputStream::Write32(unsigned long i)
 {
   char buf[4];
 

-  if (!m_parent_o_stream)
-    return;
-

   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
   buf[2] = (i >> 16) & 0xff;
   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
   buf[2] = (i >> 16) & 0xff;


@@ -152,9 +135,6 @@ void wxDataOutputStream::Write16(unsigned short i)
 {
   char buf[2];
 
 {
   char buf[2];
 

-  if (!m_parent_o_stream)
-    return;
-

   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
   Write(buf, 2);
   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
   Write(buf, 2);


@@ -162,9 +142,6 @@ void wxDataOutputStream::Write16(unsigned short i)
 
 void wxDataOutputStream::Write8(unsigned char i)
 {
 
 void wxDataOutputStream::Write8(unsigned char i)
 {

-  if (!m_parent_o_stream)
-    return;
-

   Write(&i, 1);
 }
 
   Write(&i, 1);
 }
 


@@ -176,17 +153,11 @@ void wxDataOutputStream::WriteLine(const wxString& line)
   wxString tmp_string = line + '\n';
 #endif
 
   wxString tmp_string = line + '\n';
 #endif
 

-  if (!m_parent_o_stream)
-    return;
-

   Write((const char *) tmp_string, tmp_string.Length());
 }
 
 void wxDataOutputStream::WriteString(const wxString& string)
 {
   Write((const char *) tmp_string, tmp_string.Length());
 }
 
 void wxDataOutputStream::WriteString(const wxString& string)
 {

-  if (!m_parent_o_stream)
-    return;
-

   Write32(string.Length());
   Write((const char *) string, string.Length());
 }
   Write32(string.Length());
   Write((const char *) string, string.Length());
 }


@@ -198,9 +169,6 @@ void wxDataOutputStream::WriteDouble(double d)
 {
   char buf[10];
 
 {
   char buf[10];
 

-  if (!m_parent_o_stream)
-    return;
-

 #if USE_APPLE_IEEE
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
 #if USE_APPLE_IEEE
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else