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/qquickevents.cpp | |
| 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/qquickevents.cpp')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 16 |
1 files changed, 8 insertions, 8 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 |