aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickmousearea.cpp
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2012-10-22 16:59:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-29 16:07:44 +0100
commit55f6a109e99ea2eb3359fa941a1826d4b4e11bf8 (patch)
tree35517eeb69916fed3e8e803cf4bd190125f538b6 /src/quick/items/qquickmousearea.cpp
parent367cf77cd64f1b72496cde5484554ff7a8134f1d (diff)
Renamed QQuickItem::pos property to position
Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/quick/items/qquickmousearea.cpp')
-rw-r--r--src/quick/items/qquickmousearea.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 803840aeaf..ad3f4fa215 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -783,8 +783,8 @@ void QQuickMouseArea::mouseMoveEvent(QMouseEvent *event)
if (d->drag && d->drag->target()) {
if (!d->moved) {
d->targetStartPos = d->drag->target()->parentItem()
- ? d->drag->target()->parentItem()->mapToScene(d->drag->target()->pos())
- : d->drag->target()->pos();
+ ? d->drag->target()->parentItem()->mapToScene(d->drag->target()->position())
+ : d->drag->target()->position();
}
QPointF startLocalPos;
@@ -807,7 +807,7 @@ void QQuickMouseArea::mouseMoveEvent(QMouseEvent *event)
? d->drag->target()->parentItem()->mapFromScene(d->targetStartPos)
: d->targetStartPos;
- QPointF dragPos = d->drag->target()->pos();
+ QPointF dragPos = d->drag->target()->position();
bool dragX = drag()->axis() & QQuickDrag::XAxis;
bool dragY = drag()->axis() & QQuickDrag::YAxis;
@@ -828,7 +828,7 @@ void QQuickMouseArea::mouseMoveEvent(QMouseEvent *event)
y = drag()->ymax();
dragPos.setY(y);
}
- d->drag->target()->setPos(dragPos);
+ d->drag->target()->setPosition(dragPos);
if (!keepMouseGrab()) {
bool xDragged = QQuickWindowPrivate::dragOverThreshold(dx, Qt::XAxis, event);