Improve variable name
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>
Thu, 10 May 2012 17:48:17 +0000 (19:48 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 11 May 2012 11:27:10 +0000 (13:27 +0200)
Change-Id: I3dfc7f156c08c3aff43ebf7e288da15d9459c49e
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
src/quick/items/qquickflickable.cpp

index 1f7c800..e8558de 100644 (file)
@@ -1800,9 +1800,9 @@ bool QQuickFlickable::sendMouseEvent(QMouseEvent *event)
 
     QQuickCanvas *c = canvas();
     QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
-    bool disabledItem = grabber && !grabber->isEnabled();
+    bool grabberDisabled = grabber && !grabber->isEnabled();
     bool stealThisEvent = d->stealMouse;
-    if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab() || disabledItem)) {
+    if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab() || grabberDisabled)) {
         QQuickMouseEventEx mouseEvent(event->type(), localPos,
                                 event->windowPos(), event->screenPos(),
                                 event->button(), event->buttons(), event->modifiers());
@@ -1848,12 +1848,12 @@ bool QQuickFlickable::sendMouseEvent(QMouseEvent *event)
             break;
         }
         grabber = qobject_cast<QQuickItem*>(c->mouseGrabberItem());
-        if ((grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this) || disabledItem) {
+        if ((grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this) || grabberDisabled) {
             d->clearDelayedPress();
             grabMouse();
         }
 
-        return stealThisEvent || d->delayedPressEvent || disabledItem;
+        return stealThisEvent || d->delayedPressEvent || grabberDisabled;
     } else if (d->lastPosTime != -1) {
         d->lastPosTime = -1;
         returnToBounds();