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

Use "virtual" keyword with overridden methods.

Browse Source 
No real changes, just make the code more clear by explicitly using "virtual".

Closes #16097.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-19 18:06:29 +00:00
parent 7f48a077ab
commit 89bf39314f
3 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/wx/wfstream.h
View File

@@ -35,20 +35,20 @@ public:
wxFileInputStream(int fd);
virtual ~wxFileInputStream();
wxFileOffset GetLength() const;
virtual wxFileOffset GetLength() const;
bool Ok() const { return IsOk(); }
virtual bool IsOk() const;
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
wxFile* GetFile() const { return m_file; }
protected:
wxFileInputStream();
size_t OnSysRead(void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
virtual size_t OnSysRead(void *buffer, size_t size);
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
protected:
wxFile *m_file;
@@ -67,20 +67,20 @@ public:
void Sync();
bool Close() { return m_file_destroy ? m_file->Close() : true; }
wxFileOffset GetLength() const;
virtual wxFileOffset GetLength() const;
bool Ok() const { return IsOk(); }
virtual bool IsOk() const;
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
wxFile* GetFile() const { return m_file; }
protected:
wxFileOutputStream();
size_t OnSysWrite(const void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
virtual size_t OnSysWrite(const void *buffer, size_t size);
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
protected:
wxFile *m_file;
@@ -99,14 +99,14 @@ public:
WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); }
WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); }
wxFileOffset GetLength() const { return m_file->Length(); }
bool IsSeekable() const { return true; }
virtual wxFileOffset GetLength() const { return m_file->Length(); }
virtual bool IsSeekable() const { return true; }
protected:
size_t OnSysWrite(const void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode)
virtual size_t OnSysWrite(const void *buffer, size_t size);
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode)
{ return m_file->Seek(pos, mode); }
wxFileOffset OnSysTell() const { return m_file->Tell(); }
virtual wxFileOffset OnSysTell() const { return m_file->Tell(); }
private:
wxTempFile *m_file;
@@ -166,20 +166,20 @@ public:
wxFFileInputStream(FILE *file);
virtual ~wxFFileInputStream();
wxFileOffset GetLength() const;
virtual wxFileOffset GetLength() const;
bool Ok() const { return IsOk(); }
virtual bool IsOk() const;
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
wxFFile* GetFile() const { return m_file; }
protected:
wxFFileInputStream();
size_t OnSysRead(void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
virtual size_t OnSysRead(void *buffer, size_t size);
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
protected:
wxFFile *m_file;
@@ -198,20 +198,20 @@ public:
void Sync();
bool Close() { return m_file_destroy ? m_file->Close() : true; }
wxFileOffset GetLength() const;
virtual wxFileOffset GetLength() const;
bool Ok() const { return IsOk(); }
virtual bool IsOk() const;
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
wxFFile* GetFile() const { return m_file; }
protected:
wxFFileOutputStream();
size_t OnSysWrite(const void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const;
virtual size_t OnSysWrite(const void *buffer, size_t size);
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
protected:
wxFFile *m_file;