From e5592e75b5d17f409a0623f663474f963d66486b Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Tue, 9 Aug 2016 18:32:48 +0300 Subject: Quick: use const (and const APIs) more For CoW types, prefer const methods to avoid needless detach()ing. Change-Id: I270cdc6eb8c5946f5c20b379bbb7c60f0ba518eb Reviewed-by: Shawn Rutledge Reviewed-by: Simon Hausmann --- .../context2d/qquickcontext2dcommandbuffer_p.h | 22 ++-- src/quick/items/qquickgridview.cpp | 18 ++-- src/quick/items/qquickimagebase.cpp | 2 +- src/quick/items/qquickitemanimation.cpp | 4 +- src/quick/items/qquickitemview.cpp | 33 +++--- src/quick/items/qquicklistview.cpp | 24 ++--- src/quick/items/qquickmultipointtoucharea.cpp | 4 +- src/quick/items/qquickmultipointtoucharea_p.h | 2 +- src/quick/items/qquickpathview.cpp | 12 +-- src/quick/items/qquickspriteengine.cpp | 114 ++++++++++----------- src/quick/items/qquickspriteengine_p.h | 34 +++--- src/quick/items/qquickwindow.cpp | 12 +-- src/quick/scenegraph/coreapi/qsgnode.cpp | 2 +- src/quick/util/qquickanimatorcontroller.cpp | 2 +- src/quick/util/qquickfontloader.cpp | 4 +- src/quick/util/qquickpath.cpp | 8 +- src/quick/util/qquickpixmapcache.cpp | 2 +- src/quick/util/qquickpropertychanges.cpp | 4 +- src/quick/util/qquicksmoothedanimation.cpp | 2 +- src/quick/util/qquicktimeline.cpp | 2 +- 20 files changed, 154 insertions(+), 153 deletions(-) (limited to 'src/quick') diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h index a82b88f36f..f281cec2d5 100644 --- a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h @@ -70,7 +70,7 @@ public: inline int size() {return commands.size();} inline bool isEmpty() const {return commands.isEmpty(); } inline bool hasNext() const {return cmdIdx < commands.size(); } - inline QQuickContext2D::PaintCommand takeNextCommand() { return commands[cmdIdx++]; } + inline QQuickContext2D::PaintCommand takeNextCommand() { return commands.at(cmdIdx++); } inline qreal takeGlobalAlpha() { return takeReal(); } inline QPainter::CompositionMode takeGlobalCompositeOperation(){ return static_cast(takeInt()); } @@ -227,20 +227,20 @@ public: colors << color; } - inline QTransform takeMatrix() { return matrixes[matrixIdx++]; } + inline QTransform takeMatrix() { return matrixes.at(matrixIdx++); } - inline QRectF takeRect() { return rects[rectIdx++]; } + inline QRectF takeRect() { return rects.at(rectIdx++); } - inline QPainterPath takePath() { return pathes[pathIdx++]; } + inline QPainterPath takePath() { return pathes.at(pathIdx++); } - inline const QImage& takeImage() { return images[imageIdx++]; } - inline QQmlRefPointer takePixmap() { return pixmaps[pixmapIdx++]; } + inline const QImage& takeImage() { return images.at(imageIdx++); } + inline QQmlRefPointer takePixmap() { return pixmaps.at(pixmapIdx++); } - inline int takeInt() { return ints[intIdx++]; } - inline bool takeBool() {return bools[boolIdx++]; } - inline qreal takeReal() { return reals[realIdx++]; } - inline QColor takeColor() { return colors[colorIdx++]; } - inline QBrush takeBrush() { return brushes[brushIdx++]; } + inline int takeInt() { return ints.at(intIdx++); } + inline bool takeBool() {return bools.at(boolIdx++); } + inline qreal takeReal() { return reals.at(realIdx++); } + inline QColor takeColor() { return colors.at(colorIdx++); } + inline QBrush takeBrush() { return brushes.at(brushIdx++); } void replay(QPainter* painter, QQuickContext2D::State& state, const QVector2D &scaleFactor); diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp index cb2611199e..b5d5e43f7a 100644 --- a/src/quick/items/qquickgridview.cpp +++ b/src/quick/items/qquickgridview.cpp @@ -478,7 +478,7 @@ bool QQuickGridViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, qreal qreal colPos = colPosAt(visibleIndex); qreal rowPos = rowPosAt(visibleIndex); if (visibleItems.count()) { - FxGridItemSG *lastItem = static_cast(visibleItems.last()); + FxGridItemSG *lastItem = static_cast(visibleItems.constLast()); rowPos = lastItem->rowPos(); int colNum = qFloor((lastItem->colPos()+colSize()/2) / colSize()); if (++colNum >= columns) { @@ -536,7 +536,7 @@ bool QQuickGridViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, qreal // Find first column if (visibleItems.count()) { - FxGridItemSG *firstItem = static_cast(visibleItems.first()); + FxGridItemSG *firstItem = static_cast(visibleItems.constFirst()); rowPos = firstItem->rowPos(); colNum = qFloor((firstItem->colPos()+colSize()/2) / colSize()); if (--colNum < 0) { @@ -586,7 +586,7 @@ bool QQuickGridViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal buffer bool changed = false; while (visibleItems.count() > 1 - && (item = static_cast(visibleItems.first())) + && (item = static_cast(visibleItems.constFirst())) && item->rowPos()+rowSize()-1 < bufferFrom - rowSize()*(item->colPos()/colSize()+1)/(columns+1)) { if (item->attached->delayRemove()) break; @@ -598,7 +598,7 @@ bool QQuickGridViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal buffer changed = true; } while (visibleItems.count() > 1 - && (item = static_cast(visibleItems.last())) + && (item = static_cast(visibleItems.constLast())) && item->rowPos() > bufferTo + rowSize()*(columns - item->colPos()/colSize())/(columns+1)) { if (item->attached->delayRemove()) break; @@ -623,7 +623,7 @@ void QQuickGridViewPrivate::layoutVisibleItems(int fromModelIndex) const qreal from = isContentFlowReversed() ? -position()-displayMarginBeginning-size() : position()-displayMarginBeginning; const qreal to = isContentFlowReversed() ? -position()+displayMarginEnd : position()+size()+displayMarginEnd; - FxGridItemSG *firstItem = static_cast(visibleItems.first()); + FxGridItemSG *firstItem = static_cast(visibleItems.constFirst()); qreal rowPos = firstItem->rowPos(); qreal colPos = firstItem->colPos(); int col = visibleIndex % columns; @@ -679,7 +679,7 @@ void QQuickGridViewPrivate::repositionPackageItemAt(QQuickItem *item, int index) void QQuickGridViewPrivate::resetFirstItemPosition(qreal pos) { - FxGridItemSG *item = static_cast(visibleItems.first()); + FxGridItemSG *item = static_cast(visibleItems.constFirst()); item->setPosition(0, pos); } @@ -692,7 +692,7 @@ void QQuickGridViewPrivate::adjustFirstItem(qreal forwards, qreal backwards, int if (moveCount == 0 && changeBeforeVisible != 0) moveCount += (changeBeforeVisible % columns) - (columns - 1); - FxGridItemSG *gridItem = static_cast(visibleItems.first()); + FxGridItemSG *gridItem = static_cast(visibleItems.constFirst()); gridItem->setPosition(gridItem->colPos(), gridItem->rowPos() + ((moveCount / columns) * rowSize())); } @@ -2517,7 +2517,7 @@ void QQuickGridViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex int markerItemIndex = -1; for (int i=0; iindex == afterModelIndex) { + if (visibleItems.at(i)->index == afterModelIndex) { markerItemIndex = i; break; } @@ -2536,7 +2536,7 @@ void QQuickGridViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex countItemsRemoved -= removalResult.countChangeAfterVisibleItems; for (int i=markerItemIndex+1; iposition() < viewEndPos; i++) { - FxGridItemSG *gridItem = static_cast(visibleItems[i]); + FxGridItemSG *gridItem = static_cast(visibleItems.at(i)); if (!gridItem->transitionScheduledOrRunning()) { qreal origRowPos = gridItem->colPos(); qreal origColPos = gridItem->rowPos(); diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp index 60e31631c0..a2b99b6395 100644 --- a/src/quick/items/qquickimagebase.cpp +++ b/src/quick/items/qquickimagebase.cpp @@ -355,7 +355,7 @@ void QQuickImageBase::resolve2xLocalFile(const QUrl &url, qreal targetDevicePixe if (disable2xImageLoading) return; - QString localFile = QQmlFile::urlToLocalFileOrQrc(url); + const QString localFile = QQmlFile::urlToLocalFileOrQrc(url); // Non-local file path: @2x loading is not supported. if (localFile.isEmpty()) diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp index 027c07ec07..5c0caf5ca2 100644 --- a/src/quick/items/qquickitemanimation.cpp +++ b/src/quick/items/qquickitemanimation.cpp @@ -339,9 +339,9 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act qreal w = target->width(); qreal h = target->height(); if (pc->widthIsSet() && i < actions.size() - 1) - w = actions[++i].toValue.toReal(); + w = actions.at(++i).toValue.toReal(); if (pc->heightIsSet() && i < actions.size() - 1) - h = actions[++i].toValue.toReal(); + h = actions.at(++i).toValue.toReal(); const QPointF &transformOrigin = d->computeTransformOrigin(target->transformOrigin(), w,h); qreal tempxt = transformOrigin.x(); diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 3c1a5a6ebe..d3f045f35c 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -1199,9 +1199,9 @@ void QQuickItemViewPrivate::showVisibleItems() const { qDebug() << "Visible items:"; for (int i = 0; i < visibleItems.count(); ++i) { - qDebug() << "\t" << visibleItems[i]->index - << visibleItems[i]->item->objectName() - << visibleItems[i]->position(); + qDebug() << "\t" << visibleItems.at(i)->index + << visibleItems.at(i)->item->objectName() + << visibleItems.at(i)->position(); } } @@ -1998,7 +1998,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult prevViewPos = prevFirstVisible->position(); prevFirstVisibleIndex = prevFirstVisible->index; } - qreal prevVisibleItemsFirstPos = visibleItems.count() ? visibleItems.first()->position() : 0.0; + qreal prevVisibleItemsFirstPos = visibleItems.count() ? visibleItems.constFirst()->position() : 0.0; totalInsertionResult->visiblePos = prevViewPos; totalRemovalResult->visiblePos = prevViewPos; @@ -2077,13 +2077,13 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult // can transition it from this "original" position to its new position in the view if (transitioner && transitioner->canTransition(QQuickItemViewTransitioner::MoveTransition, true)) { for (int i=0; i= 0) { if (prevFirstVisibleIndex >= 0 && fromIndex < prevFirstVisibleIndex) - repositionItemAt(movingIntoView[i].item, fromIndex, -totalInsertionResult->sizeChangesAfterVisiblePos); + repositionItemAt(movingIntoView.at(i).item, fromIndex, -totalInsertionResult->sizeChangesAfterVisiblePos); else - repositionItemAt(movingIntoView[i].item, fromIndex, totalInsertionResult->sizeChangesAfterVisiblePos); - movingIntoView[i].item->transitionNextReposition(transitioner, QQuickItemViewTransitioner::MoveTransition, true); + repositionItemAt(movingIntoView.at(i).item, fromIndex, totalInsertionResult->sizeChangesAfterVisiblePos); + movingIntoView.at(i).item->transitionNextReposition(transitioner, QQuickItemViewTransitioner::MoveTransition, true); } } } @@ -2129,11 +2129,11 @@ bool QQuickItemViewPrivate::applyRemovalChange(const QQmlChangeSet::Change &remo Q_Q(QQuickItemView); bool visibleAffected = false; - if (visibleItems.count() && removal.index + removal.count > visibleItems.last()->index) { - if (removal.index > visibleItems.last()->index) + if (visibleItems.count() && removal.index + removal.count > visibleItems.constLast()->index) { + if (removal.index > visibleItems.constLast()->index) removeResult->countChangeAfterVisibleItems += removal.count; else - removeResult->countChangeAfterVisibleItems += ((removal.index + removal.count - 1) - visibleItems.last()->index); + removeResult->countChangeAfterVisibleItems += ((removal.index + removal.count - 1) - visibleItems.constLast()->index); } QList::Iterator it = visibleItems.begin(); @@ -2223,10 +2223,11 @@ void QQuickItemViewPrivate::repositionFirstItem(FxViewItem *prevVisibleItemsFirs qreal moveBackwardsBy = 0; // shift visibleItems.first() relative to the number of added/removed items - if (visibleItems.first()->position() > prevViewPos) { + const auto pos = visibleItems.constFirst()->position(); + if (pos > prevViewPos) { moveForwardsBy = insertionResult->sizeChangesAfterVisiblePos; moveBackwardsBy = removalResult->sizeChangesAfterVisiblePos; - } else if (visibleItems.first()->position() < prevViewPos) { + } else if (pos < prevViewPos) { moveForwardsBy = removalResult->sizeChangesBeforeVisiblePos; moveBackwardsBy = insertionResult->sizeChangesBeforeVisiblePos; } @@ -2304,7 +2305,7 @@ bool QQuickItemViewPrivate::prepareNonVisibleItemTransition(FxViewItem *item, co void QQuickItemViewPrivate::viewItemTransitionFinished(QQuickItemViewTransitionableItem *item) { for (int i=0; itransitionableItem == item) { + if (releasePendingTransition.at(i)->transitionableItem == item) { releaseItem(releasePendingTransition.takeAt(i)); return; } @@ -2324,8 +2325,8 @@ FxViewItem *QQuickItemViewPrivate::createItem(int modelIndex, bool asynchronous) return 0; for (int i=0; iindex == modelIndex - && !releasePendingTransition[i]->isPendingRemoval()) { + if (releasePendingTransition.at(i)->index == modelIndex + && !releasePendingTransition.at(i)->isPendingRemoval()) { releasePendingTransition[i]->releaseAfterTransition = false; return releasePendingTransition.takeAt(i); } diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index 7bbc6dc9ba..50d75d3dab 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.cpp @@ -400,7 +400,7 @@ FxViewItem *QQuickListViewPrivate::itemBefore(int modelIndex) const ++idx; } if (lastIndex == modelIndex-1) - return visibleItems.last(); + return visibleItems.constLast(); return 0; } @@ -752,7 +752,7 @@ bool QQuickListViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal buffer } } - while (visibleItems.count() > 1 && (item = visibleItems.last()) && item->position() > bufferTo) { + while (visibleItems.count() > 1 && (item = visibleItems.constLast()) && item->position() > bufferTo) { if (item->attached->delayRemove()) break; qCDebug(lcItemViewDelegateLifecycle) << "refill: remove last" << visibleIndex+visibleItems.count()-1 << item->position() << (QObject *)(item->item); @@ -839,7 +839,7 @@ void QQuickListViewPrivate::repositionPackageItemAt(QQuickItem *item, int index) void QQuickListViewPrivate::resetFirstItemPosition(qreal pos) { - FxListItemSG *item = static_cast(visibleItems.first()); + FxListItemSG *item = static_cast(visibleItems.constFirst()); item->setPosition(pos); } @@ -848,12 +848,12 @@ void QQuickListViewPrivate::adjustFirstItem(qreal forwards, qreal backwards, int if (!visibleItems.count()) return; qreal diff = forwards - backwards; - static_cast(visibleItems.first())->setPosition(visibleItems.first()->position() + diff); + static_cast(visibleItems.constFirst())->setPosition(visibleItems.constFirst()->position() + diff); } void QQuickListViewPrivate::updateSizeChangesBeforeVisiblePos(FxViewItem *item, ChangeResult *removeResult) { - if (item != visibleItems.first()) + if (item != visibleItems.constFirst()) QQuickItemViewPrivate::updateSizeChangesBeforeVisiblePos(item, removeResult); } @@ -1270,7 +1270,7 @@ void QQuickListViewPrivate::initializeCurrentItem() if (!actualItem) { if (currentIndex == visibleIndex - 1 && visibleItems.count()) { // We can calculate exact postion in this case - listItem->setPosition(visibleItems.first()->position() - currentItem->size() - spacing); + listItem->setPosition(visibleItems.constFirst()->position() - currentItem->size() - spacing); } else { // Create current item now and position as best we can. // Its position will be corrected when it becomes visible. @@ -1424,8 +1424,8 @@ void QQuickListViewPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometry // if visibleItems.first() has resized, adjust its pos since it is used to // position all subsequent items - if (visibleItems.count() && item == visibleItems.first()->item) { - FxListItemSG *listItem = static_cast(visibleItems.first()); + if (visibleItems.count() && item == visibleItems.constFirst()->item) { + FxListItemSG *listItem = static_cast(visibleItems.constFirst()); const QRectF oldGeometry(item->x() - diff.x(), item->y() - diff.y(), item->width() - diff.width(), @@ -3111,7 +3111,7 @@ bool QQuickListViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch int i = visibleItems.count() - 1; while (i > 0 && visibleItems.at(i)->index == -1) --i; - if (i == 0 && visibleItems.first()->index == -1) { + if (i == 0 && visibleItems.constFirst()->index == -1) { // there are no visible items except items marked for removal index = visibleItems.count(); } else if (visibleItems.at(i)->index + 1 == modelIndex @@ -3136,7 +3136,7 @@ bool QQuickListViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch qreal pos = 0; if (visibleItems.count()) { pos = index < visibleItems.count() ? visibleItems.at(index)->position() - : visibleItems.last()->endPosition()+spacing; + : visibleItems.constLast()->endPosition() + spacing; } // Update the indexes of the following visible items. @@ -3271,7 +3271,7 @@ void QQuickListViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex int markerItemIndex = -1; for (int i=0; iindex == afterModelIndex) { + if (visibleItems.at(i)->index == afterModelIndex) { markerItemIndex = i; break; } @@ -3284,7 +3284,7 @@ void QQuickListViewPrivate::translateAndTransitionItemsAfter(int afterModelIndex - (removalResult.countChangeAfterVisibleItems * (averageSize + spacing)); for (int i=markerItemIndex+1; iposition() < viewEndPos; i++) { - FxListItemSG *listItem = static_cast(visibleItems[i]); + FxListItemSG *listItem = static_cast(visibleItems.at(i)); if (!listItem->transitionScheduledOrRunning()) { qreal pos = listItem->position(); listItem->setPosition(pos - sizeRemoved); diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 89bff6e057..d31807de7f 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -549,13 +549,13 @@ void QQuickMultiPointTouchArea::updateTouchData(QEvent *event) addTouchPoint(&p); started = true; } else if (touchPointState & Qt::TouchPointMoved) { - QQuickTouchPoint* dtp = static_cast(_touchPoints[id]); + QQuickTouchPoint* dtp = static_cast(_touchPoints.value(id)); Q_ASSERT(dtp); _movedTouchPoints.append(dtp); updateTouchPoint(dtp,&p); moved = true; } else { - QQuickTouchPoint* dtp = static_cast(_touchPoints[id]); + QQuickTouchPoint* dtp = static_cast(_touchPoints.value(id)); Q_ASSERT(dtp); updateTouchPoint(dtp,&p); } diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h index 52913f53f6..b9ef7816e0 100644 --- a/src/quick/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_p.h @@ -231,7 +231,7 @@ public: static QQuickTouchPoint* touchPoint_at(QQmlListProperty *list, int index) { QQuickMultiPointTouchArea *q = static_cast(list->object); - return q->_touchPrototypes[index]; + return q->_touchPrototypes.value(index); } Q_SIGNALS: diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index c7e476c4b5..1de20ed5b9 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -245,7 +245,7 @@ void QQuickPathViewPrivate::clear() currentItem = 0; } for (int i=0; i= 0) { @@ -1993,8 +1993,8 @@ void QQuickPathView::refill() endPos = -1.0; startPos = 2.0; - for (int i = 0; i < d->items.count(); i++) { - int idx = d->model->indexOf(d->items[i], 0); + for (QQuickItem * item : qAsConst(d->items)) { + int idx = d->model->indexOf(item, 0); qreal curPos = d->positionOfIndex(idx); if (curPos > endPos) { endPos = curPos; @@ -2084,7 +2084,7 @@ void QQuickPathView::refill() if (!waiting && d->items.count() < count+d->cacheSize) { qCDebug(lcItemViewDelegateLifecycle) << "Checking for pathview middle inserts, items count was" << d->items.count(); idx = startIdx; - QQuickItem *lastItem = d->items[0]; + QQuickItem *lastItem = d->items.at(0); while (idx != endIdx) { //This gets the reference from the delegate model, and will not re-create QQuickItem *item = d->getItem(idx, idx+1, nextPos >= 1.0); @@ -2300,8 +2300,8 @@ void QQuickPathViewPrivate::createCurrentItem() return; bool inItems = false; - for (int i = 0; i < items.count(); i++) { - if (model->indexOf(items[i], 0) == currentIndex) { + for (QQuickItem *item : qAsConst(items)) { + if (model->indexOf(item, 0) == currentIndex) { inItems = true; break; } diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp index 083e02fe3f..db04a83afc 100644 --- a/src/quick/items/qquickspriteengine.cpp +++ b/src/quick/items/qquickspriteengine.cpp @@ -94,7 +94,7 @@ QQuickStochasticEngine::QQuickStochasticEngine(QObject *parent) : setCount(1); } -QQuickStochasticEngine::QQuickStochasticEngine(QList states, QObject *parent) : +QQuickStochasticEngine::QQuickStochasticEngine(const QList &states, QObject *parent) : QObject(parent), m_states(states), m_timeOffset(0), m_addAdvance(false) { //Default size 1 @@ -122,7 +122,7 @@ QQuickSpriteEngine::~QQuickSpriteEngine() } -int QQuickSpriteEngine::maxFrames() +int QQuickSpriteEngine::maxFrames() const { return m_maxFrames; } @@ -140,7 +140,7 @@ TODO: Above idea needs to have the varying duration offset added to it m_startTimes will be set in advance/restart to 0->(m_framesPerRow-1) and can be used directly as extra. This makes it 'frame' instead, but is more memory efficient than two arrays and less hideous than a vector of unions. */ -int QQuickSpriteEngine::pseudospriteProgress(int sprite, int state, int* rowDuration) +int QQuickSpriteEngine::pseudospriteProgress(int sprite, int state, int* rowDuration) const { int myRowDuration = m_duration[sprite] * m_sprites[state]->m_framesPerRow / m_sprites[state]->m_frames; if (rowDuration) @@ -153,7 +153,7 @@ int QQuickSpriteEngine::pseudospriteProgress(int sprite, int state, int* rowDura return (m_timeOffset - m_startTimes[sprite]) / myRowDuration; } -int QQuickSpriteEngine::spriteState(int sprite) +int QQuickSpriteEngine::spriteState(int sprite) const { if (!m_loaded) return 0; @@ -174,7 +174,7 @@ int QQuickSpriteEngine::spriteState(int sprite) return state + extra; } -int QQuickSpriteEngine::spriteStart(int sprite) +int QQuickSpriteEngine::spriteStart(int sprite) const { if (!m_duration[sprite] || !m_loaded) return m_timeOffset; @@ -188,7 +188,7 @@ int QQuickSpriteEngine::spriteStart(int sprite) return m_startTimes[sprite] + extra*rowDuration; } -int QQuickSpriteEngine::spriteFrames(int sprite) +int QQuickSpriteEngine::spriteFrames(int sprite) const { if (!m_loaded) return 1; @@ -215,7 +215,7 @@ int QQuickSpriteEngine::spriteFrames(int sprite) return m_sprites[state]->m_framesPerRow; } -int QQuickSpriteEngine::spriteDuration(int sprite)//Full duration, not per frame +int QQuickSpriteEngine::spriteDuration(int sprite) const //Full duration, not per frame { if (!m_duration[sprite] || !m_loaded) return m_duration[sprite]; @@ -235,7 +235,7 @@ int QQuickSpriteEngine::spriteDuration(int sprite)//Full duration, not per frame return rowDuration; } -int QQuickSpriteEngine::spriteY(int sprite) +int QQuickSpriteEngine::spriteY(int sprite) const { if (!m_loaded) return 0; @@ -257,7 +257,7 @@ int QQuickSpriteEngine::spriteY(int sprite) return m_sprites[state]->m_rowY + m_sprites[state]->m_frameHeight * extra; } -int QQuickSpriteEngine::spriteX(int sprite) +int QQuickSpriteEngine::spriteX(int sprite) const { if (!m_loaded) return 0; @@ -280,24 +280,24 @@ int QQuickSpriteEngine::spriteX(int sprite) return m_sprites[state]->m_rowStartX; } -QQuickSprite* QQuickSpriteEngine::sprite(int sprite) +QQuickSprite* QQuickSpriteEngine::sprite(int sprite) const { return m_sprites[m_things[sprite]]; } -int QQuickSpriteEngine::spriteWidth(int sprite) +int QQuickSpriteEngine::spriteWidth(int sprite) const { int state = m_things[sprite]; return m_sprites[state]->m_frameWidth; } -int QQuickSpriteEngine::spriteHeight(int sprite) +int QQuickSpriteEngine::spriteHeight(int sprite) const { int state = m_things[sprite]; return m_sprites[state]->m_frameHeight; } -int QQuickSpriteEngine::spriteCount()//TODO: Actually image state count, need to rename these things to make sense together +int QQuickSpriteEngine::spriteCount() const //TODO: Actually image state count, need to rename these things to make sense together { return m_imageStateCount; } @@ -312,14 +312,14 @@ void QQuickStochasticEngine::setGoal(int state, int sprite, bool jump) return; } - if (m_things[sprite] == state) + if (m_things.at(sprite) == state) return;//Already there m_things[sprite] = state; - m_duration[sprite] = m_states[state]->variedDuration(); + m_duration[sprite] = m_states.at(state)->variedDuration(); m_goals[sprite] = -1; restart(sprite); emit stateChanged(sprite); - emit m_states[state]->entered(); + emit m_states.at(state)->entered(); return; } @@ -516,8 +516,8 @@ void QQuickStochasticEngine::start(int index, int state) if (index >= m_things.count()) return; m_things[index] = state; - m_duration[index] = m_states[state]->variedDuration(); - if (m_states[state]->randomStart()) + m_duration[index] = m_states.at(state)->variedDuration(); + if (m_states.at(state)->randomStart()) m_startTimes[index] = NINF; else m_startTimes[index] = 0; @@ -538,33 +538,33 @@ void QQuickStochasticEngine::stop(int index) void QQuickStochasticEngine::restart(int index) { - bool randomStart = (m_startTimes[index] == NINF); + bool randomStart = (m_startTimes.at(index) == NINF); m_startTimes[index] = m_timeOffset; if (m_addAdvance) m_startTimes[index] += m_advanceTime.elapsed(); if (randomStart) - m_startTimes[index] -= qrand() % m_duration[index]; - int time = m_duration[index] + m_startTimes[index]; + m_startTimes[index] -= qrand() % m_duration.at(index); + int time = m_duration.at(index) + m_startTimes.at(index); for (int i=0; i= 0) + if (m_duration.at(index) >= 0) addToUpdateList(time, index); } void QQuickSpriteEngine::restart(int index) //Reimplemented to recognize and handle pseudostates { - bool randomStart = (m_startTimes[index] == NINF); - if (m_loaded && m_sprites[m_things[index]]->frameSync()) {//Manually advanced + bool randomStart = (m_startTimes.at(index) == NINF); + if (m_loaded && m_sprites.at(m_things.at(index))->frameSync()) {//Manually advanced m_startTimes[index] = 0; - if (randomStart && m_sprites[m_things[index]]->m_generatedCount) - m_startTimes[index] += qrand() % m_sprites[m_things[index]]->m_generatedCount; + if (randomStart && m_sprites.at(m_things.at(index))->m_generatedCount) + m_startTimes[index] += qrand() % m_sprites.at(m_things.at(index))->m_generatedCount; } else { m_startTimes[index] = m_timeOffset; if (m_addAdvance) m_startTimes[index] += m_advanceTime.elapsed(); if (randomStart) - m_startTimes[index] -= qrand() % m_duration[index]; - int time = spriteDuration(index) + m_startTimes[index]; + m_startTimes[index] -= qrand() % m_duration.at(index); + int time = spriteDuration(index) + m_startTimes.at(index); if (randomStart) { int curTime = m_timeOffset + (m_addAdvance ? m_advanceTime.elapsed() : 0); while (time < curTime) //Fast forward through psuedostates as needed @@ -581,11 +581,11 @@ void QQuickStochasticEngine::advance(int idx) { if (idx >= m_things.count()) return;//TODO: Proper fix(because this has happened and I just ignored it) - int nextIdx = nextState(m_things[idx],idx); + int nextIdx = nextState(m_things.at(idx), idx); m_things[idx] = nextIdx; - m_duration[idx] = m_states[nextIdx]->variedDuration(); + m_duration[idx] = m_states.at(nextIdx)->variedDuration(); restart(idx); - emit m_states[nextIdx]->entered(); + emit m_states.at(nextIdx)->entered(); emit stateChanged(idx); } @@ -598,29 +598,29 @@ void QQuickSpriteEngine::advance(int idx) //Reimplemented to recognize and handl if (idx >= m_things.count()) return;//TODO: Proper fix(because this has happened and I just ignored it) - if (m_duration[idx] == 0) { - if (m_sprites[m_things[idx]]->frameSync()) { + if (m_duration.at(idx) == 0) { + if (m_sprites.at(m_things.at(idx))->frameSync()) { //Manually called, advance inner substate count m_startTimes[idx]++; - if (m_startTimes[idx] < m_sprites[m_things[idx]]->m_generatedCount) { + if (m_startTimes.at(idx) < m_sprites.at(m_things.at(idx))->m_generatedCount) { //only a pseudostate ended emit stateChanged(idx); return; } } //just go past the pseudostate logic - } else if (m_startTimes[idx] + m_duration[idx] + } else if (m_startTimes.at(idx) + m_duration.at(idx) > int(m_timeOffset + (m_addAdvance ? m_advanceTime.elapsed() : 0))) { //only a pseduostate ended emit stateChanged(idx); addToUpdateList(spriteStart(idx) + spriteDuration(idx) + (m_addAdvance ? m_advanceTime.elapsed() : 0), idx); return; } - int nextIdx = nextState(m_things[idx],idx); + int nextIdx = nextState(m_things.at(idx), idx); m_things[idx] = nextIdx; - m_duration[idx] = m_states[nextIdx]->variedDuration(); + m_duration[idx] = m_states.at(nextIdx)->variedDuration(); restart(idx); - emit m_states[nextIdx]->entered(); + emit m_states.at(nextIdx)->entered(); emit stateChanged(idx); } @@ -631,16 +631,16 @@ int QQuickStochasticEngine::nextState(int curState, int curThing) if (goalPath == -1){//Random qreal r =(qreal) qrand() / (qreal) RAND_MAX; qreal total = 0.0; - for (QVariantMap::const_iterator iter=m_states[curState]->m_to.constBegin(); - iter!=m_states[curState]->m_to.constEnd(); ++iter) + for (QVariantMap::const_iterator iter=m_states.at(curState)->m_to.constBegin(); + iter!=m_states.at(curState)->m_to.constEnd(); ++iter) total += (*iter).toReal(); r*=total; - for (QVariantMap::const_iterator iter= m_states[curState]->m_to.constBegin(); - iter!=m_states[curState]->m_to.constEnd(); ++iter){ + for (QVariantMap::const_iterator iter= m_states.at(curState)->m_to.constBegin(); + iter!=m_states.at(curState)->m_to.constEnd(); ++iter){ if (r < (*iter).toReal()){ bool superBreak = false; for (int i=0; iname() == iter.key()){ + if (m_states.at(i)->name() == iter.key()){ nextIdx = i; superBreak = true; break; @@ -664,8 +664,8 @@ uint QQuickStochasticEngine::updateSprites(uint time)//### would returning a lis //Sprite State Update; m_timeOffset = time; m_addAdvance = false; - while (!m_stateUpdates.isEmpty() && time >= m_stateUpdates.first().first){ - foreach (int idx, m_stateUpdates.first().second) + while (!m_stateUpdates.isEmpty() && time >= m_stateUpdates.constFirst().first){ + foreach (int idx, m_stateUpdates.constFirst().second) advance(idx); m_stateUpdates.pop_front(); } @@ -674,14 +674,14 @@ uint QQuickStochasticEngine::updateSprites(uint time)//### would returning a lis m_addAdvance = true; if (m_stateUpdates.isEmpty()) return uint(-1); - return m_stateUpdates.first().first; + return m_stateUpdates.constFirst().first; } int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist) { QString goalName; - if (m_goals[spriteIdx] != -1) - goalName = m_states[m_goals[spriteIdx]]->name(); + if (m_goals.at(spriteIdx) != -1) + goalName = m_states.at(m_goals.at(spriteIdx))->name(); else goalName = m_globalGoal; if (goalName.isEmpty()) @@ -689,16 +689,16 @@ int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist) //TODO: caching instead of excessively redoing iterative deepening (which was chosen arbitrarily anyways) // Paraphrased - implement in an *efficient* manner for (int i=0; iname() == goalName) + if (m_states.at(curIdx)->name() == goalName) return curIdx; if (dist < 0) dist = m_states.count(); - QQuickStochasticState* curState = m_states[curIdx]; + QQuickStochasticState* curState = m_states.at(curIdx); for (QVariantMap::const_iterator iter = curState->m_to.constBegin(); iter!=curState->m_to.constEnd(); ++iter){ if (iter.key() == goalName) for (int i=0; iname() == goalName) + if (m_states.at(i)->name() == goalName) return i; } QSet options; @@ -707,7 +707,7 @@ int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist) iter!=curState->m_to.constEnd(); ++iter){ int option = -1; for (int j=0; jname() == iter.key()) + if (m_states.at(j)->name() == iter.key()) if (goalSeek(j, spriteIdx, i) != -1) option = j; if (option != -1) @@ -721,13 +721,13 @@ int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist) qreal total = 0; for (QSet::const_iterator iter=options.constBegin(); iter!=options.constEnd(); ++iter) - total += curState->m_to.value(m_states[(*iter)]->name()).toReal(); + total += curState->m_to.value(m_states.at((*iter))->name()).toReal(); r *= total; for (QVariantMap::const_iterator iter = curState->m_to.constBegin(); iter!=curState->m_to.constEnd(); ++iter){ bool superContinue = true; for (int j=0; jname() == iter.key()) + if (m_states.at(j)->name() == iter.key()) if (options.contains(j)) superContinue = false; if (superContinue) @@ -735,7 +735,7 @@ int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist) if (r < (*iter).toReal()){ bool superBreak = false; for (int j=0; jname() == iter.key()){ + if (m_states.at(j)->name() == iter.key()){ option = j; superBreak = true; break; @@ -755,10 +755,10 @@ int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist) void QQuickStochasticEngine::addToUpdateList(uint t, int idx) { for (int i=0; i t){ + } else if (m_stateUpdates.at(i).first > t) { QList tmpList; tmpList << idx; m_stateUpdates.insert(i, qMakePair(t, tmpList)); diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 1bdcc9a741..424fa18a54 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -189,7 +189,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickStochasticEngine : public QObject Q_PROPERTY(QQmlListProperty states READ states) public: explicit QQuickStochasticEngine(QObject *parent = 0); - QQuickStochasticEngine(QList states, QObject *parent=0); + QQuickStochasticEngine(const QList &states, QObject *parent = 0); ~QQuickStochasticEngine(); QQmlListProperty states() @@ -210,11 +210,11 @@ public: virtual void restart(int index=0); virtual void advance(int index=0);//Sends state to the next chosen state, unlike goal. void stop(int index=0); - int curState(int index=0) {return m_things[index];} + int curState(int index=0) const {return m_things[index];} - QQuickStochasticState* state(int idx){return m_states[idx];} - int stateIndex(QQuickStochasticState* s){return m_states.indexOf(s);} - int stateIndex(const QString& s) { + QQuickStochasticState* state(int idx) const {return m_states[idx];} + int stateIndex(QQuickStochasticState* s) const {return m_states.indexOf(s);} + int stateIndex(const QString& s) const { for (int i=0; iname() == s) return i; @@ -273,17 +273,17 @@ public: return QQmlListProperty(this, m_sprites); } - QQuickSprite* sprite(int sprite=0); - int spriteState(int sprite=0); - int spriteStart(int sprite=0); - int spriteFrames(int sprite=0); - int spriteDuration(int sprite=0); - int spriteX(int sprite=0); - int spriteY(int sprite=0); - int spriteWidth(int sprite=0); - int spriteHeight(int sprite=0); - int spriteCount();//Like state count - int maxFrames(); + QQuickSprite* sprite(int sprite = 0) const; + int spriteState(int sprite = 0) const; + int spriteStart(int sprite = 0) const; + int spriteFrames(int sprite = 0) const; + int spriteDuration(int sprite = 0) const; + int spriteX(int sprite = 0) const; + int spriteY(int sprite = 0) const; + int spriteWidth(int sprite = 0) const; + int spriteHeight(int sprite = 0) const; + int spriteCount() const;//Like state count + int maxFrames() const; void restart(int index=0) Q_DECL_OVERRIDE; void advance(int index=0) Q_DECL_OVERRIDE; @@ -298,7 +298,7 @@ public: QImage assembledImage(int maxSize = 2048); private: - int pseudospriteProgress(int,int,int*rd=0); + int pseudospriteProgress(int, int, int *rd = 0) const; QList m_sprites; bool m_startedImageAssembly; bool m_loaded; diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 16cbb2aa2f..f958d1a087 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1691,7 +1691,7 @@ bool QQuickWindowPrivate::deliverHoverEvent(QQuickItem *item, const QPointF &sce if (itemPrivate->hoverEnabled) { QPointF p = item->mapFromScene(scenePos); if (item->contains(p)) { - if (!hoverItems.isEmpty() && hoverItems[0] == item) { + if (!hoverItems.isEmpty() && hoverItems.at(0) == item) { //move accepted = sendHoverEvent(QEvent::HoverMove, item, scenePos, lastScenePos, modifiers, timestamp, accepted); } else { @@ -1702,24 +1702,24 @@ bool QQuickWindowPrivate::deliverHoverEvent(QQuickItem *item, const QPointF &sce itemsToHover << parent; // Leaving from previous hovered items until we reach the item or one of its ancestors. - while (!hoverItems.isEmpty() && !itemsToHover.contains(hoverItems[0])) { + while (!hoverItems.isEmpty() && !itemsToHover.contains(hoverItems.at(0))) { QQuickItem *hoverLeaveItem = hoverItems.takeFirst(); sendHoverEvent(QEvent::HoverLeave, hoverLeaveItem, scenePos, lastScenePos, modifiers, timestamp, accepted); } - if (!hoverItems.isEmpty() && hoverItems[0] == item){//Not entering a new Item + if (!hoverItems.isEmpty() && hoverItems.at(0) == item) {//Not entering a new Item // ### Shouldn't we send moves for the parent items as well? accepted = sendHoverEvent(QEvent::HoverMove, item, scenePos, lastScenePos, modifiers, timestamp, accepted); } else { // Enter items that are not entered yet. int startIdx = -1; if (!hoverItems.isEmpty()) - startIdx = itemsToHover.indexOf(hoverItems[0]) - 1; + startIdx = itemsToHover.indexOf(hoverItems.at(0)) - 1; if (startIdx == -1) startIdx = itemsToHover.count() - 1; for (int i = startIdx; i >= 0; i--) { - QQuickItem *itemToHover = itemsToHover[i]; + QQuickItem *itemToHover = itemsToHover.at(i); QQuickItemPrivate *itemToHoverPrivate = QQuickItemPrivate::get(itemToHover); // The item may be about to be deleted or reparented to another window // due to another hover event delivered in this function. If that is the @@ -3104,7 +3104,7 @@ void QQuickWindowPrivate::updateDirtyNode(QQuickItem *item) << itemPriv->paintNode; nodes.removeAll(0); - Q_ASSERT(nodes.first() == itemPriv->itemNodeInstance); + Q_ASSERT(nodes.constFirst() == itemPriv->itemNodeInstance); for (int i=1; isetRootNode(0); + m_renderers.constLast()->setRootNode(0); destroy(); // Must call destroy() here because markDirty() casts this to QSGRootNode. } diff --git a/src/quick/util/qquickanimatorcontroller.cpp b/src/quick/util/qquickanimatorcontroller.cpp index 3fc7d87840..eb902b2972 100644 --- a/src/quick/util/qquickanimatorcontroller.cpp +++ b/src/quick/util/qquickanimatorcontroller.cpp @@ -265,7 +265,7 @@ void QQuickAnimatorController::animationFinished(QAbstractAnimationJob *job) * needed in any case. */ if (!m_deleting.contains(job)) { - QQuickAnimatorProxyJob *proxy = m_animatorRoots[job]; + QQuickAnimatorProxyJob *proxy = m_animatorRoots.value(job); if (proxy) { m_window->update(); m_proxiesToStop << proxy; diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index b7367f3934..6e23d99f7e 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -264,7 +264,7 @@ void QQuickFontLoader::setSource(const QUrl &url) updateFontInfo(QString(), Error); } } else { - updateFontInfo(QFontDatabase::applicationFontFamilies(fontLoaderFonts()->map[d->url]->id).at(0), Ready); + updateFontInfo(QFontDatabase::applicationFontFamilies(fontLoaderFonts()->map.value(d->url)->id).at(0), Ready); } } else { if (!fontLoaderFonts()->map.contains(d->url)) { @@ -280,7 +280,7 @@ void QQuickFontLoader::setSource(const QUrl &url) // Silently fail if compiled with no_network #endif } else { - QQuickFontObject *fo = fontLoaderFonts()->map[d->url]; + QQuickFontObject *fo = fontLoaderFonts()->map.value(d->url); if (fo->id == -1) { #ifndef QT_NO_NETWORK d->status = Loading; diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp index 6b491a433c..dfed4c1885 100644 --- a/src/quick/util/qquickpath.cpp +++ b/src/quick/util/qquickpath.cpp @@ -382,7 +382,7 @@ QPainterPath QQuickPath::createPath(const QPointF &startPoint, const QPointF &en } // Fixup end points - const AttributePoint &last = attributePoints.last(); + const AttributePoint &last = attributePoints.constLast(); for (int ii = 0; ii < attributes.count(); ++ii) { if (!last.values.contains(attributes.at(ii))) endpoint(attributePoints, attributes.at(ii)); @@ -407,11 +407,11 @@ QPainterPath QQuickPath::createPath(const QPointF &startPoint, const QPointF &en } attributePoints[ii].origpercent /= length; attributePoints[ii].percent = point.values.value(percentString); - prevorigpercent = attributePoints[ii].origpercent; - prevpercent = attributePoints[ii].percent; + prevorigpercent = attributePoints.at(ii).origpercent; + prevpercent = attributePoints.at(ii).percent; } else { attributePoints[ii].origpercent /= length; - attributePoints[ii].percent = attributePoints[ii].origpercent; + attributePoints[ii].percent = attributePoints.at(ii).origpercent; } } diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index dc4b27d738..49956de822 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -629,7 +629,7 @@ void QQuickPixmapReader::processJobs() // Find a job we can use bool usableJob = false; for (int i = jobs.count() - 1; !usableJob && i >= 0; i--) { - QQuickPixmapReply *job = jobs[i]; + QQuickPixmapReply *job = jobs.at(i); const QUrl url = job->url; QString localFile; QQuickImageProvider::ImageType imageType = QQuickImageProvider::Invalid; diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index c4be68cd31..555533a44e 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -287,7 +287,7 @@ void QQuickPropertyChangesPrivate::decodeBinding(const QString &propertyPrefix, QQuickReplaceSignalHandler *handler = new QQuickReplaceSignalHandler; handler->property = prop; handler->expression.take(new QQmlBoundSignalExpression(object, QQmlPropertyPrivate::get(prop)->signalIndex(), - QQmlContextData::get(qmlContext(q)), object, compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex])); + QQmlContextData::get(qmlContext(q)), object, compilationUnit->runtimeFunctions.at(binding->value.compiledScriptIndex))); signalReplacements << handler; return; } @@ -455,7 +455,7 @@ QQuickPropertyChanges::ActionList QQuickPropertyChanges::actions() QQmlBinding *newBinding = 0; if (e.id != QQmlBinding::Invalid) { QV4::Scope scope(QQmlEnginePrivate::getV4Engine(qmlEngine(this))); - QV4::ScopedValue function(scope, QV4::FunctionObject::createQmlFunction(context, object(), d->compilationUnit->runtimeFunctions[e.id])); + QV4::ScopedValue function(scope, QV4::FunctionObject::createQmlFunction(context, object(), d->compilationUnit->runtimeFunctions.at(e.id))); newBinding = QQmlBinding::create(&QQmlPropertyPrivate::get(prop)->core, function, object(), context); } diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp index a992589040..e7beee8ed3 100644 --- a/src/quick/util/qquicksmoothedanimation.cpp +++ b/src/quick/util/qquicksmoothedanimation.cpp @@ -409,7 +409,7 @@ QAbstractAnimationJob* QQuickSmoothedAnimation::transition(QQuickStateActions &a Q_UNUSED(direction); Q_D(QQuickSmoothedAnimation); - QQuickStateActions dataActions = QQuickPropertyAnimation::createTransitionActions(actions, modified, defaultTarget); + const QQuickStateActions dataActions = QQuickPropertyAnimation::createTransitionActions(actions, modified, defaultTarget); QContinuingAnimationGroupJob *wrapperGroup = new QContinuingAnimationGroupJob(); diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp index 74baa3bfda..b3f0caa2b3 100644 --- a/src/quick/util/qquicktimeline.cpp +++ b/src/quick/util/qquicktimeline.cpp @@ -154,7 +154,7 @@ void QQuickTimeLinePrivate::add(QQuickTimeLineObject &g, const Op &o) } if (!iter->ops.isEmpty() && o.type == Op::Pause && - iter->ops.last().type == Op::Pause) { + iter->ops.constLast().type == Op::Pause) { iter->ops.last().length += o.length; iter->length += o.length; } else { -- cgit v1.2.3