summaryrefslogtreecommitdiff
path: root/shell/source/backends/wininetbe/wininetbackend.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-14 16:52:11 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-15 08:57:39 +0000
commit85876a11ceb9bf144ae8365ff3a9fedd8c363ef2 (patch)
tree4db05eaf14aaadc4c8bad4199dbfad3cb6106190 /shell/source/backends/wininetbe/wininetbackend.cxx
parentcb97267f5676b7790806dc15d17f2a6523232ccc (diff)
clang-cl loplugin: shell
Change-Id: I98d2e5154270b795cdd11653ecfff2abd8dda294 Reviewed-on: https://gerrit.libreoffice.org/29851 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'shell/source/backends/wininetbe/wininetbackend.cxx')
-rw-r--r--shell/source/backends/wininetbe/wininetbackend.cxx19
1 files changed, 8 insertions, 11 deletions
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 1a9f9989986b..42f091fe759a 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -119,9 +119,9 @@ WinInetBackend::WinInetBackend()
LPINTERNET_PROXY_INFO lpi = &pi;
DWORD dwLength = sizeof (INTERNET_PROXY_INFO);
BOOL ok = lpfnInternetQueryOption(
- NULL,
+ nullptr,
INTERNET_OPTION_PROXY,
- (LPVOID)lpi,
+ lpi,
&dwLength );
if (!ok)
{
@@ -136,12 +136,12 @@ WinInetBackend::WinInetBackend()
// alloca is nice because it is fast and we don't
// have to free the allocated memory, it will be
// automatically done
- lpi = reinterpret_cast< LPINTERNET_PROXY_INFO >(
+ lpi = static_cast< LPINTERNET_PROXY_INFO >(
alloca( dwLength ) );
ok = lpfnInternetQueryOption(
- NULL,
+ nullptr,
INTERNET_OPTION_PROXY,
- (LPVOID)lpi,
+ lpi,
&dwLength );
if (!ok)
{
@@ -218,13 +218,10 @@ WinInetBackend::WinInetBackend()
ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, OUString());
- ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, OUString(
- "http" ) );
- ProxyEntry aHttpsProxy = FindProxyEntry( aProxyList, OUString(
- "https" ) );
+ ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, "http" );
+ ProxyEntry aHttpsProxy = FindProxyEntry( aProxyList, "https" );
- ProxyEntry aFtpProxy = FindProxyEntry( aProxyList, OUString(
- "ftp" ) );
+ ProxyEntry aFtpProxy = FindProxyEntry( aProxyList, "ftp" );
if( aTypeIndepProxy.Server.getLength() )
{