summaryrefslogtreecommitdiff
path: root/vcl/win/app/salinfo.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-14 16:44:22 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-15 07:59:13 +0000
commit48b1c8898d2f5a54435d23c412a0c65b553ef46d (patch)
treeef87e03b112f675718ee542d86d42ed7c8beb4fb /vcl/win/app/salinfo.cxx
parent613213240a84327a0a72bb5ee98cc88d50c1fd0e (diff)
clang-cl loplugin: vcl
Change-Id: I40f8a6fef9d66b28a1d72551a6873b041b38b09e Reviewed-on: https://gerrit.libreoffice.org/29841 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/win/app/salinfo.cxx')
-rw-r--r--vcl/win/app/salinfo.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/win/app/salinfo.cxx b/vcl/win/app/salinfo.cxx
index 8b70632963cf..15a71e3177d9 100644
--- a/vcl/win/app/salinfo.cxx
+++ b/vcl/win/app/salinfo.cxx
@@ -104,7 +104,7 @@ bool WinSalSystem::initMonitors()
aDev.cb = sizeof( aDev );
DWORD nDevice = 0;
std::unordered_map< OUString, int, OUStringHash > aDeviceStringCount;
- while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) )
+ while( EnumDisplayDevicesW( nullptr, nDevice++, &aDev, 0 ) )
{
if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE)
&& !(aDev.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) ) // sort out non/disabled monitors
@@ -122,8 +122,8 @@ bool WinSalSystem::initMonitors()
Rectangle() ) );
}
}
- HDC aDesktopRC = GetDC( NULL );
- EnumDisplayMonitors( aDesktopRC, NULL, ImplEnumMonitorProc, reinterpret_cast<LPARAM>(this) );
+ HDC aDesktopRC = GetDC( nullptr );
+ EnumDisplayMonitors( aDesktopRC, nullptr, ImplEnumMonitorProc, reinterpret_cast<LPARAM>(this) );
// append monitor numbers to name strings
std::unordered_map< OUString, int, OUStringHash > aDevCount( aDeviceStringCount );
@@ -136,7 +136,7 @@ bool WinSalSystem::initMonitors()
int nInstance = aDeviceStringCount[ rDev ] - (-- aDevCount[ rDev ] );
OUStringBuffer aBuf( rDev.getLength() + 8 );
aBuf.append( rDev );
- aBuf.appendAscii( " (" );
+ aBuf.append( " (" );
aBuf.append( sal_Int32( nInstance ) );
aBuf.append( ')' );
m_aMonitors[ i ].m_aName = aBuf.makeStringAndClear();
@@ -171,7 +171,7 @@ int WinSalSystem::ShowNativeMessageBox(const OUString& rTitle, const OUString& r
ImplHideSplash();
return MessageBoxW(
- 0,
+ nullptr,
reinterpret_cast<LPCWSTR>(rMessage.getStr()),
reinterpret_cast<LPCWSTR>(rTitle.getStr()),
nFlags);