diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-06-22 11:39:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-22 08:18:15 +0200 |
| commit | db3aa0d40b34cf365540041c148d9bf4f05148d9 (patch) | |
| tree | 4c092616548d5156f1c903afd7e3a1c09a6a6c7b /src/quick/items/qquickflickable_p.h | |
| parent | 18fb5506d524dbe380d5bf636c74c93fb85cbc31 (diff) | |
Rename Flickable x/yOrigin to originX/Y
This is consistent with the naming of other x/y properties, e.g.
contentX/Y, relativeX/Y etc.
Change-Id: I5159f8e54a6fda6a1f83a563ea9db47c3b8af238
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickflickable_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 68e6caee1e..2c7b825b15 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -63,11 +63,11 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem Q_PROPERTY(qreal topMargin READ topMargin WRITE setTopMargin NOTIFY topMarginChanged) Q_PROPERTY(qreal bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged) - Q_PROPERTY(qreal yOrigin READ yOrigin NOTIFY yOriginChanged) + Q_PROPERTY(qreal originY READ originY NOTIFY originYChanged) Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged) Q_PROPERTY(qreal rightMargin READ rightMargin WRITE setRightMargin NOTIFY rightMarginChanged) - Q_PROPERTY(qreal xOrigin READ xOrigin NOTIFY xOriginChanged) + Q_PROPERTY(qreal originX READ originX NOTIFY originXChanged) Q_PROPERTY(qreal horizontalVelocity READ horizontalVelocity NOTIFY horizontalVelocityChanged) Q_PROPERTY(qreal verticalVelocity READ verticalVelocity NOTIFY verticalVelocityChanged) @@ -144,8 +144,8 @@ public: qreal rightMargin() const; void setRightMargin(qreal m); - virtual qreal yOrigin() const; - virtual qreal xOrigin() const; + virtual qreal originY() const; + virtual qreal originX() const; bool isMoving() const; bool isMovingHorizontally() const; @@ -200,8 +200,8 @@ Q_SIGNALS: void bottomMarginChanged(); void leftMarginChanged(); void rightMarginChanged(); - void yOriginChanged(); - void xOriginChanged(); + void originYChanged(); + void originXChanged(); void movingChanged(); void movingHorizontallyChanged(); void movingVerticallyChanged(); |