diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2018-05-22 12:32:54 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-06-20 22:01:37 +0000 |
| commit | 29bdc9bf8bfdf3386d6b2e76eaecde9d58af3ab0 (patch) | |
| tree | 55483f9d331854b85d540b1c88587bd412f25242 | |
| parent | bbeecc18ddfb8b076d15c36cb682ebf6e306a7df (diff) | |
Fix non-initialized class member
>>> Non-static class member "reserved" is not initialized in this constructor nor in any functions that it calls.
Coverity-Id: 190209
Change-Id: Ia1c07ff16b2015d99ab15f387ac6cc687703fcbb
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| -rw-r--r-- | src/quick/handlers/qquickpointerhandler.cpp | 8 | ||||
| -rw-r--r-- | src/quick/handlers/qquickpointerhandler_p_p.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp index 87a959f632..506da8faff 100644 --- a/src/quick/handlers/qquickpointerhandler.cpp +++ b/src/quick/handlers/qquickpointerhandler.cpp @@ -465,14 +465,14 @@ void QQuickPointerHandler::handlePointerEventImpl(QQuickPointerEvent *event) */ QQuickPointerHandlerPrivate::QQuickPointerHandlerPrivate() - : enabled(true) + : grabPermissions(QQuickPointerHandler::CanTakeOverFromItems | + QQuickPointerHandler::CanTakeOverFromHandlersOfDifferentType | + QQuickPointerHandler::ApprovesTakeOverByAnything) + , enabled(true) , active(false) , targetExplicitlySet(false) , hadKeepMouseGrab(false) , hadKeepTouchGrab(false) - , grabPermissions(QQuickPointerHandler::CanTakeOverFromItems | - QQuickPointerHandler::CanTakeOverFromHandlersOfDifferentType | - QQuickPointerHandler::ApprovesTakeOverByAnything) { } diff --git a/src/quick/handlers/qquickpointerhandler_p_p.h b/src/quick/handlers/qquickpointerhandler_p_p.h index a0ef09c0ff..ce50b98c57 100644 --- a/src/quick/handlers/qquickpointerhandler_p_p.h +++ b/src/quick/handlers/qquickpointerhandler_p_p.h @@ -71,13 +71,12 @@ public: QQuickPointerEvent *currentEvent = nullptr; QQuickItem *target = nullptr; + uint8_t grabPermissions : 8; bool enabled : 1; bool active : 1; bool targetExplicitlySet : 1; bool hadKeepMouseGrab : 1; // some handlers override target()->setKeepMouseGrab(); this remembers previous state bool hadKeepTouchGrab : 1; // some handlers override target()->setKeepTouchGrab(); this remembers previous state - uint reserved : 19; - uint8_t grabPermissions : 8; }; QT_END_NAMESPACE |