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

Add wxOVERRIDE and use it in common and wxOSX code.

Browse Source 
Make overriding virtual methods more explicit and enable additional checks
provided by C++11 compilers when "override" is used.

Closes #16100.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-20 13:26:28 +00:00
parent 34e4f66d6a
commit 33ad33d447
140 changed files with 865 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/zipstrm.cpp
View File

@@ -239,12 +239,12 @@ public:
void Open(wxFileOffset len) { Close(); m_len = len; }
void Close() { m_pos = 0; m_lasterror = wxSTREAM_NO_ERROR; }
virtual char Peek() { return wxInputStream::Peek(); }
virtual wxFileOffset GetLength() const { return m_len; }
virtual char Peek() wxOVERRIDE { return wxInputStream::Peek(); }
virtual wxFileOffset GetLength() const wxOVERRIDE { return m_len; }
protected:
virtual size_t OnSysRead(void *buffer, size_t size);
virtual wxFileOffset OnSysTell() const { return m_pos; }
virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
private:
wxFileOffset m_pos;
@@ -284,15 +284,15 @@ public:
wxStoredOutputStream(wxOutputStream& stream) :
wxFilterOutputStream(stream), m_pos(0) { }
bool Close() {
bool Close() wxOVERRIDE {
m_pos = 0;
m_lasterror = wxSTREAM_NO_ERROR;
return true;
}
protected:
virtual size_t OnSysWrite(const void *buffer, size_t size);
virtual wxFileOffset OnSysTell() const { return m_pos; }
virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE;
virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
private:
wxFileOffset m_pos;
@@ -346,11 +346,11 @@ public:
void Open();
bool Final();
wxInputStream& Read(void *buffer, size_t size);
wxInputStream& Read(void *buffer, size_t size) wxOVERRIDE;
protected:
virtual size_t OnSysRead(void *buffer, size_t size);
virtual wxFileOffset OnSysTell() const { return m_pos; }
virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
private:
wxFileOffset m_pos;
@@ -444,8 +444,8 @@ public:
wxInputStream& GetTee() const { return *m_tee; }
protected:
virtual size_t OnSysRead(void *buffer, size_t size);
virtual wxFileOffset OnSysTell() const { return m_pos; }
virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
private:
wxFileOffset m_pos;
@@ -510,7 +510,7 @@ public:
wxZlibOutputStream(stream, level, wxZLIB_NO_HEADER) { }
bool Open(wxOutputStream& stream);
bool Close() { DoFlush(true); m_pos = wxInvalidOffset; return IsOk(); }
bool Close() wxOVERRIDE { DoFlush(true); m_pos = wxInvalidOffset; return IsOk(); }
};
bool wxZlibOutputStream2::Open(wxOutputStream& stream)