fix virtual function hiding warnings introduced to changing wxSockAddress argument of Connect() to be passed by const reference
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -38,7 +38,7 @@ public:
|
||||
void SetUser(const wxString& user) { m_user = user; }
|
||||
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);
|
||||
|
||||
// disconnect
|
||||
|
@@ -29,7 +29,7 @@ public:
|
||||
|
||||
virtual bool Connect(const wxString& host, unsigned short port);
|
||||
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();
|
||||
wxInputStream *GetInputStream(const wxString& path);
|
||||
inline wxProtocolError GetError() { return m_perr; }
|
||||
|
@@ -59,7 +59,8 @@ public:
|
||||
#if wxUSE_SOCKETS
|
||||
bool Reconnect();
|
||||
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
|
||||
// result (without the terminators)
|
||||
|
@@ -107,7 +107,7 @@ wxFTP::~wxFTP()
|
||||
// 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) )
|
||||
{
|
||||
|
@@ -219,7 +219,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
|
||||
bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))
|
||||
{
|
||||
if (m_addr) {
|
||||
delete m_addr;
|
||||
|
Reference in New Issue
Block a user