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>

4 files changed, 24 insertions, 21 deletions

diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 0218aa55f0..9d690347b1 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -539,12 +539,12 @@ void QQuickFlickablePrivate::updateBeginningEnd()
 
     if (vData.extentsChanged) {
         vData.extentsChanged = false;
-        emit q->yOriginChanged();
+        emit q->originYChanged();
     }
 
     if (hData.extentsChanged) {
         hData.extentsChanged = false;
-        emit q->xOriginChanged();
+        emit q->originXChanged();
     }
 
     if (atBoundaryChange)
@@ -1835,21 +1835,24 @@ void QQuickFlickable::setRightMargin(qreal m)
 }
 
 /*!
-    \qmlproperty real QtQuick2::Flickable::xOrigin
-    \qmlproperty real QtQuick2::Flickable::yOrigin
+    \qmlproperty real QtQuick2::Flickable::originX
+    \qmlproperty real QtQuick2::Flickable::originY
 
-    These properties hold the origin of the content.  This is usually (0,0), however
-    ListView and GridView may have an arbitrary origin due to delegate size variation,
-    or item insertion/removal outside the visible region.
+    These properties hold the origin of the content. This value always refers
+    to the top-left position of the content regardless of layout direction.
+
+    This is usually (0,0), however ListView and GridView may have an arbitrary
+    origin due to delegate size variation, or item insertion/removal outside
+    the visible region.
 */
 
-qreal QQuickFlickable::yOrigin() const
+qreal QQuickFlickable::originY() const
 {
     Q_D(const QQuickFlickable);
     return -minYExtent() + d->vData.startMargin;
 }
 
-qreal QQuickFlickable::xOrigin() const
+qreal QQuickFlickable::originX() const
 {
     Q_D(const QQuickFlickable);
     return -minXExtent() + d->hData.startMargin;
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();
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 8b8f9356c9..bd7bf32881 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -1347,7 +1347,7 @@ void QQuickItemView::setContentY(qreal pos)
     QQuickFlickable::setContentY(pos);
 }
 
-qreal QQuickItemView::xOrigin() const
+qreal QQuickItemView::originX() const
 {
     Q_D(const QQuickItemView);
     if (d->layoutOrientation() == Qt::Horizontal
@@ -1355,10 +1355,10 @@ qreal QQuickItemView::xOrigin() const
             && contentWidth() < width()) {
         return d->lastPosition() - d->footerSize();
     }
-    return QQuickFlickable::xOrigin();
+    return QQuickFlickable::originX();
 }
 
-qreal QQuickItemView::yOrigin() const
+qreal QQuickItemView::originY() const
 {
     Q_D(const QQuickItemView);
     if (d->layoutOrientation() == Qt::Vertical
@@ -1366,7 +1366,7 @@ qreal QQuickItemView::yOrigin() const
             && contentHeight() < height()) {
         return d->lastPosition() - d->footerSize();
     }
-    return QQuickFlickable::yOrigin();
+    return QQuickFlickable::originY();
 }
 
 void QQuickItemView::updatePolish()
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index 89e59306f9..63f353e161 100644
--- a/src/quick/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -209,8 +209,8 @@ public:
 
     virtual void setContentX(qreal pos);
     virtual void setContentY(qreal pos);
-    virtual qreal xOrigin() const;
-    virtual qreal yOrigin() const;
+    virtual qreal originX() const;
+    virtual qreal originY() const;
 
 signals:
     void modelChanged();