Renameing funktions to prevent name clashes

[wxWidgets.git] / include / wx / stream.h

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 508ca1a25801a093fdff136eab821fd5cdb6cc5d..efef1ec113bfa67380b93ba8659b10ef9af0e248 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -34,93 +34,14 @@ typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);
 
 WXDLLEXPORT wxOutputStream& wxEndL(wxOutputStream& o_stream);
 
 
 WXDLLEXPORT wxOutputStream& wxEndL(wxOutputStream& o_stream);
 

-// ---------------------------------------------------------------------------
-// Stream buffer
-// ---------------------------------------------------------------------------
-
-class WXDLLEXPORT wxStreamBuffer {
- public:
-  typedef enum {
-    read = 0, write, read_write
-  } BufMode;
-
-  // -----------
-  // ctor & dtor
-  // -----------
-  wxStreamBuffer(wxStreamBase& stream, BufMode mode);
-  wxStreamBuffer(BufMode mode);
-  wxStreamBuffer(const wxStreamBuffer& buf);
-  ~wxStreamBuffer();
-
-  // -----------
-  // Filtered IO
-  // -----------
-  size_t Read(void *buffer, size_t size);
-  size_t Read(wxStreamBuffer *buf);
-  size_t Write(const void *buffer, size_t size);
-  size_t Write(wxStreamBuffer *buf);
-
-  size_t WriteBack(const char *buffer, size_t size);
-  bool WriteBack(char c);
-  char GetChar();
-  void PutChar(char c);
-  off_t Tell() const;
-  off_t Seek(off_t pos, wxSeekMode mode);
-
-  // --------------
-  // Buffer control
-  // --------------
-  void ResetBuffer();
-  void SetBufferIO(char *buffer_start, char *buffer_end);
-  void SetBufferIO(size_t bufsize);
-  char *GetBufferStart() const { return m_buffer_start; }
-  char *GetBufferEnd() const { return m_buffer_end; }
-  char *GetBufferPos() const { return m_buffer_pos; }
-  off_t GetIntPosition() const { return m_buffer_pos-m_buffer_start; }
-  void SetIntPosition(off_t pos) { m_buffer_pos = m_buffer_start+pos; }
-  size_t GetLastAccess() const { return m_buffer_end-m_buffer_start; }
-
-  void Fixed(bool fixed) { m_fixed = fixed; }
-  void Flushable(bool f) { m_flushable = f; }
-
-  bool FlushBuffer();
-  bool FillBuffer();
-  size_t GetDataLeft();
-
-  // --------------
-  // Administration
-  // --------------
-  wxStreamBase *Stream() { return m_stream; }
-
- protected:
-  char *AllocSpaceWBack(size_t needed_size);
-  size_t GetWBack(char *buf, size_t bsize);
-
-  void GetFromBuffer(void *buffer, size_t size);
-  void PutToBuffer(const void *buffer, size_t size);
-
- protected:
-  char *m_buffer_start, *m_buffer_end, *m_buffer_pos;
-  size_t m_buffer_size;
-
-  char *m_wback;
-  size_t m_wbacksize, m_wbackcur;
-
-  bool m_fixed, m_flushable;
-
-  wxStreamBase *m_stream;
-  BufMode m_mode;
-  bool m_destroybuf, m_destroystream;
-};
-

 // ---------------------------------------------------------------------------
 // wxStream: base classes
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // wxStream: base classes
 // ---------------------------------------------------------------------------
 

