diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-10-22 16:59:25 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 16:07:44 +0100 |
commit | 55f6a109e99ea2eb3359fa941a1826d4b4e11bf8 (patch) | |
tree | 35517eeb69916fed3e8e803cf4bd190125f538b6 /src/quick/items/qquickitemviewtransition.cpp | |
parent | 367cf77cd64f1b72496cde5484554ff7a8134f1d (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/qquickitemviewtransition.cpp')
-rw-r--r-- | src/quick/items/qquickitemviewtransition.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 18953cf227..029446a2f0 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -368,7 +368,7 @@ qreal QQuickItemViewTransitionableItem::itemY() const void QQuickItemViewTransitionableItem::moveTo(const QPointF &pos, bool immediate) { if (!nextTransitionFromSet && nextTransitionType != QQuickItemViewTransitioner::NoTransition) { - nextTransitionFrom = item->pos(); + nextTransitionFrom = item->position(); nextTransitionFromSet = true; } @@ -378,7 +378,7 @@ void QQuickItemViewTransitionableItem::moveTo(const QPointF &pos, bool immediate if (immediate || !transitionScheduledOrRunning()) { if (immediate) stopTransition(); - item->setPos(pos); + item->setPosition(pos); } else { nextTransitionTo = pos; nextTransitionToSet = true; @@ -415,7 +415,7 @@ bool QQuickItemViewTransitionableItem::prepareTransition(QQuickItemViewTransitio // This ensures that removed targets don't transition to the default (0,0) and that // items set for other transition types only transition if they actually move somewhere. if (!nextTransitionToSet) - moveTo(item->pos()); + moveTo(item->position()); } else { // don't start displaced transitions that don't move anywhere if (!nextTransitionToSet || (nextTransitionFromSet && nextTransitionFrom == nextTransitionTo)) { @@ -480,7 +480,7 @@ bool QQuickItemViewTransitionableItem::prepareTransition(QQuickItemViewTransitio if (!doTransition) { // if transition type is not valid, the previous transition still has to be // canceled so that the item can move immediately to the right position - item->setPos(nextTransitionTo); + item->setPosition(nextTransitionTo); stopTransition(); } |