diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-08-24 10:41:16 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-09-19 11:10:49 +0000 |
commit | adcfaae0fd8934ee5dc944fe2ab224afa6ab075d (patch) | |
tree | 6b61fed2831ad97ef81a5100c5b671313247e580 /src/quick/items | |
parent | b9dc856eca10775c5e37eec653b9ba28ff14472b (diff) |
QQuickEventPoint: rename itemGrabber -> grabberItem etc.
QQuickWindow::mouseGrabberItem already existed, so we have a precedent
for "specific thing which grabs" to come after the word Grabber.
Change-Id: I65847ee0a005fac9b6292b9b91bb16f5f180e9bb
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Diffstat (limited to 'src/quick/items')
-rw-r--r-- | src/quick/items/qquickevents.cpp | 16 | ||||
-rw-r--r-- | src/quick/items/qquickevents_p_p.h | 8 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 24 |
3 files changed, 24 insertions, 24 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index 4bb591fae3..fd1afb7160 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -551,17 +551,17 @@ QObject *QQuickEventPoint::grabber() const void QQuickEventPoint::setGrabber(QObject *grabber) { if (QQuickPointerHandler *phGrabber = qmlobject_cast<QQuickPointerHandler *>(grabber)) - setPointerHandlerGrabber(phGrabber); + setGrabberPointerHandler(phGrabber); else - setItemGrabber(static_cast<QQuickItem *>(grabber)); + setGrabberItem(static_cast<QQuickItem *>(grabber)); } -QQuickItem *QQuickEventPoint::itemGrabber() const +QQuickItem *QQuickEventPoint::grabberItem() const { return (m_grabberIsHandler ? nullptr : static_cast<QQuickItem *>(m_grabber.data())); } -void QQuickEventPoint::setItemGrabber(QQuickItem *grabber) +void QQuickEventPoint::setGrabberItem(QQuickItem *grabber) { if (grabber != m_grabber.data()) { qCDebug(lcPointerHandlerDispatch) << this << grabber; @@ -571,12 +571,12 @@ void QQuickEventPoint::setItemGrabber(QQuickItem *grabber) } } -QQuickPointerHandler *QQuickEventPoint::pointerHandlerGrabber() const +QQuickPointerHandler *QQuickEventPoint::grabberPointerHandler() const { return (m_grabberIsHandler ? static_cast<QQuickPointerHandler *>(m_grabber.data()) : nullptr); } -void QQuickEventPoint::setPointerHandlerGrabber(QQuickPointerHandler *grabber) +void QQuickEventPoint::setGrabberPointerHandler(QQuickPointerHandler *grabber) { if (grabber != m_grabber.data()) { qCDebug(lcPointerHandlerDispatch) << this << grabber; @@ -692,7 +692,7 @@ QQuickPointerEvent *QQuickPointerTouchEvent::reset(QEvent *event) if (point->state() == QQuickEventPoint::Pressed) { if (grabbers.at(i)) qWarning() << "TouchPointPressed without previous release event" << point; - point->setItemGrabber(nullptr); + point->setGrabberItem(nullptr); } else { point->setGrabber(grabbers.at(i)); } @@ -751,7 +751,7 @@ QVector<QObject *> QQuickPointerMouseEvent::grabbers() const } void QQuickPointerMouseEvent::clearGrabbers() const { - m_mousePoint->setItemGrabber(nullptr); + m_mousePoint->setGrabberItem(nullptr); } bool QQuickPointerMouseEvent::isPressEvent() const diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 31d6033f76..821f19cae9 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -294,11 +294,11 @@ public: QObject *grabber() const; void setGrabber(QObject *grabber); - QQuickItem *itemGrabber() const; - void setItemGrabber(QQuickItem *grabber); + QQuickItem *grabberItem() const; + void setGrabberItem(QQuickItem *grabber); - QQuickPointerHandler *pointerHandlerGrabber() const; - void setPointerHandlerGrabber(QQuickPointerHandler *grabber); + QQuickPointerHandler *grabberPointerHandler() const; + void setGrabberPointerHandler(QQuickPointerHandler *grabber); private: QPointF m_pos; diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 20d4b3c5f6..1c6685e12b 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -657,7 +657,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve if (!q->mouseGrabberItem()) item->grabMouse(); auto pointerEventPoint = pointerEvent->pointById(p.id()); - pointerEventPoint->setItemGrabber(item); + pointerEventPoint->setGrabberItem(item); if (checkIfDoubleClicked(event->timestamp())) { QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event, item, false)); @@ -741,14 +741,14 @@ void QQuickWindowPrivate::setMouseGrabber(QQuickItem *grabber) QQuickPointerEvent *event = QQuickPointerDevice::genericMouseDevice()->pointerEvent(); Q_ASSERT(event->pointCount() == 1); - event->point(0)->setItemGrabber(grabber); + event->point(0)->setGrabberItem(grabber); if (grabber && touchMouseId != -1 && touchMouseDevice) { // update the touch item for mouse touch id to the new grabber qCDebug(DBG_TOUCH_TARGET) << "TP (mouse)" << touchMouseId << "->" << q->mouseGrabberItem(); auto point = touchMouseDevice->pointerEvent()->pointById(touchMouseId); if (point) - point->setItemGrabber(grabber); + point->setGrabberItem(grabber); } if (oldGrabber) { @@ -800,7 +800,7 @@ void QQuickWindowPrivate::removeGrabber(QQuickItem *grabber, bool mouse, bool to auto pointerEvent = device->pointerEvent(); for (int i = 0; i < pointerEvent->pointCount(); ++i) { if (pointerEvent->point(i)->grabber() == grabber) { - pointerEvent->point(i)->setItemGrabber(nullptr); + pointerEvent->point(i)->setGrabberItem(nullptr); // FIXME send ungrab event only once grabber->touchUngrabEvent(); } @@ -1469,7 +1469,7 @@ QQuickItem *QQuickWindow::mouseGrabberItem() const { QQuickPointerEvent *event = QQuickPointerDevice::genericMouseDevice()->pointerEvent(); Q_ASSERT(event->pointCount()); - return event->point(0)->itemGrabber(); + return event->point(0)->grabberItem(); } @@ -1613,12 +1613,12 @@ void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEven auto point = pointerEvent->point(0); lastMousePosition = point->scenePos(); - if (point->pointerHandlerGrabber()) { - point->pointerHandlerGrabber()->handlePointerEvent(pointerEvent); + if (point->grabberPointerHandler()) { + point->grabberPointerHandler()->handlePointerEvent(pointerEvent); return; } - QQuickItem *grabber = point->itemGrabber(); + QQuickItem *grabber = point->grabberItem(); if (grabber) { // if the update consists of changing button state, then don't accept it // unless the button is one in which the item is interested @@ -2193,7 +2193,7 @@ void QQuickWindowPrivate::deliverTouchEvent(QQuickPointerTouchEvent *event) if (point->state() == QQuickEventPoint::Released) { int id = point->pointId(); qCDebug(DBG_TOUCH_TARGET) << "TP" << id << "released"; - point->setItemGrabber(nullptr); + point->setGrabberItem(nullptr); if (id == touchMouseId) { touchMouseId = -1; touchMouseDevice = nullptr; @@ -2325,7 +2325,7 @@ bool QQuickWindowPrivate::deliverMatchingPointsToItem(QQuickItem *item, QQuickPo auto pointerEventPoint = event->pointById(point.id()); pointerEventPoint->setAccepted(); if (point.state() == Qt::TouchPointPressed) - pointerEventPoint->setItemGrabber(item); + pointerEventPoint->setGrabberItem(item); } } else { // But if the event was not accepted then we know this item @@ -2334,7 +2334,7 @@ bool QQuickWindowPrivate::deliverMatchingPointsToItem(QQuickItem *item, QQuickPo if (point.state() == Qt::TouchPointPressed) { if (event->pointById(point.id())->grabber() == item) { qCDebug(DBG_TOUCH_TARGET) << "TP" << point.id() << "disassociated"; - event->pointById(point.id())->setItemGrabber(nullptr); + event->pointById(point.id())->setGrabberItem(nullptr); } } } @@ -2573,7 +2573,7 @@ bool QQuickWindowPrivate::sendFilteredTouchEvent(QQuickItem *target, QQuickItem qCDebug(DBG_TOUCH_TARGET) << "TP" << tp.id() << "->" << target; touchMouseId = tp.id(); touchMouseDevice = event->device(); - touchMouseDevice->pointerEvent()->pointById(tp.id())->setItemGrabber(target); + touchMouseDevice->pointerEvent()->pointById(tp.id())->setGrabberItem(target); target->grabMouse(); } filtered = true; |