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/qquickitemview.cpp | |
| 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/qquickitemview.cpp')
| -rw-r--r-- | src/quick/items/qquickitemview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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() |