diff options
author | Lars Knoll <lars.knoll@qt.io> | 2019-10-31 09:48:21 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2019-10-31 10:44:44 +0100 |
commit | 893100fba3f3a2e4d4ffe108202fdac67a3d4357 (patch) | |
tree | 2085bfd550d5008c97ceb01aca4f632b1709c9d7 /src/quick/items/qquicklistview.cpp | |
parent | d4442d07190783265120ea7f870d548d7d434749 (diff) |
Fix build after QList->QVector changes in qtbase
Change-Id: I1575c247de26ba08fba349bf879ed3e017530975
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/items/qquicklistview.cpp')
-rw-r--r-- | src/quick/items/qquicklistview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index 725d35f325..23925871e5 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.cpp @@ -455,7 +455,7 @@ qreal QQuickListViewPrivate::lastPosition() const // All visible items are in delayRemove state invisibleCount = model->count(); } - pos = (*(--visibleItems.constEnd()))->endPosition(); + pos = (*(visibleItems.constEnd() - 1))->endPosition(); if (invisibleCount > 0) pos += invisibleCount * (averageSize + spacing); } else if (model && model->count()) { @@ -480,7 +480,7 @@ qreal QQuickListViewPrivate::positionAt(int modelIndex) const return (*visibleItems.constBegin())->position() - count * (averageSize + spacing) - cs; } else { int count = modelIndex - findLastVisibleIndex(visibleIndex) - 1; - return (*(--visibleItems.constEnd()))->endPosition() + spacing + count * (averageSize + spacing); + return (*(visibleItems.constEnd() - 1))->endPosition() + spacing + count * (averageSize + spacing); } } return 0; @@ -496,7 +496,7 @@ qreal QQuickListViewPrivate::endPositionAt(int modelIndex) const return (*visibleItems.constBegin())->position() - (count - 1) * (averageSize + spacing) - spacing; } else { int count = modelIndex - findLastVisibleIndex(visibleIndex) - 1; - return (*(--visibleItems.constEnd()))->endPosition() + count * (averageSize + spacing); + return (*(visibleItems.constEnd() - 1))->endPosition() + count * (averageSize + spacing); } } return 0; @@ -522,7 +522,7 @@ qreal QQuickListViewPrivate::snapPosAt(qreal pos) return snapItem->itemPosition(); if (visibleItems.count()) { qreal firstPos = (*visibleItems.constBegin())->position(); - qreal endPos = (*(--visibleItems.constEnd()))->position(); + qreal endPos = (*(visibleItems.constEnd() - 1))->position(); if (pos < firstPos) { return firstPos - qRound((firstPos - pos) / averageSize) * averageSize; } else if (pos > endPos) @@ -667,7 +667,7 @@ bool QQuickListViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, qreal qreal itemEnd = visiblePos; if (visibleItems.count()) { visiblePos = (*visibleItems.constBegin())->position(); - itemEnd = (*(--visibleItems.constEnd()))->endPosition() + spacing; + itemEnd = (*(visibleItems.constEnd() - 1))->endPosition() + spacing; } int modelIndex = findLastVisibleIndex(); |