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>

15 files changed, 35 insertions, 36 deletions

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
index d6fc0b27a5..b85987457e 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
@@ -113,13 +113,13 @@ void Highlight::adjust()
     QQuickWindow *view = m_item->window();
     if (view->contentItem()) {
         scaleFactor = view->contentItem()->scale();
-        originOffset -= view->contentItem()->pos();
+        originOffset -= view->contentItem()->position();
     }
     // The scale transform for the overlay needs to be cancelled
     // as the Item's transform which will be applied to the painter
     // takes care of it.
     parentItem()->setScale(1/scaleFactor);
-    setPos(originOffset);
+    setPosition(originOffset);
     update();
 }
 
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
index 8cd40b4e0c..d05f4b9b59 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
@@ -67,7 +67,7 @@ InspectTool::InspectTool(QQuickViewInspector *inspector, QQuickView *view) :
     m_didPressAndHold(false),
     m_tapEvent(false),
     m_contentItem(view->contentItem()),
-    m_originalPosition(view->contentItem()->pos()),
+    m_originalPosition(view->contentItem()->position()),
     m_smoothScaleFactor(Constants::ZoomSnapDelta),
     m_minScale(0.125f),
     m_maxScale(48.0f),
@@ -100,14 +100,14 @@ void InspectTool::enable(bool enable)
         // restoring the original states.
         if (m_contentItem) {
             m_contentItem->setScale(m_originalScale);
-            m_contentItem->setPos(m_originalPosition);
+            m_contentItem->setPosition(m_originalPosition);
             m_contentItem->setSmooth(m_originalSmooth);
         }
     } else {
         if (m_contentItem) {
             m_originalSmooth = m_contentItem->smooth();
             m_originalScale = m_contentItem->scale();
-            m_originalPosition = m_contentItem->pos();
+            m_originalPosition = m_contentItem->position();
             m_contentItem->setSmooth(true);
         }
     }
@@ -288,9 +288,9 @@ void InspectTool::scaleView(const qreal &factor, const QPointF &newcenter, const
         return;
     }
     //New position = new center + scalefactor * (oldposition - oldcenter)
-    QPointF newPosition = newcenter + (factor * (m_contentItem->pos() - oldcenter));
+    QPointF newPosition = newcenter + (factor * (m_contentItem->position() - oldcenter));
     m_contentItem->setScale(m_contentItem->scale() * factor);
-    m_contentItem->setPos(newPosition);
+    m_contentItem->setPosition(newPosition);
 }
 
 void InspectTool::zoomIn()
@@ -309,7 +309,7 @@ void InspectTool::zoomTo100()
 {
     m_didPressAndHold = true;
 
-    m_contentItem->setPos(QPointF(0, 0));
+    m_contentItem->setPosition(QPointF(0, 0));
     m_contentItem->setScale(1.0);
 }
 
@@ -361,9 +361,9 @@ void InspectTool::initializeDrag(const QPointF &pos)
 
 void InspectTool::dragItemToPosition()
 {
-    QPointF newPosition = m_contentItem->pos() + m_mousePosition - m_dragStartPosition;
+    QPointF newPosition = m_contentItem->position() + m_mousePosition - m_dragStartPosition;
     m_dragStartPosition = m_mousePosition;
-    m_contentItem->setPos(newPosition);
+    m_contentItem->setPosition(newPosition);
 }
 
 void InspectTool::moveItem(bool valid)
diff --git a/src/quick/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp
index 8be2d39398..f264680ddb 100644
--- a/src/quick/items/qquickanchors.cpp
+++ b/src/quick/items/qquickanchors.cpp
@@ -398,7 +398,7 @@ void QQuickAnchorsPrivate::setItemY(qreal v)
 void QQuickAnchorsPrivate::setItemPos(const QPointF &v)
 {
     updatingMe = true;
-    item->setPos(v);
+    item->setPosition(v);
     updatingMe = false;
 }
 
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 3ef8c1d67f..2d9c95ea7f 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -684,7 +684,7 @@ void QQuickGridViewPrivate::repositionPackageItemAt(QQuickItem *item, int index)
             qreal y = (verticalLayoutDirection == QQuickItemView::TopToBottom)
                     ? rowPosAt(index)
                     : -rowPosAt(index) - item->height();
-            item->setPos(QPointF(colPosAt(index), y));
+            item->setPosition(QPointF(colPosAt(index), y));
         }
     } else {
         if (item->x() + item->width() > pos && item->x() < pos + q->width()) {
@@ -692,9 +692,9 @@ void QQuickGridViewPrivate::repositionPackageItemAt(QQuickItem *item, int index)
                     ? colPosAt(index)
                     : -colPosAt(index) - item->height();
             if (flow == QQuickGridView::FlowTopToBottom && q->effectiveLayoutDirection() == Qt::RightToLeft)
-                item->setPos(QPointF(-rowPosAt(index)-item->width(), y));
+                item->setPosition(QPointF(-rowPosAt(index)-item->width(), y));
             else
-                item->setPos(QPointF(rowPosAt(index), y));
+                item->setPosition(QPointF(rowPosAt(index), y));
         }
     }
 }
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 9180eb45cb..e557ce4e1b 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -5319,7 +5319,7 @@ qreal QQuickItem::y() const
 /*!
     \internal
   */
