diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-09-05 14:48:30 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-09-26 05:41:05 +0000 |
| commit | 7421a0e88208a9afe0ab360a0646bf81a84d2290 (patch) | |
| tree | 0a518e15e1d4095d7710ec919b7d772bb66411b3 /src/plugins/platforms/winrt/qwinrtcursor.cpp | |
| parent | e5b4e7a9ed5b1d65b2ea6870498d7a1a4dbb3237 (diff) | |
winrt platform plugin: Fix clang warnings
Fixed warnings:
- missing override specifier
- 0 as nullptr constant
- implicit change of signedness
- non portable path to header file
Change-Id: I6977bc561176ac7804ac01325b84c15ba849bbf2
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/platforms/winrt/qwinrtcursor.cpp')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtcursor.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtcursor.cpp b/src/plugins/platforms/winrt/qwinrtcursor.cpp index f22b9a435a..b73cd3f759 100644 --- a/src/plugins/platforms/winrt/qwinrtcursor.cpp +++ b/src/plugins/platforms/winrt/qwinrtcursor.cpp @@ -78,10 +78,6 @@ QWinRTCursor::QWinRTCursor() Q_ASSERT_SUCCEEDED(hr); } -QWinRTCursor::~QWinRTCursor() -{ -} - #ifndef QT_NO_CURSOR void QWinRTCursor::changeCursor(QCursor *windowCursor, QWindow *window) { @@ -183,9 +179,9 @@ QPoint QWinRTCursor::pos() const return hr; }); Q_ASSERT_SUCCEEDED(hr); - QPoint position = QPoint(point.X, point.Y); + QPoint position = QPoint(int(point.X), int(point.Y)); // If no cursor get_PointerPosition returns SHRT_MIN for x and y - if (position.x() == SHRT_MIN && position.y() == SHRT_MIN || FAILED(hr)) + if ((position.x() == SHRT_MIN && position.y() == SHRT_MIN) || FAILED(hr)) return QPointF(Q_INFINITY, Q_INFINITY).toPoint(); position.rx() -= bounds.X; position.ry() -= bounds.Y; @@ -211,7 +207,8 @@ void QWinRTCursor::setPos(const QPoint &pos) Point mousePos; hr = coreWindow->get_PointerPosition(&mousePos); RETURN_HR_IF_FAILED("Failed to obtain mouse position."); - const Point p = {FLOAT(scaledPos.x() + bounds.X), FLOAT(scaledPos.y() + bounds.Y)}; + const Point p = { FLOAT(scaledPos.x()) + bounds.X, + FLOAT(scaledPos.y()) + bounds.Y }; const bool wasInWindow = qIsPointInRect(mousePos, bounds); const bool willBeInWindow = qIsPointInRect(p, bounds); if (wasInWindow && willBeInWindow) |