-#define wxStream_NOERROR    wxSTR_NOERROR
-#define wxStream_EOF        wxSTR_EOF
-#define wxStream_WRITE_ERR  wxSTR_WRITE_ERROR
-#define wxStream_READ_ERR   wxSTR_READ_ERROR
+#define wxStream_NOERROR    wxSTREAM_NOERROR
+#define wxStream_EOF        wxSTREAM_EOF
+#define wxStream_WRITE_ERR  wxSTREAM_WRITE_ERROR
+#define wxStream_READ_ERR   wxSTREAM_READ_ERROR

   
 typedef enum {
   wxStream_NOERROR = 0,
   
 typedef enum {
   wxStream_NOERROR = 0,


@@ -134,11 +55,12 @@ class WXDLLEXPORT wxStreamBase {
   wxStreamBase();
   virtual ~wxStreamBase();
 
   wxStreamBase();
   virtual ~wxStreamBase();
 

+  bool operator!() const { return (LastError() != wxSTREAM_NOERROR); }

   wxStreamError LastError() const { return m_lasterror; }
   wxStreamError LastError() const { return m_lasterror; }

-  virtual size_t StreamSize() const { return ~((size_t)0); }
+  virtual size_t GetSize() const { return ~((size_t)0); }
+  size_t StreamSize() const { return GetSize(); }

 
  protected:
 
  protected:

-  friend class wxStreamBuffer;

 
   virtual size_t OnSysRead(void *buffer, size_t bufsize);
   virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
 
   virtual size_t OnSysRead(void *buffer, size_t bufsize);
   virtual size_t OnSysWrite(const void *buffer, size_t bufsize);


@@ -146,6 +68,8 @@ class WXDLLEXPORT wxStreamBase {
   virtual off_t OnSysTell() const;
 
  protected:
   virtual off_t OnSysTell() const;
 
  protected:

+  friend class wxStreamBuffer;
+

   size_t m_lastcount;
   wxStreamError m_lasterror;
 };
   size_t m_lastcount;
   wxStreamError m_lasterror;
 };


@@ -153,7 +77,6 @@ class WXDLLEXPORT wxStreamBase {
 class WXDLLEXPORT wxInputStream: public wxStreamBase {
  public:
   wxInputStream();
 class WXDLLEXPORT wxInputStream: public wxStreamBase {
  public:
   wxInputStream();

-  wxInputStream(wxStreamBuffer *sbuf);

   virtual ~wxInputStream();
 
   // IO functions
   virtual ~wxInputStream();
 
   // IO functions


@@ -161,80 +84,80 @@ class WXDLLEXPORT wxInputStream: public wxStreamBase {
   char GetC();
   virtual wxInputStream& Read(void *buffer, size_t size);
   wxInputStream& Read(wxOutputStream& stream_out);
   char GetC();
   virtual wxInputStream& Read(void *buffer, size_t size);
   wxInputStream& Read(wxOutputStream& stream_out);

-  wxString ReadLine();

 
   // Position functions
 
   // Position functions

-  off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
-  off_t TellI() const;
+  virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
+  virtual off_t TellI() const;

 
   // State functions
 
   // State functions

-  wxStreamBuffer *InputStreamBuffer() { return m_i_streambuf; }
-  size_t LastRead() { return wxStreamBase::m_lastcount; }
+  virtual size_t LastRead() { return wxStreamBase::m_lastcount; }
+
+  // Ungetch
+  size_t Ungetch(const void *buffer, size_t size);
+  bool Ungetch(char c);

 
   // Operators
   wxInputStream& operator>>(wxOutputStream& out) { return Read(out); }
 
   // Operators
   wxInputStream& operator>>(wxOutputStream& out) { return Read(out); }

-  wxInputStream& operator>>(wxString& line);
-  wxInputStream& operator>>(char& c);
-  wxInputStream& operator>>(signed short& i);
-  wxInputStream& operator>>(signed int& i);
-  wxInputStream& operator>>(signed long& i);
-  wxInputStream& operator>>(unsigned char& c);
-  wxInputStream& operator>>(unsigned short& i);
-  wxInputStream& operator>>(unsigned int& i);
-  wxInputStream& operator>>(unsigned long& i);
-  wxInputStream& operator>>(double& i);
-  wxInputStream& operator>>(float& f) { double d; operator>>((double&)d); f = (float)d; return *this; }

 #if wxUSE_SERIAL
   wxInputStream& operator>>(wxObject *& obj);
 #endif
   wxInputStream& operator>>( __wxInputManip func) { return func(*this); }
 
  protected:
 #if wxUSE_SERIAL
   wxInputStream& operator>>(wxObject *& obj);
 #endif
   wxInputStream& operator>>( __wxInputManip func) { return func(*this); }
 
  protected:

-  bool m_i_destroybuf;
-  wxStreamBuffer *m_i_streambuf;
+  // Ungetch managers
+  char *m_wback;
+  size_t m_wbacksize;
+  size_t m_wbackcur;
+
+  char *AllocSpaceWBack(size_t needed_size);
+  size_t GetWBack(char *buf, size_t bsize);
+

 };
 
 class WXDLLEXPORT wxOutputStream: public wxStreamBase {
  public:
   wxOutputStream();
 };
 
 class WXDLLEXPORT wxOutputStream: public wxStreamBase {
  public:
   wxOutputStream();

-  wxOutputStream(wxStreamBuffer *sbuf);

   virtual ~wxOutputStream();
 
   virtual wxOutputStream& Write(const void *buffer, size_t size);
   wxOutputStream& Write(wxInputStream& stream_in);
   virtual ~wxOutputStream();
 
   virtual wxOutputStream& Write(const void *buffer, size_t size);
   wxOutputStream& Write(wxInputStream& stream_in);

-  void WriteLine(const wxString& line);

 
 

-  off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
-  off_t TellO() const;
+  virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
+  virtual off_t TellO() const;

 
 

-  size_t LastWrite() const { return wxStreamBase::m_lastcount; }
-  wxStreamBuffer *OutputStreamBuffer() { return m_o_streambuf; }
+  virtual size_t LastWrite() const { return wxStreamBase::m_lastcount; }

 
 

-  void Sync();
+  virtual void Sync();

 
   wxOutputStream& operator<<(wxInputStream& out) { return Write(out); }
 
   wxOutputStream& operator<<(wxInputStream& out) { return Write(out); }

-  wxOutputStream& operator<<(const char *string);
-  wxOutputStream& operator<<(wxString& string);
-  wxOutputStream& operator<<(char c);
-  wxOutputStream& operator<<(signed short i);
-  wxOutputStream& operator<<(signed int i);
-  wxOutputStream& operator<<(signed long i);
-  wxOutputStream& operator<<(unsigned char c);
-  wxOutputStream& operator<<(unsigned short i);
-  wxOutputStream& operator<<(unsigned int i);
-  wxOutputStream& operator<<(unsigned long i);
-  wxOutputStream& operator<<(double f);
-  wxOutputStream& operator<<(float f) { return operator<<((double)f); }

 #if wxUSE_SERIAL
   wxOutputStream& operator<<(wxObject& obj);
 #endif
   wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); }
 #if wxUSE_SERIAL
   wxOutputStream& operator<<(wxObject& obj);
 #endif
   wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); }

+};
+
+// ---------------------------------------------------------------------------
+// A stream for measuring streamed output
+// ---------------------------------------------------------------------------
+
+class wxCountingOutputStream: public wxOutputStream {
+ public:
+  wxCountingOutputStream();
+
+  size_t GetSize() const;
+  bool Ok() const { return TRUE; }

 
  protected:
 
  protected:

-  bool m_o_destroybuf;
-  wxStreamBuffer *m_o_streambuf;
+
+  size_t OnSysWrite(const void *buffer, size_t size);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
+
+ protected:
+  size_t m_currentPos;

 };
 
 };
 