-QPointF QQuickItem::pos() const
+QPointF QQuickItem::position() const
 {
     Q_D(const QQuickItem);
     return QPointF(d->x, d->y);
@@ -5358,7 +5358,7 @@ void QQuickItem::setY(qreal v)
 /*!
     \internal
   */
-void QQuickItem::setPos(const QPointF &pos)
+void QQuickItem::setPosition(const QPointF &pos)
 {
     Q_D(QQuickItem);
     if (QPointF(d->x, d->y) == pos)
@@ -6554,7 +6554,7 @@ QDebug operator<<(QDebug debug, QQuickItem *item)
     debug << item->metaObject()->className() << "(this =" << ((void*)item)
           << ", name=" << item->objectName()
           << ", parent =" << ((void*)item->parentItem())
-          << ", geometry =" << QRectF(item->pos(), QSizeF(item->width(), item->height()))
+          << ", geometry =" << QRectF(item->position(), QSizeF(item->width(), item->height()))
           << ", z =" << item->z() << ')';
     return debug;
 }
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index a41aa7f27f..bba26be060 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -105,7 +105,6 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus
     Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QObject> resources READ resources DESIGNABLE false)
     Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
 
-    Q_PROPERTY(QPointF pos READ pos FINAL)
     Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged FINAL)
     Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged FINAL)
     Q_PROPERTY(qreal z READ z WRITE setZ NOTIFY zChanged FINAL)
@@ -220,10 +219,10 @@ public:
 
     qreal x() const;
     qreal y() const;
-    QPointF pos() const;
+    QPointF position() const;
     void setX(qreal);
     void setY(qreal);
-    void setPos(const QPointF &);
+    void setPosition(const QPointF &);
 
     qreal width() const;
     void setWidth(qreal);
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index ef2248d2cf..769f17ffc8 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -899,7 +899,7 @@ QAbstractAnimationJob* QQuickPathAnimation::transition(QQuickStateActions &actio
                     QPointF pathPos = QQuickPath::sequentialPointAt(prevData.painterPath, prevData.pathLength, prevData.attributePoints, prevData.prevBez, prevData.currentV);
                     if (!prevData.anchorPoint.isNull())
                         pathPos -= prevData.anchorPoint;
-                    if (pathPos == data->target->pos()) {   //only treat as interruption if we interrupted ourself
+                    if (pathPos == data->target->position()) {   //only treat as interruption if we interrupted ourself
                         data->painterPath = prevData.painterPath;
                         data->toDefined = data->fromDefined = data->fromSourced = true;
                         data->prevBez.isValid = false;
@@ -961,7 +961,7 @@ void QQuickPathAnimationUpdater::setValue(qreal v)
         }
     }
 
-    target->setPos(currentPos);
+    target->setPosition(currentPos);
 
     //adjust angle according to orientation
     if (!fixed) {
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 8cb22dcb5e..1ac8fcd436 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -85,7 +85,7 @@ void FxViewItem::moveTo(const QPointF &pos, bool immediate)
     if (transitionableItem)
         transitionableItem->moveTo(pos, immediate);
     else
-        item->setPos(pos);
+        item->setPosition(pos);
 }
 
 void FxViewItem::setVisible(bool visible)
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();
     }
 
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);
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index 2bf9016e47..5dcea62281 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -423,7 +423,7 @@ void QQuickPinchArea::updatePinch()
                         grabMouse();
                     setKeepMouseGrab(true);
                     if (d->pinch && d->pinch->target()) {
-                        d->pinchStartPos = pinch()->target()->pos();
+                        d->pinchStartPos = pinch()->target()->position();
                         d->pinchStartScale = d->pinch->target()->scale();
                         d->pinchStartRotation = d->pinch->target()->rotation();
                         d->pinch->setActive(true);
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index a253bcc5c9..b9db330a1d 100644
--- a/src/quick/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -102,7 +102,7 @@ void QQuickBasePositioner::PositionedItem::moveTo(const QPointF &pos)
     if (transitionableItem)
         transitionableItem->moveTo(pos);
     else
-        item->setPos(pos);
+        item->setPosition(pos);
 }
 
 void QQuickBasePositioner::PositionedItem::transitionNextReposition(QQuickItemViewTransitioner *transitioner, QQuickItemViewTransitioner::TransitionType type, bool asTarget)
diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index c30b0ee91e..50ab907078 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -132,7 +132,7 @@ void QQuickParentChangePrivate::doChange(QQuickItem *targetParent, QQuickItem *s
 
         if (ok) {
             //qDebug() << x << y << rotation << scale;
-            target->setPos(QPointF(x, y));
+            target->setPosition(QPointF(x, y));
             target->setRotation(target->rotation() + rotation);
             target->setScale(target->scale() * scale);
         }
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 8cee9eb9c6..fee49593ee 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -2575,7 +2575,7 @@ void QQuickTextInput::updateCursorRectangle()
     emit cursorRectangleChanged();
     if (d->cursorItem) {
         QRectF r = cursorRectangle();
-        d->cursorItem->setPos(r.topLeft());
+        d->cursorItem->setPosition(r.topLeft());
         d->cursorItem->setHeight(r.height());
     }
 #ifndef QT_NO_IM
diff --git a/src/quick/items/qquicktextutil.cpp b/src/quick/items/qquicktextutil.cpp
index d393142e2c..40287a730c 100644
--- a/src/quick/items/qquicktextutil.cpp
+++ b/src/quick/items/qquicktextutil.cpp
@@ -60,7 +60,7 @@ QQuickItem *QQuickTextUtil::createCursor(
             if ((item = qobject_cast<QQuickItem *>(object))) {
                 QQml_setParent_noEvent(item, parent);
                 item->setParentItem(parent);
-                item->setPos(rectangle.topLeft());
+                item->setPosition(rectangle.topLeft());
                 item->setHeight(rectangle.height());
             } else {
                 qmlInfo(parent) << tr("%1 does not support loading non-visual cursor delegates.")