Improved a QGesture api a little bit.

Changed the constructor of the QGesture to separate the gesture target (the
object/widget that the gesture filters events for), and the parent object.

Reviewed-by: Richard Moe Gustavsen

1 files changed, 31 insertions, 6 deletions

diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp
index 79dcae1..eeb6528 100644
--- a/src/gui/kernel/qgesture.cpp
+++ b/src/gui/kernel/qgesture.cpp
@@ -149,20 +149,18 @@ private:
 
     \sa setGraphicsItem()
 */
-QGesture::QGesture(QObject *parent)
+QGesture::QGesture(QObject *gestureTarget, QObject *parent)
     : QObject(*new QGesturePrivate, parent)
 {
-    if (parent)
-        parent->installEventFilter(this);
+    setGestureTarget(gestureTarget);
 }
 
 /*! \internal
  */
-QGesture::QGesture(QGesturePrivate &dd, QObject *parent)
+QGesture::QGesture(QGesturePrivate &dd, QObject *gestureTarget, QObject *parent)
     : QObject(dd, parent)
 {
-    if (parent)
-        parent->installEventFilter(this);
+    setGestureTarget(gestureTarget);
 }
 
 /*!
@@ -172,6 +170,33 @@ QGesture::~QGesture()
 {
 }
 
+/*!
+    \property QGesture::gestureTarget
+
+    Gesture target is the object that the gesture will observe for events.
+    Typically this means that the gesture installs an event filter on the
+    target object.
+*/
+void QGesture::setGestureTarget(QObject *object)
+{
+    d_func()->setupGestureTarget(object);
+}
+
+QObject* QGesture::gestureTarget() const
+{
+    return d_func()->gestureTarget;
+}
+
+void QGesturePrivate::setupGestureTarget(QObject *object)
+{
+    Q_Q(QGesture);
+    if (gestureTarget)
+        gestureTarget->removeEventFilter(q);
+    if (object)
+        object->installEventFilter(q);
+    gestureTarget = object;
+}
+
 /*! \internal
  */
 bool QGesture::eventFilter(QObject *receiver, QEvent *event)