From 767755208759d0058d47d3901110f1fe22ae2175 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 15 Jan 2021 23:48:01 +0100 Subject: [PATCH] Rename wxWebRequestWinHTTP::m_sessionWinHTTP to m_sessionImpl No real changes, just use the same name as in the other backends for consistency (we could also rename m_sessionImpl in the other ones to m_sessionCURL and m_sessionURLSession respectively, but this would have been more work and the latter name is really not great). --- include/wx/msw/private/webrequest_winhttp.h | 4 ++-- src/msw/webrequest_winhttp.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/private/webrequest_winhttp.h b/include/wx/msw/private/webrequest_winhttp.h index 11f2755528..a722289822 100644 --- a/include/wx/msw/private/webrequest_winhttp.h +++ b/include/wx/msw/private/webrequest_winhttp.h @@ -67,7 +67,7 @@ class wxWebRequestWinHTTP : public wxWebRequestImpl { public: wxWebRequestWinHTTP(wxWebSession& session, - wxWebSessionWinHTTP& sessionWinHTTP, + wxWebSessionWinHTTP& sessionImpl, wxEvtHandler* handler, const wxString& url, int id); @@ -94,7 +94,7 @@ public: HINTERNET GetHandle() const { return m_request; } private: - wxWebSessionWinHTTP& m_sessionWinHTTP; + wxWebSessionWinHTTP& m_sessionImpl; wxString m_url; HINTERNET m_connect; HINTERNET m_request; diff --git a/src/msw/webrequest_winhttp.cpp b/src/msw/webrequest_winhttp.cpp index 843f309fe6..ad22f08ad1 100644 --- a/src/msw/webrequest_winhttp.cpp +++ b/src/msw/webrequest_winhttp.cpp @@ -123,12 +123,12 @@ static void CALLBACK wxRequestStatusCallback( // wxWebRequestWinHTTP::wxWebRequestWinHTTP(wxWebSession& session, - wxWebSessionWinHTTP& sessionWinHTTP, + wxWebSessionWinHTTP& sessionImpl, wxEvtHandler* handler, const wxString& url, int id): wxWebRequestImpl(session, handler, id), - m_sessionWinHTTP(sessionWinHTTP), + m_sessionImpl(sessionImpl), m_url(url), m_connect(NULL), m_request(NULL), @@ -305,7 +305,7 @@ void wxWebRequestWinHTTP::Start() // Open a connection m_connect = ::WinHttpConnect ( - m_sessionWinHTTP.GetHandle(), + m_sessionImpl.GetHandle(), wxString(urlComps.lpszHostName, urlComps.dwHostNameLength).wc_str(), urlComps.nPort, wxRESERVED_PARAM