+

 // ---------------------------------------------------------------------------
 // "Filter" streams
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // "Filter" streams
 // ---------------------------------------------------------------------------


@@ -247,8 +170,7 @@ class WXDLLEXPORT wxFilterInputStream: public wxInputStream {
 
   char Peek() { return m_parent_i_stream->Peek(); }
 
 
   char Peek() { return m_parent_i_stream->Peek(); }
 

-  wxStreamError LastError() const { return m_parent_i_stream->LastError(); }
-  size_t StreamSize() const { return m_parent_i_stream->StreamSize(); }
+  size_t GetSize() const { return m_parent_i_stream->GetSize(); }

 
  protected:
   wxInputStream *m_parent_i_stream;
 
  protected:
   wxInputStream *m_parent_i_stream;


@@ -260,13 +182,138 @@ class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream {
   wxFilterOutputStream(wxOutputStream& stream);
   ~wxFilterOutputStream();
 
   wxFilterOutputStream(wxOutputStream& stream);
   ~wxFilterOutputStream();
 

-  wxStreamError LastError() const { return m_parent_o_stream->LastError(); }
-  size_t StreamSize() const { return m_parent_o_stream->StreamSize(); }
+  size_t GetSize() const { return m_parent_o_stream->GetSize(); }

 
  protected:
   wxOutputStream *m_parent_o_stream;
 };
 
 
  protected:
   wxOutputStream *m_parent_o_stream;
 };
 

