aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/handlers/qquicksinglepointhandler.cpp
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2017-09-03 18:42:09 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2017-09-05 11:52:48 +0000
commit2617ac5b9df7dfdecf0cb02d5933c40df1a55bbc (patch)
treeb14cbc0f7335a0397e09014e1953213d086b9ffa /src/quick/handlers/qquicksinglepointhandler.cpp
parentbe3559470ac934dcfed881996be0eeb1269e6f96 (diff)
rename QQuickEventPoint pos properties to position
For consistency we always spell it out, although it does make some of these properties inconveniently verbose. Change-Id: I64a08c3aa261c0ab89e09472dd47510abafbf7ca Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/handlers/qquicksinglepointhandler.cpp')
-rw-r--r--src/quick/handlers/qquicksinglepointhandler.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/handlers/qquicksinglepointhandler.cpp b/src/quick/handlers/qquicksinglepointhandler.cpp
index 8747f5023d..2588c4c180 100644
--- a/src/quick/handlers/qquicksinglepointhandler.cpp
+++ b/src/quick/handlers/qquicksinglepointhandler.cpp
@@ -135,15 +135,15 @@ void QQuickSinglePointHandler::handlePointerEventImpl(QQuickPointerEvent *event)
m_pointInfo.m_pressure = event->buttons() ? 1 : 0;
m_pointInfo.m_ellipseDiameters = QSizeF();
}
- m_pointInfo.m_position = currentPoint->pos();
- m_pointInfo.m_scenePosition = currentPoint->scenePos();
+ m_pointInfo.m_position = currentPoint->position();
+ m_pointInfo.m_scenePosition = currentPoint->scenePosition();
if (currentPoint->state() == QQuickEventPoint::Updated)
m_pointInfo.m_velocity = currentPoint->velocity();
handleEventPoint(currentPoint);
switch (currentPoint->state()) {
case QQuickEventPoint::Pressed:
- m_pointInfo.m_pressPosition = currentPoint->pos();
- m_pointInfo.m_scenePressPosition = currentPoint->scenePos();
+ m_pointInfo.m_pressPosition = currentPoint->position();
+ m_pointInfo.m_scenePressPosition = currentPoint->scenePosition();
m_pointInfo.m_pressedButtons = event->buttons();
break;
case QQuickEventPoint::Released:
@@ -169,12 +169,12 @@ void QQuickSinglePointHandler::onGrabChanged(QQuickPointerHandler *grabber, QQui
return;
switch (stateChange) {
case QQuickEventPoint::GrabExclusive:
- m_pointInfo.m_sceneGrabPosition = point->sceneGrabPos();
+ m_pointInfo.m_sceneGrabPosition = point->sceneGrabPosition();
setActive(true);
QQuickPointerHandler::onGrabChanged(grabber, stateChange, point);
break;
case QQuickEventPoint::GrabPassive:
- m_pointInfo.m_sceneGrabPosition = point->sceneGrabPos();
+ m_pointInfo.m_sceneGrabPosition = point->sceneGrabPosition();
QQuickPointerHandler::onGrabChanged(grabber, stateChange, point);
break;
case QQuickEventPoint::OverrideGrabPassive:
@@ -199,7 +199,7 @@ void QQuickSinglePointHandler::setIgnoreAdditionalPoints(bool v)
void QQuickSinglePointHandler::moveTarget(QPointF pos, QQuickEventPoint *point)
{
target()->setPosition(pos);
- m_pointInfo.m_scenePosition = point->scenePos();
+ m_pointInfo.m_scenePosition = point->scenePosition();
m_pointInfo.m_position = target()->mapFromScene(m_pointInfo.m_scenePosition);
}