diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-02 18:26:44 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-11-03 10:26:08 (GMT) |
| commit | 93e9bc06427c6a8e1b6d6f939cf53ae5c95e0827 (patch) | |
| tree | b4e677abcb3b69dc602e29fe113041895f1e0e5f /src/corelib/global/qnamespace.h | |
| parent | cfcfae65778f2e1e7fc3936c66689e3685f1cc77 (diff) | |
| download | Qt-93e9bc06427c6a8e1b6d6f939cf53ae5c95e0827.zip Qt-93e9bc06427c6a8e1b6d6f939cf53ae5c95e0827.tar.gz Qt-93e9bc06427c6a8e1b6d6f939cf53ae5c95e0827.tar.bz2 | |
Gesture api review.
Changes to the gesture api after the review.
Reviewed-by: Jasmin Blanchette
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 561ffc1..efa6cc7 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1715,19 +1715,12 @@ public: LastGestureType = ~0u }; - enum GestureContextFlag + enum GestureFlag { - WidgetGesture = 0, - WidgetWithChildrenGesture = 3, - - ItemGesture = WidgetGesture, - ItemWithChildrenGesture = WidgetWithChildrenGesture, - - GestureContext_Mask = 0x00ff, - AcceptPartialGesturesHint = 0x0100, - GestureContextHint_Mask = 0xff00 + DontStartGestureOnChildren = 0x01, + ReceivePartialGestures = 0x02 }; - Q_DECLARE_FLAGS(GestureContext, GestureContextFlag) + Q_DECLARE_FLAGS(GestureFlags, GestureFlag) enum NavigationMode { @@ -1762,7 +1755,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::MatchFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::TextInteractionFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::InputMethodHints) Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::TouchPointStates) -Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::GestureContext) +Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::GestureFlags) typedef bool (*qInternalCallback)(void **); |