From 4513c6029636645402c17aefd80a3c11df3d1506 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 16 May 2019 18:35:30 +0000 Subject: [PATCH] QGesturePrivate cleanup Signed-off-by: Ivailo Monev --- src/gui/kernel/qgesture.cpp | 4 ++-- src/gui/kernel/qgesture_p.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp index f6e39ce75..fa849aac6 100644 --- a/src/gui/kernel/qgesture.cpp +++ b/src/gui/kernel/qgesture.cpp @@ -205,13 +205,13 @@ void QGesture::unsetHotSpot() void QGesture::setGestureCancelPolicy(GestureCancelPolicy policy) { Q_D(QGesture); - d->gestureCancelPolicy = static_cast(policy); + d->gestureCancelPolicy = policy; } QGesture::GestureCancelPolicy QGesture::gestureCancelPolicy() const { Q_D(const QGesture); - return static_cast(d->gestureCancelPolicy); + return d->gestureCancelPolicy; } /*! diff --git a/src/gui/kernel/qgesture_p.h b/src/gui/kernel/qgesture_p.h index bf8249e8b..7465f9467 100644 --- a/src/gui/kernel/qgesture_p.h +++ b/src/gui/kernel/qgesture_p.h @@ -70,7 +70,7 @@ class QGesturePrivate : public QObjectPrivate public: QGesturePrivate() : gestureType(Qt::CustomGesture), state(Qt::NoGesture), - isHotSpotSet(false), gestureCancelPolicy(0) + isHotSpotSet(false), gestureCancelPolicy(QGesture::GestureCancelPolicy::CancelNone) { } @@ -78,8 +78,8 @@ public: Qt::GestureState state; QPointF hotSpot; QPointF sceneHotSpot; - uint isHotSpotSet : 1; - uint gestureCancelPolicy : 2; + bool isHotSpotSet; + QGesture::GestureCancelPolicy gestureCancelPolicy; }; class QPanGesturePrivate : public QGesturePrivate