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/qquickitem.h | |
| 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/qquickitem.h')
| -rw-r--r-- | src/quick/items/qquickitem.h | 5 |
1 files changed, 2 insertions, 3 deletions
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); |