diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-22 13:11:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-23 07:54:51 +0100 |
commit | 9af8f190ed1bf3f76897ad0c078db16451d6fb69 (patch) | |
tree | 015089ee72a67eca7db999845cabb8104c8ce3aa /vcl/win/app | |
parent | 9602e63c818722c3910343b7af53917d031861c8 (diff) |
More loplugin:cstylecast on Windows
Automatic rewrite (of loplugin:cstylecast and loplugin:unnecessaryparen) after
cab0427cadddb3aaf1349c66f2fa13a4234ba4b2 "Enable loplugin:cstylecast for some
more cases" and a409d32e7f6fc09e041079d6dbc3c927497adfed "More
loplugin:cstylecast"
Change-Id: Ib3355159dd08333e1b7a8d091caf2069cdcc7862
Reviewed-on: https://gerrit.libreoffice.org/48317
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/win/app')
-rw-r--r-- | vcl/win/app/saldata.cxx | 2 | ||||
-rw-r--r-- | vcl/win/app/salinst.cxx | 14 | ||||
-rw-r--r-- | vcl/win/app/saltimer.cxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/vcl/win/app/saldata.cxx b/vcl/win/app/saldata.cxx index 0b45716a2980..c71954ea9ca8 100644 --- a/vcl/win/app/saldata.cxx +++ b/vcl/win/app/saldata.cxx @@ -62,7 +62,7 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ) c1 += 32; if ( (c2 >= 65) && (c2 <= 90) ) c2 += 32; - nRet = ((sal_Int32)c1)-((sal_Int32)((unsigned char)c2)); + nRet = static_cast<sal_Int32>(c1)- static_cast<sal_Int32>(static_cast<unsigned char>(c2)); if ( nRet != 0 ) break; diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 5671361c987b..27f1aa73a57a 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -551,7 +551,7 @@ bool WinSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents) if ( !IsMainThread() ) { bDidWork = SendMessageW( mhComWnd, SAL_MSG_THREADYIELD, - (WPARAM) false, (LPARAM) bHandleAllCurrentEvents ); + WPARAM(false), static_cast<LPARAM>(bHandleAllCurrentEvents) ); if ( !bDidWork && bWait ) { maWaitingYieldCond.reset(); @@ -594,7 +594,7 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, b switch ( nMsg ) { case SAL_MSG_THREADYIELD: - assert( !(bool)wParam ); + assert( !static_cast<bool>(wParam) ); nRet = static_cast<LRESULT>(ImplSalYield( false, static_cast<bool>( lParam ) )); break; @@ -883,7 +883,7 @@ bool WinSalInstance::AnyInput( VclInputFlags nType ) SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, SalFrameStyleFlags nSalFrameStyle ) { // to switch to Main-Thread - return reinterpret_cast<SalFrame*>((sal_IntPtr)SendMessageW( mhComWnd, SAL_MSG_CREATEFRAME, static_cast<WPARAM>(nSalFrameStyle), reinterpret_cast<LPARAM>(pSystemParentData->hWnd) )); + return reinterpret_cast<SalFrame*>(static_cast<sal_IntPtr>(SendMessageW( mhComWnd, SAL_MSG_CREATEFRAME, static_cast<WPARAM>(nSalFrameStyle), reinterpret_cast<LPARAM>(pSystemParentData->hWnd) ))); } SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags nSalFrameStyle ) @@ -894,7 +894,7 @@ SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags nSa hWndParent = static_cast<WinSalFrame*>(pParent)->mhWnd; else hWndParent = nullptr; - return reinterpret_cast<SalFrame*>((sal_IntPtr)SendMessageW( mhComWnd, SAL_MSG_CREATEFRAME, static_cast<WPARAM>(nSalFrameStyle), reinterpret_cast<LPARAM>(hWndParent) )); + return reinterpret_cast<SalFrame*>(static_cast<sal_IntPtr>(SendMessageW( mhComWnd, SAL_MSG_CREATEFRAME, static_cast<WPARAM>(nSalFrameStyle), reinterpret_cast<LPARAM>(hWndParent) ))); } void WinSalInstance::DestroyFrame( SalFrame* pFrame ) @@ -908,7 +908,7 @@ SalObject* WinSalInstance::CreateObject( SalFrame* pParent, bool /*bShow*/ ) { // to switch to Main-Thread - return reinterpret_cast<SalObject*>((sal_IntPtr)SendMessageW( mhComWnd, SAL_MSG_CREATEOBJECT, 0, reinterpret_cast<LPARAM>(static_cast<WinSalFrame*>(pParent)) )); + return reinterpret_cast<SalObject*>(static_cast<sal_IntPtr>(SendMessageW( mhComWnd, SAL_MSG_CREATEOBJECT, 0, reinterpret_cast<LPARAM>(static_cast<WinSalFrame*>(pParent)) ))); } void WinSalInstance::DestroyObject( SalObject* pObject ) @@ -1054,9 +1054,9 @@ OUString WinSalInstance::getOSVersion() VS_FIXEDFILEINFO *vinfo = static_cast<VS_FIXEDFILEINFO *>(pBlock); OUStringBuffer aVer; aVer.append("Windows "); - aVer.append((sal_Int32)HIWORD(vinfo->dwProductVersionMS)); + aVer.append(static_cast<sal_Int32>(HIWORD(vinfo->dwProductVersionMS))); aVer.append("."); - aVer.append((sal_Int32)LOWORD(vinfo->dwProductVersionMS)); + aVer.append(static_cast<sal_Int32>(LOWORD(vinfo->dwProductVersionMS))); return aVer.makeStringAndClear(); } } diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx index d23c7344ef31..c70189be4bba 100644 --- a/vcl/win/app/saltimer.cxx +++ b/vcl/win/app/saltimer.cxx @@ -105,7 +105,7 @@ void WinSalTimer::Start( sal_uLong nMS ) if ( pInst && !pInst->IsMainThread() ) { BOOL const ret = PostMessageW(pInst->mhComWnd, - SAL_MSG_STARTTIMER, 0, (LPARAM) tools::Time::GetSystemTicks() + nMS); + SAL_MSG_STARTTIMER, 0, static_cast<LPARAM>(tools::Time::GetSystemTicks()) + nMS); SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); } else |