From 457b213315e55a5f7d32089f431722bef46ec619 Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Tue, 19 Jan 2021 19:42:55 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: VZ --- include/wx/private/webrequest.h | 2 +- include/wx/webrequest.h | 2 +- interface/wx/protocol/http.h | 5 ++--- interface/wx/webrequest.h | 2 +- src/common/webrequest.cpp | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/wx/private/webrequest.h b/include/wx/private/webrequest.h index 42ebf9c51e..0812304fac 100644 --- a/include/wx/private/webrequest.h +++ b/include/wx/private/webrequest.h @@ -98,7 +98,7 @@ public: void DisablePeerVerify(bool disable) { m_peerVerifyDisabled = disable; } - bool IsPeerVerifyDisabled() { return m_peerVerifyDisabled; } + bool IsPeerVerifyDisabled() const { return m_peerVerifyDisabled; } void SetState(wxWebRequest::State state, const wxString& failMsg = wxString()); diff --git a/include/wx/webrequest.h b/include/wx/webrequest.h index 72034764a2..349c0372a9 100644 --- a/include/wx/webrequest.h +++ b/include/wx/webrequest.h @@ -190,7 +190,7 @@ public: void DisablePeerVerify(bool disable = true); - bool IsPeerVerifyDisabled(); + bool IsPeerVerifyDisabled() const; private: // Ctor is only used by wxWebSession. diff --git a/interface/wx/protocol/http.h b/interface/wx/protocol/http.h index 00ac194470..e5ba4d5962 100644 --- a/interface/wx/protocol/http.h +++ b/interface/wx/protocol/http.h @@ -12,8 +12,8 @@ wxHTTP can thus be used to create a (basic) HTTP @b client. - @note If you want HTTPS, IPv6, Proxy detection, authentication, etc. - support consider using wxWebRequest instead. + @note In practice, for any but the most trivial cases, e.g. if you need HTTPS, HTTP/2 or IPv6, + proxy detection, authentication, etc. support please use wxWebRequest instead. @library{wxnet} @category{net} @@ -176,4 +176,3 @@ public: const wxString& data, const wxMBConv& conv = wxConvUTF8); }; - diff --git a/interface/wx/webrequest.h b/interface/wx/webrequest.h index d17aa13d82..98713392d8 100644 --- a/interface/wx/webrequest.h +++ b/interface/wx/webrequest.h @@ -414,7 +414,7 @@ public: @see DisablePeerVerify() */ - bool IsPeerVerifyDisabled(); + bool IsPeerVerifyDisabled() const; ///@} /** @name Progress methods diff --git a/src/common/webrequest.cpp b/src/common/webrequest.cpp index e56e844239..351a4b76ae 100644 --- a/src/common/webrequest.cpp +++ b/src/common/webrequest.cpp @@ -522,7 +522,7 @@ void wxWebRequest::DisablePeerVerify(bool disable) m_impl->DisablePeerVerify(disable); } -bool wxWebRequest::IsPeerVerifyDisabled() +bool wxWebRequest::IsPeerVerifyDisabled() const { return m_impl->IsPeerVerifyDisabled(); }