don't use annoying and unneeded in C++ casts of NULL to "T *"

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 7086472a219794fd56959e29d42f38e45f86e642..d6c473080ba4c73a43b8f17d72f7d6e700d4e5fa 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        zstream.h
+// Name:        wx/zstream.h

 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by: Mike Wetherell
 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by: Mike Wetherell


@@ -11,10 +11,6 @@
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
 
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "zstream.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_ZLIB && wxUSE_STREAMS
 #include "wx/defs.h"
 
 #if wxUSE_ZLIB && wxUSE_STREAMS


@@ -22,7 +18,7 @@
 #include "wx/stream.h"
 
 // Compression level
 #include "wx/stream.h"
 
 // Compression level

-enum {
+enum wxZlibCompressionLevels {

     wxZ_DEFAULT_COMPRESSION = -1,
     wxZ_NO_COMPRESSION = 0,
     wxZ_BEST_SPEED = 1,
     wxZ_DEFAULT_COMPRESSION = -1,
     wxZ_NO_COMPRESSION = 0,
     wxZ_BEST_SPEED = 1,


@@ -30,10 +26,7 @@ enum {
 };
 
 // Flags
 };
 
 // Flags

-enum {
-#if WXWIN_COMPATIBILITY_2_4
-    wxZLIB_24COMPATIBLE = 4, // read v2.4.x data without error
-#endif
+enum wxZLibFlags {

     wxZLIB_NO_HEADER = 0,    // raw deflate stream, no header or checksum
     wxZLIB_ZLIB = 1,         // zlib header and checksum
     wxZLIB_GZIP = 2,         // gzip header and checksum, requires zlib 1.2.1+
     wxZLIB_NO_HEADER = 0,    // raw deflate stream, no header or checksum
     wxZLIB_ZLIB = 1,         // zlib header and checksum
     wxZLIB_GZIP = 2,         // gzip header and checksum, requires zlib 1.2.1+


@@ -43,10 +36,11 @@ enum {
 class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
  public:
   wxZlibInputStream(wxInputStream& stream, int flags = wxZLIB_AUTO);
 class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
  public:
   wxZlibInputStream(wxInputStream& stream, int flags = wxZLIB_AUTO);

+  wxZlibInputStream(wxInputStream *stream, int flags = wxZLIB_AUTO);

   virtual ~wxZlibInputStream();
 
   char Peek() { return wxInputStream::Peek(); }
   virtual ~wxZlibInputStream();
 
   char Peek() { return wxInputStream::Peek(); }

-  size_t GetSize() const { return wxInputStream::GetSize(); }
+  wxFileOffset GetLength() const { return wxInputStream::GetLength(); }

 
   static bool CanHandleGZip();
 
 
   static bool CanHandleGZip();
 


@@ -54,14 +48,14 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
   size_t OnSysRead(void *buffer, size_t size);
   wxFileOffset OnSysTell() const { return m_pos; }
 
   size_t OnSysRead(void *buffer, size_t size);
   wxFileOffset OnSysTell() const { return m_pos; }
 

+ private:
+  void Init(int flags);
+

  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_inflate;
   wxFileOffset m_pos;
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_inflate;
   wxFileOffset m_pos;

-#if WXWIN_COMPATIBILITY_2_4
-  bool m_24compatibilty;
-#endif

 
   DECLARE_NO_COPY_CLASS(wxZlibInputStream)
 };
 
   DECLARE_NO_COPY_CLASS(wxZlibInputStream)
 };


@@ -69,10 +63,12 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
 class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
  public:
   wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB);
 class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
  public:
   wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB);

-  virtual ~wxZlibOutputStream();
+  wxZlibOutputStream(wxOutputStream *stream, int level = -1, int flags = wxZLIB_ZLIB);
+  virtual ~wxZlibOutputStream() { Close(); }

 
   void Sync() { DoFlush(false); }
 
   void Sync() { DoFlush(false); }

-  size_t GetSize() const { return (size_t)m_pos; }
+  bool Close();
+  wxFileOffset GetLength() const { return m_pos; }

 
   static bool CanHandleGZip();
 
 
   static bool CanHandleGZip();
 


@@ -82,6 +78,9 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
 
   virtual void DoFlush(bool final);
 
 
   virtual void DoFlush(bool final);
 

+ private:
+  void Init(int level, int flags);
+

  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;


@@ -91,6 +90,48 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
   DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
 };
 
   DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
 };
 

+class WXDLLIMPEXP_BASE wxZlibClassFactory: public wxFilterClassFactory
+{
+public:
+    wxZlibClassFactory();
+
+    wxFilterInputStream *NewStream(wxInputStream& stream) const
+        { return new wxZlibInputStream(stream); }
+    wxFilterOutputStream *NewStream(wxOutputStream& stream) const
+        { return new wxZlibOutputStream(stream, -1); }
+    wxFilterInputStream *NewStream(wxInputStream *stream) const
+        { return new wxZlibInputStream(stream); }
+    wxFilterOutputStream *NewStream(wxOutputStream *stream) const
+        { return new wxZlibOutputStream(stream, -1); }
+
+    const wxChar * const *GetProtocols(wxStreamProtocolType type
+                                       = wxSTREAM_PROTOCOL) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxZlibClassFactory)
+};
+
+class WXDLLIMPEXP_BASE wxGzipClassFactory: public wxFilterClassFactory
+{
+public:
+    wxGzipClassFactory();
+
+    wxFilterInputStream *NewStream(wxInputStream& stream) const
+        { return new wxZlibInputStream(stream); }
+    wxFilterOutputStream *NewStream(wxOutputStream& stream) const
+        { return new wxZlibOutputStream(stream, -1); }
+    wxFilterInputStream *NewStream(wxInputStream *stream) const
+        { return new wxZlibInputStream(stream); }
+    wxFilterOutputStream *NewStream(wxOutputStream *stream) const
+        { return new wxZlibOutputStream(stream, -1); }
+
+    const wxChar * const *GetProtocols(wxStreamProtocolType type
+                                       = wxSTREAM_PROTOCOL) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxGzipClassFactory)
+};
+

 #endif
   // wxUSE_ZLIB && wxUSE_STREAMS
 
 #endif
   // wxUSE_ZLIB && wxUSE_STREAMS