aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitem.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/qquickitem.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/qquickitem.cpp')
-rw-r--r--src/quick/items/qquickitem.cpp6
1 files changed, 3 insertions, 3 deletions
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;
}