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

fix virtual function hiding warnings introduced to changing wxSockAddress argument of Connect() to be passed by const reference

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-20 08:59:45 +00:00
parent 419875a6f5
commit ddc7f0c975
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ public:
void SetUser(const wxString& user) { m_user = user; } void SetUser(const wxString& user) { m_user = user; }
void SetPassword(const wxString& passwd) { m_passwd = passwd; } void SetPassword(const wxString& passwd) { m_passwd = passwd; }
bool Connect(wxSockAddress& addr, bool wait = true); bool Connect(const wxSockAddress& addr, bool wait = true);
bool Connect(const wxString& host); bool Connect(const wxString& host);
// disconnect // disconnect

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

@@ -29,7 +29,7 @@ public:
virtual bool Connect(const wxString& host, unsigned short port); virtual bool Connect(const wxString& host, unsigned short port);
virtual bool Connect(const wxString& host) { return Connect(host, 0); } virtual bool Connect(const wxString& host) { return Connect(host, 0); }
virtual bool Connect(wxSockAddress& addr, bool wait); virtual bool Connect(const wxSockAddress& addr, bool wait);
bool Abort(); bool Abort();
wxInputStream *GetInputStream(const wxString& path); wxInputStream *GetInputStream(const wxString& path);
inline wxProtocolError GetError() { return m_perr; } inline wxProtocolError GetError() { return m_perr; }

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

@@ -59,7 +59,8 @@ public:
#if wxUSE_SOCKETS #if wxUSE_SOCKETS
bool Reconnect(); bool Reconnect();
virtual bool Connect( const wxString& WXUNUSED(host) ) { return FALSE; } virtual bool Connect( const wxString& WXUNUSED(host) ) { return FALSE; }
virtual bool Connect( wxSockAddress& addr, bool WXUNUSED(wait) = TRUE) { return wxSocketClient::Connect(addr); } virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = TRUE)
{ return wxSocketClient::Connect(addr); }
// read a '\r\n' terminated line from the given socket and put it in // read a '\r\n' terminated line from the given socket and put it in
// result (without the terminators) // result (without the terminators)

2
src/common/ftp.cpp
View File

@@ -107,7 +107,7 @@ wxFTP::~wxFTP()
// wxFTP connect and login methods // wxFTP connect and login methods
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
bool wxFTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) bool wxFTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))
{ {
if ( !wxProtocol::Connect(addr) ) if ( !wxProtocol::Connect(addr) )
{ {

2
src/common/http.cpp
View File

@@ -219,7 +219,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
return true; return true;
} }
bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))
{ {
if (m_addr) { if (m_addr) {
delete m_addr; delete m_addr;