fix virtual function hiding warnings introduced to changing wxSockAddress argument...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index 01336376e0e4233cb32d60d1d9ed417115bd5447..21312e87fd6a27e27f15643c96878171e1a1d938 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -38,7 +38,7 @@ public:
     void SetUser(const wxString& user) { m_user = user; }
     void SetPassword(const wxString& passwd) { m_passwd = passwd; }
 
     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
     bool Connect(const wxString& host);
 
     // disconnect

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 79f37c79242209d5b7d0d319db1828c91c8ce307..29f727451f86eb67c8c9db610a1839c59370fb0c 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -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(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; }
   bool Abort();
   wxInputStream *GetInputStream(const wxString& path);
   inline wxProtocolError GetError() { return m_perr; }

diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index a6012c5c9e615e2ff8044424c9df977050b51678..bdf1b5760d0a494dacdfcd463ff3be538781b53a 100644 (file)
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -59,7 +59,8 @@ public:
 #if wxUSE_SOCKETS
     bool Reconnect();
     virtual bool Connect( const wxString& WXUNUSED(host) ) { return FALSE; }
 #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)
 
     // read a '\r\n' terminated line from the given socket and put it in
     // result (without the terminators)

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 27b3e70cdf3af1bd18a02b4d5065f03205cd28f1..909fe668618ce1a0f13b736fcfdb83000a0d1577 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -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) )
     {

diff --git a/src/common/http.cpp b/src/common/http.cpp
index fc7248f61a8e0d685e67f6732dfc5209e81dd09d..4525c981077d0d78d68284a64cfa74731ef295a8 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -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) {
         delete m_addr;
 {
     if (m_addr) {
         delete m_addr;