return name and extension by const ref, not by value, to prevent bugs as the one...

[wxWidgets.git] / include / wx / url.h

diff --git a/include/wx/url.h b/include/wx/url.h
index 36af3f2a59697a6494f8b7948f361e5e014376ab..18143b786c8f46da7eedf7608e0b09a9954eb40a 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -58,12 +58,9 @@ public:
     wxURL& operator = (const wxString& url);
     wxURL& operator = (const wxURI& url);
 
-    wxString GetProtocolName() const { return m_scheme; }
-    wxString GetHostName() const     { return m_server; }
-    wxString GetURL() const          { return m_url; }
     wxProtocol& GetProtocol()        { return *m_protocol; }
     wxURLError GetError() const      { return m_error; }
-    wxString GetPath() const         { return m_path; }
+    wxString GetURL() const          { return m_url; }
 
     wxInputStream *GetInputStream();
 
@@ -73,24 +70,29 @@ public:
 #endif // wxUSE_SOCKETS
 
 #if WXWIN_COMPATIBILITY_2_4
-    //Use wxURI instead - delims is ignored
-    static wxString ConvertToValidURI(
+    //Use the proper wxURI accessors instead
+    wxDEPRECATED( wxString GetProtocolName() const );
+    wxDEPRECATED( wxString GetHostName() const );
+    wxDEPRECATED( wxString GetPath() const );
+
+    //Use wxURI instead - this does not work that well
+    wxDEPRECATED( static wxString ConvertToValidURI(
                         const wxString& uri,
                         const wxChar* delims = wxT(";/?:@&=+$,")
-                    );
+                  ) );
 
     //Use wxURI::Unescape instead
-    static wxString ConvertFromURI(const wxString& uri);
+    wxDEPRECATED( static wxString ConvertFromURI(const wxString& uri) );
 #endif
 
 protected:
     static wxProtoInfo *ms_protocols;
 
-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP
     static wxHTTP *ms_proxyDefault;
     static bool ms_useDefaultProxy;
     wxHTTP *m_proxy;
-#endif // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP
 
 #if wxUSE_URL_NATIVE
     friend class wxURLNativeImp;