QtQuick: Micro-optimize iterator loops.

Avoid repeated instantiation of end() in loops, use variable instead.

Change-Id: I6ab1fe2b82406d5ee91710a0333587ffb82c04d4
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>

4 files changed, 12 insertions, 9 deletions

diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index dadef6a0c3..9d140b3156 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -581,11 +581,11 @@ QQuickPathAnimation::QQuickPathAnimation(QObject *parent)
 
 QQuickPathAnimation::~QQuickPathAnimation()
 {
+    typedef QHash<QQuickItem*, QQuickPathAnimationAnimator* >::iterator ActiveAnimationsIt;
+
     Q_D(QQuickPathAnimation);
-    QHash<QQuickItem*, QQuickPathAnimationAnimator* >::iterator it;
-    for (it = d->activeAnimations.begin(); it != d->activeAnimations.end(); ++it) {
+    for (ActiveAnimationsIt it = d->activeAnimations.begin(), end = d->activeAnimations.end(); it != end; ++it)
         it.value()->clearTemplate();
-    }
 }
 
 /*!
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 0cab9d28dd..01ef1e65f7 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -2415,20 +2415,22 @@ void QQuickItemViewPrivate::updateTrackedItem()
 void QQuickItemViewPrivate::updateUnrequestedIndexes()
 {
     Q_Q(QQuickItemView);
-    for (QHash<QQuickItem*,int>::iterator it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
+    for (QHash<QQuickItem*,int>::iterator it = unrequestedItems.begin(), end = unrequestedItems.end(); it != end; ++it)
         *it = model->indexOf(it.key(), q);
 }
 
 void QQuickItemViewPrivate::updateUnrequestedPositions()
 {
-    for (QHash<QQuickItem*,int>::const_iterator it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
+    for (QHash<QQuickItem*,int>::const_iterator it = unrequestedItems.begin(), cend = unrequestedItems.end(); it != cend; ++it)
         repositionPackageItemAt(it.key(), it.value());
 }
 
 void QQuickItemViewPrivate::updateVisibleIndex()
 {
+    typedef QList<FxViewItem*>::const_iterator FxViewItemListConstIt;
+
     visibleIndex = 0;
-    for (QList<FxViewItem*>::Iterator it = visibleItems.begin(); it != visibleItems.end(); ++it) {
+    for (FxViewItemListConstIt it = visibleItems.constBegin(), cend = visibleItems.constEnd(); it != cend; ++it) {
         if ((*it)->index != -1) {
             visibleIndex = (*it)->index;
             break;
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index ae719198f1..7fa6cdc161 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -162,7 +162,9 @@ QQuickItemViewTransitioner::QQuickItemViewTransitioner()
 
 QQuickItemViewTransitioner::~QQuickItemViewTransitioner()
 {
-    for (QSet<QQuickItemViewTransitionJob *>::iterator it = runningJobs.begin(); it != runningJobs.end(); ++it)
+    typedef QSet<QQuickItemViewTransitionJob *>::iterator JobIt;
+
+    for (JobIt it = runningJobs.begin(), end = runningJobs.end(); it != end; ++it)
         (*it)->m_transitioner = 0;
 }
 
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index b88a3aecbc..d2b5786125 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -2675,8 +2675,7 @@ void QQuickWindowPrivate::cleanupNodesOnShutdown()
     Q_Q(QQuickWindow);
     cleanupNodes();
     cleanupNodesOnShutdown(contentItem);
-    QSet<QQuickItem *>::const_iterator it = parentlessItems.begin();
-    for (; it != parentlessItems.end(); ++it)
+    for (QSet<QQuickItem *>::const_iterator it = parentlessItems.begin(), cend = parentlessItems.end(); it != cend; ++it)
         cleanupNodesOnShutdown(*it);
     animationController->windowNodesDestroyed();
     q->cleanupSceneGraph();