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 /embedserv/source/embed/tracker.cxx | |
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 'embedserv/source/embed/tracker.cxx')
-rw-r--r-- | embedserv/source/embed/tracker.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx index ac7a05857ad1..ba8582c97fad 100644 --- a/embedserv/source/embed/tracker.cxx +++ b/embedserv/source/embed/tracker.cxx @@ -89,7 +89,7 @@ HBRUSH HalftoneBrush() { WORD grayPattern[8]; for (int i = 0; i < 8; i++) - grayPattern[i] = (WORD)(0x5555 << (i & 1)); + grayPattern[i] = static_cast<WORD>(0x5555 << (i & 1)); HBITMAP grayBitmap = CreateBitmap(8, 8, 1, 1, &grayPattern); if (grayBitmap != nullptr) { @@ -292,7 +292,7 @@ int Tracker::HitTest(POINT point) const if (PtInRect(&rectTrue,point)) { if ((m_nStyle & (resizeInside|resizeOutside)) != 0) - hitResult = (TrackerHit)HitTestHandles(point); + hitResult = static_cast<TrackerHit>(HitTestHandles(point)); else hitResult = hitMiddle; } @@ -325,7 +325,7 @@ BOOL Tracker::SetCursor(HWND pWnd, UINT nHitTest) const { // only for trackers with hatchedBorder (ie. in-place resizing) if (m_nStyle & hatchedBorder) - nHandle = (TrackerHit)9; + nHandle = TrackerHit(9); } ::SetCursor(afxCursors[nHandle]); @@ -408,9 +408,9 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo) rectOld = m_rect; // handle resize cases (and part of move) if (px != nullptr) - *px = (int)(short)LOWORD(msg.lParam) - xDiff; + *px = static_cast<int>(static_cast<short>(LOWORD(msg.lParam))) - xDiff; if (py != nullptr) - *py = (int)(short)HIWORD(msg.lParam) - yDiff; + *py = static_cast<int>(static_cast<short>(HIWORD(msg.lParam))) - yDiff; // handle move case if (nHandle == hitMiddle) @@ -639,7 +639,7 @@ void Tracker::Draw(HDC hDC) const { if (mask & (1<<i)) { - GetHandleRect((TrackerHit)i, &rect); + GetHandleRect(static_cast<TrackerHit>(i), &rect); // FillSolidRect(hDC,rect, RGB(0, 0, 0)); FillRect(hDC,&rect,hbrush); } @@ -741,11 +741,11 @@ int Tracker::NormalizeHit(int nHandle) const const AFX_HANDLEINFO* pHandleInfo = &afxHandleInfo[nHandle]; if (m_rect.right - m_rect.left < 0) { - nHandle = (TrackerHit)pHandleInfo->nInvertX; + nHandle = static_cast<TrackerHit>(pHandleInfo->nInvertX); pHandleInfo = &afxHandleInfo[nHandle]; } if (m_rect.bottom - m_rect.top < 0) - nHandle = (TrackerHit)pHandleInfo->nInvertY; + nHandle = static_cast<TrackerHit>(pHandleInfo->nInvertY); return nHandle; } @@ -765,9 +765,9 @@ int Tracker::HitTestHandles(POINT point) const { if (mask & (1<<i)) { - GetHandleRect((TrackerHit)i, &rect); + GetHandleRect(static_cast<TrackerHit>(i), &rect); if (PtInRect(&rect,point)) - return (TrackerHit)i; + return static_cast<TrackerHit>(i); } } |