From 9b224d33216b0e21292b44743aa4594665ebf970 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 10 May 2012 19:48:17 +0200 Subject: [PATCH] Improve variable name Change-Id: I3dfc7f156c08c3aff43ebf7e288da15d9459c49e Reviewed-by: Laszlo Agocs Reviewed-by: Alan Alpert --- src/quick/items/qquickflickable.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 1f7c800..e8558de 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -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(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(); -- 2.7.4