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

6
include/wx/protocol/file.h
View File

@@ -23,10 +23,10 @@ public:
wxFileProto();
virtual ~wxFileProto();
bool Abort() { return true; }
wxString GetContentType() const { return wxEmptyString; }
bool Abort() wxOVERRIDE { return true; }
wxString GetContentType() const wxOVERRIDE { return wxEmptyString; }
wxInputStream *GetInputStream(const wxString& path);
wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE;
protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)

12
include/wx/protocol/ftp.h
View File

@@ -34,12 +34,12 @@ public:
virtual ~wxFTP();
// Connecting and disconnecting
virtual bool Connect(const wxSockAddress& addr, bool wait = true);
virtual bool Connect(const wxString& host) { return Connect(host, 0); }
virtual bool Connect(const wxSockAddress& addr, bool wait = true) wxOVERRIDE;
virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); }
virtual bool Connect(const wxString& host, unsigned short port);
// disconnect
virtual bool Close();
virtual bool Close() wxOVERRIDE;
// Parameters set up
@@ -52,7 +52,7 @@ public:
// Generic FTP interface
// FTP doesn't know the MIME type of the last downloaded/uploaded file
virtual wxString GetContentType() const { return wxEmptyString; }
virtual wxString GetContentType() const wxOVERRIDE { return wxEmptyString; }
// the last FTP server reply
const wxString& GetLastResult() const { return m_lastResult; }
@@ -87,9 +87,9 @@ public:
bool FileExists(const wxString& fileName);
// Download methods
bool Abort();
bool Abort() wxOVERRIDE;
virtual wxInputStream *GetInputStream(const wxString& path);
virtual wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE;
virtual wxOutputStream *GetOutputStream(const wxString& path);
// Directory listing

10
include/wx/protocol/http.h
View File

@@ -25,13 +25,13 @@ public:
virtual ~wxHTTP();
virtual bool Connect(const wxString& host, unsigned short port);
virtual bool Connect(const wxString& host) { return Connect(host, 0); }
virtual bool Connect(const wxSockAddress& addr, bool wait);
bool Abort();
virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); }
virtual bool Connect(const wxSockAddress& addr, bool wait) wxOVERRIDE;
bool Abort() wxOVERRIDE;
wxInputStream *GetInputStream(const wxString& path);
wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE;
wxString GetContentType() const;
wxString GetContentType() const wxOVERRIDE;
wxString GetHeader(const wxString& header) const;
int GetResponse() const { return m_http_response; }

4
include/wx/protocol/protocol.h
View File

@@ -61,7 +61,7 @@ public:
#if wxUSE_SOCKETS
bool Reconnect();
virtual bool Connect( const wxString& WXUNUSED(host) ) { return false; }
virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = true)
virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = true) wxOVERRIDE
{ return wxSocketClient::Connect(addr); }
// read a '\r\n' terminated line from the given socket and put it in
@@ -87,7 +87,7 @@ public:
// override wxSocketBase::SetTimeout function to avoid that the internal
// m_uiDefaultTimeout goes out-of-sync:
virtual void SetTimeout(long seconds)
virtual void SetTimeout(long seconds) wxOVERRIDE
{ SetDefaultTimeout(seconds); }