applying patch, fixes #10523

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

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 70d5651070fc3e83084bc8283d456e0d4bc95969..a3af2d62468131cf2e826a52ebe2fbdb769b994e 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -28,7 +28,7 @@
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"

-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"

 #include "wx/wfstream.h"
 #include "zlib.h"
 
 #include "wx/wfstream.h"
 #include "zlib.h"
 


@@ -140,7 +140,7 @@ static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos)
 /////////////////////////////////////////////////////////////////////////////
 // Class factory
 
 /////////////////////////////////////////////////////////////////////////////
 // Class factory
 

-wxZipClassFactory g_wxZipClassFactory;
+static wxZipClassFactory g_wxZipClassFactory;

 
 wxZipClassFactory::wxZipClassFactory()
 {
 
 wxZipClassFactory::wxZipClassFactory()
 {


@@ -251,7 +251,7 @@ private:
     wxFileOffset m_pos;
     wxFileOffset m_len;
 
     wxFileOffset m_pos;
     wxFileOffset m_len;
 

-    DECLARE_NO_COPY_CLASS(wxStoredInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxStoredInputStream);

 };
 
 wxStoredInputStream::wxStoredInputStream(wxInputStream& stream)
 };
 
 wxStoredInputStream::wxStoredInputStream(wxInputStream& stream)


@@ -297,7 +297,7 @@ protected:
 
 private:
     wxFileOffset m_pos;
 
 private:
     wxFileOffset m_pos;

-    DECLARE_NO_COPY_CLASS(wxStoredOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxStoredOutputStream);

 };
 
 size_t wxStoredOutputStream::OnSysWrite(const void *buffer, size_t size)
 };
 
 size_t wxStoredOutputStream::OnSysWrite(const void *buffer, size_t size)


@@ -359,7 +359,7 @@ private:
     size_t m_start;
     size_t m_end;
 
     size_t m_start;
     size_t m_end;
 

-    DECLARE_NO_COPY_CLASS(wxTeeInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTeeInputStream);

 };
 
 wxTeeInputStream::wxTeeInputStream(wxInputStream& stream)
 };
 
 wxTeeInputStream::wxTeeInputStream(wxInputStream& stream)


@@ -455,7 +455,7 @@ private:
     enum { BUFSIZE = 8192 };
     wxCharBuffer m_dummy;
 
     enum { BUFSIZE = 8192 };
     wxCharBuffer m_dummy;
 

-    DECLARE_NO_COPY_CLASS(wxRawInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxRawInputStream);

 };
 
 wxRawInputStream::wxRawInputStream(wxInputStream& stream)
 };
 
 wxRawInputStream::wxRawInputStream(wxInputStream& stream)


@@ -1336,7 +1336,7 @@ void wxZipInputStream::Init(const wxString& file)
     Init();
     m_allowSeeking = true;
     wxFFileInputStream *ffile;
     Init();
     m_allowSeeking = true;
     wxFFileInputStream *ffile;

-    ffile = wx_static_cast(wxFFileInputStream*, m_parent_i_stream);
+    ffile = static_cast<wxFFileInputStream*>(m_parent_i_stream);

     wxZipEntryPtr_ entry;
 
     if (ffile->Ok()) {
     wxZipEntryPtr_ entry;
 
     if (ffile->Ok()) {


@@ -2051,7 +2051,7 @@ bool wxZipOutputStream::CopyEntry(wxArchiveEntry *entry,
         return false;
     }
 
         return false;
     }
 

-    return CopyEntry(zipEntry, wx_static_cast(wxZipInputStream&, stream));
+    return CopyEntry(zipEntry, static_cast<wxZipInputStream&>(stream));

 }
 
 bool wxZipOutputStream::CopyArchiveMetaData(wxZipInputStream& inputStream)
 }
 
 bool wxZipOutputStream::CopyArchiveMetaData(wxZipInputStream& inputStream)


@@ -2065,7 +2065,7 @@ bool wxZipOutputStream::CopyArchiveMetaData(wxZipInputStream& inputStream)
 
 bool wxZipOutputStream::CopyArchiveMetaData(wxArchiveInputStream& stream)
 {
 
 bool wxZipOutputStream::CopyArchiveMetaData(wxArchiveInputStream& stream)
 {

-    return CopyArchiveMetaData(wx_static_cast(wxZipInputStream&, stream));
+    return CopyArchiveMetaData(static_cast<wxZipInputStream&>(stream));

 }
 
 void wxZipOutputStream::SetLevel(int level)
 }
 
 void wxZipOutputStream::SetLevel(int level)


@@ -2318,7 +2318,7 @@ bool wxZipOutputStream::Close()
 
     m_lasterror = m_parent_o_stream->GetLastError();
     m_endrecWritten = true;
 
     m_lasterror = m_parent_o_stream->GetLastError();
     m_endrecWritten = true;

-    
+

     if (!wxFilterOutputStream::Close() || !IsOk())
         return false;
     m_lasterror = wxSTREAM_EOF;
     if (!wxFilterOutputStream::Close() || !IsOk())
         return false;
     m_lasterror = wxSTREAM_EOF;