diff options
author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2012-05-10 19:48:17 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 13:27:10 +0200 |
commit | 9b224d33216b0e21292b44743aa4594665ebf970 (patch) | |
tree | e1bbfd2b4e2cbf630a7995a6b0dc8fb002db4953 /src | |
parent | 1b0d246fb49e408afaed817694ce91aaf52b180b (diff) |
Improve variable name
Change-Id: I3dfc7f156c08c3aff43ebf7e288da15d9459c49e
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/qquickflickable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 1f7c800a69..e8558de232 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<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(); |