Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/wx/zstream.h
View File

@@ -39,8 +39,8 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
wxZlibInputStream(wxInputStream *stream, int flags = wxZLIB_AUTO);
virtual ~wxZlibInputStream();
char Peek() { return wxInputStream::Peek(); }
wxFileOffset GetLength() const { return wxInputStream::GetLength(); }
char Peek() wxOVERRIDE { return wxInputStream::Peek(); }
wxFileOffset GetLength() const wxOVERRIDE { return wxInputStream::GetLength(); }
static bool CanHandleGZip();
@@ -48,8 +48,8 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
bool SetDictionary(const wxMemoryBuffer &buf);
protected:
size_t OnSysRead(void *buffer, size_t size);
wxFileOffset OnSysTell() const { return m_pos; }
size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
private:
void Init(int flags);
@@ -69,9 +69,9 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
wxZlibOutputStream(wxOutputStream *stream, int level = -1, int flags = wxZLIB_ZLIB);
virtual ~wxZlibOutputStream() { Close(); }
void Sync() { DoFlush(false); }
bool Close();
wxFileOffset GetLength() const { return m_pos; }
void Sync() wxOVERRIDE { DoFlush(false); }
bool Close() wxOVERRIDE;
wxFileOffset GetLength() const wxOVERRIDE { return m_pos; }
static bool CanHandleGZip();
@@ -79,8 +79,8 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
bool SetDictionary(const wxMemoryBuffer &buf);
protected:
size_t OnSysWrite(const void *buffer, size_t size);
wxFileOffset OnSysTell() const { return m_pos; }
size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE;
wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
virtual void DoFlush(bool final);
@@ -101,17 +101,17 @@ class WXDLLIMPEXP_BASE wxZlibClassFactory: public wxFilterClassFactory
public:
wxZlibClassFactory();
wxFilterInputStream *NewStream(wxInputStream& stream) const
wxFilterInputStream *NewStream(wxInputStream& stream) const wxOVERRIDE
{ return new wxZlibInputStream(stream); }
wxFilterOutputStream *NewStream(wxOutputStream& stream) const
wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE
{ return new wxZlibOutputStream(stream, -1); }
wxFilterInputStream *NewStream(wxInputStream *stream) const
wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE
{ return new wxZlibInputStream(stream); }
wxFilterOutputStream *NewStream(wxOutputStream *stream) const
wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE
{ return new wxZlibOutputStream(stream, -1); }
const wxChar * const *GetProtocols(wxStreamProtocolType type
= wxSTREAM_PROTOCOL) const;
= wxSTREAM_PROTOCOL) const wxOVERRIDE;
private:
DECLARE_DYNAMIC_CLASS(wxZlibClassFactory)
@@ -122,17 +122,17 @@ class WXDLLIMPEXP_BASE wxGzipClassFactory: public wxFilterClassFactory
public:
wxGzipClassFactory();
wxFilterInputStream *NewStream(wxInputStream& stream) const
wxFilterInputStream *NewStream(wxInputStream& stream) const wxOVERRIDE
{ return new wxZlibInputStream(stream); }
wxFilterOutputStream *NewStream(wxOutputStream& stream) const
wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE
{ return new wxZlibOutputStream(stream, -1); }
wxFilterInputStream *NewStream(wxInputStream *stream) const
wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE
{ return new wxZlibInputStream(stream); }
wxFilterOutputStream *NewStream(wxOutputStream *stream) const
wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE
{ return new wxZlibOutputStream(stream, -1); }
const wxChar * const *GetProtocols(wxStreamProtocolType type
= wxSTREAM_PROTOCOL) const;
= wxSTREAM_PROTOCOL) const wxOVERRIDE;
private:
DECLARE_DYNAMIC_CLASS(wxGzipClassFactory)