+// ---------------------------------------------------------------------------
+// Stream buffer
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxStreamBuffer {
+ public:
+  typedef enum {
+    read = 0, write, read_write
+  } BufMode;
+
+  // -----------
+  // ctor & dtor
+  // -----------
+  wxStreamBuffer(wxStreamBase& stream, BufMode mode);
+  wxStreamBuffer(BufMode mode);
+  wxStreamBuffer(const wxStreamBuffer& buf);
+  ~wxStreamBuffer();
+
+  // -----------
+  // Filtered IO
+  // -----------
+  size_t Read(void *buffer, size_t size);
+  size_t Read(wxStreamBuffer *buf);
+  size_t Write(const void *buffer, size_t size);
+  size_t Write(wxStreamBuffer *buf);
+
+  char Peek();
+  char GetChar();
+  void PutChar(char c);
+  off_t Tell() const;
+  off_t Seek(off_t pos, wxSeekMode mode);
+
+  // --------------
+  // Buffer control
+  // --------------
+  void ResetBuffer();
+  void SetBufferIO(char *buffer_start, char *buffer_end);
+  void SetBufferIO(size_t bufsize);
+  char *GetBufferStart() const { return m_buffer_start; }
+  char *GetBufferEnd() const { return m_buffer_end; }
+  char *GetBufferPos() const { return m_buffer_pos; }
+  off_t GetIntPosition() const { return m_buffer_pos-m_buffer_start; }
+  void SetIntPosition(off_t pos) { m_buffer_pos = m_buffer_start+pos; }
+  size_t GetLastAccess() const { return m_buffer_end-m_buffer_start; }
+
+  void Fixed(bool fixed) { m_fixed = fixed; }
+  void Flushable(bool f) { m_flushable = f; }
+
+  bool FlushBuffer();
+  bool FillBuffer();
+  size_t GetDataLeft();
+
+  // --------------
+  // Administration
+  // --------------
+  wxStreamBase *Stream() { return m_stream; }
+
+ protected:
+  void GetFromBuffer(void *buffer, size_t size);
+  void PutToBuffer(const void *buffer, size_t size);
+
+ protected:
+  char *m_buffer_start, *m_buffer_end, *m_buffer_pos;
+  size_t m_buffer_size;
+
+  char *m_wback;
+  size_t m_wbacksize, m_wbackcur;
+
+  bool m_fixed, m_flushable;
+
+  wxStreamBase *m_stream;
+  BufMode m_mode;
+  bool m_destroybuf, m_destroystream;
+};
+
+// ---------------------------------------------------------------------------
+// wxBufferedStreams
+// ---------------------------------------------------------------------------
+
+class wxBufferedInputStream: public wxFilterInputStream {
+ public:
+  wxBufferedInputStream(wxInputStream& stream);
+  ~wxBufferedInputStream();
+
+  char Peek();
+  wxInputStream& Read(void *buffer, size_t size);
+  
+  // Position functions
+  off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
+  off_t TellI() const;
+
+  wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
+
+ protected:
+  size_t OnSysRead(void *buffer, size_t bufsize);
+  off_t OnSysSeek(off_t seek, wxSeekMode mode);
+  off_t OnSysTell() const;  
+
+ protected:
+  wxStreamBuffer *m_i_streambuf;
+};
+
+class wxBufferedOutputStream: public wxFilterOutputStream {
+ public:
+  wxBufferedOutputStream(wxOutputStream& stream);
+  ~wxBufferedOutputStream();
+
+  wxOutputStream& Write(const void *buffer, size_t size);
+  
+  // Position functions
+  off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
+  off_t TellO() const;
+
+  void Sync();
+
+  wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+
+ protected:
+  size_t OnSysWrite(const void *buffer, size_t bufsize);
+  off_t OnSysSeek(off_t seek, wxSeekMode mode);
+  off_t OnSysTell() const;  
+
+ protected:
+  wxStreamBuffer *m_o_streambuf;
+};
+

 #endif
   // wxUSE_STREAMS
 
 #endif
   // wxUSE_STREAMS