use const iterators where possible

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/animation/qvariantanimation.cpp b/src/gui/animation/qvariantanimation.cpp
index 2356e2e..b289826 100644 (file)
--- a/src/gui/animation/qvariantanimation.cpp
+++ b/src/gui/animation/qvariantanimation.cpp
@@ -307,7 +307,7 @@ void QVariantAnimationPrivate::setCurrentValueForProgress(const qreal progress)
 QVariant QVariantAnimationPrivate::valueAt(qreal step) const
 {
     QVariantAnimation::KeyValues::const_iterator result =
-        qBinaryFind(keyValues.begin(), keyValues.end(), qMakePair(step, QVariant()), animationValueLessThan);
+        qBinaryFind(keyValues.constBegin(), keyValues.constEnd(), qMakePair(step, QVariant()), animationValueLessThan);
     if (result != keyValues.constEnd())
         return result->second;
 
@@ -323,7 +323,8 @@ void QVariantAnimationPrivate::setValueAt(qreal step, const QVariant &value)
 
     QVariantAnimation::KeyValue pair(step, value);
 
-    QVariantAnimation::KeyValues::iterator result = qLowerBound(keyValues.begin(), keyValues.end(), pair, animationValueLessThan);
+    QVariantAnimation::KeyValues::iterator result =
+        qLowerBound(keyValues.begin(), keyValues.end(), pair, animationValueLessThan);
     if (result == keyValues.end() || result->first != step) {
         keyValues.insert(result, pair);
     } else {

diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index 2b51e7c..9a1ed4a 100644 (file)
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -1487,10 +1487,8 @@ void QFileSystemModelPrivate::_q_directoryChanged(const QString &directory, cons
     qSort(newFiles.begin(), newFiles.end());
     QHash<QString, QFileSystemNode*>::const_iterator i = parentNode->children.constBegin();
     while (i != parentNode->children.constEnd()) {
-        QStringList::iterator iterator;
-        iterator = qBinaryFind(newFiles.begin(), newFiles.end(),
-                    i.value()->fileName);
-        if (iterator == newFiles.end()) {
+        QStringList::const_iterator iter = qBinaryFind(newFiles.constBegin(), newFiles.constEnd(), i.value()->fileName);
+        if (iter == newFiles.end()) {
             toRemove.append(i.value()->fileName);
         }
         ++i;

diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 10c69e3..d1ed602 100644 (file)
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -390,10 +390,10 @@ int QTextTablePrivate::findCellIndex(int fragment) const
 {
     QFragmentFindHelper helper(pieceTable->fragmentMap().position(fragment),
                               pieceTable->fragmentMap());
-    QList<int>::ConstIterator it = qBinaryFind(cells.begin(), cells.end(), helper);
-    if (it == cells.end())
+    QList<int>::const_iterator it = qBinaryFind(cells.constBegin(), cells.constEnd(), helper);
+    if (it == cells.constEnd())
         return -1;
-    return it - cells.begin();
+    return it - cells.constBegin();
 }
 
 void QTextTablePrivate::fragmentAdded(const QChar &type, uint fragment)
@@ -405,7 +405,7 @@ void QTextTablePrivate::fragmentAdded(const QChar &type, uint fragment)
         Q_ASSERT(cells.indexOf(fragment) == -1);
         const uint pos = pieceTable->fragmentMap().position(fragment);
         QFragmentFindHelper helper(pos, pieceTable->fragmentMap());
-        QList<int>::Iterator it = qLowerBound(cells.begin(), cells.end(), helper);
+        QList<int>::iterator it = qLowerBound(cells.begin(), cells.end(), helper);
         cells.insert(it, fragment);
         if (!fragment_start || pos < pieceTable->fragmentMap().position(fragment_start))
             fragment_start = fragment;
@@ -1044,10 +1044,10 @@ void QTextTable::mergeCells(int row, int column, int numRows, int numCols)
 
     // find the position at which to insert the contents of the merged cells
     QFragmentFindHelper helper(origCellPosition, p->fragmentMap());
-    QList<int>::Iterator it = qBinaryFind(d->cells.begin(), d->cells.end(), helper);
-    Q_ASSERT(it != d->cells.end());
+    QList<int>::const_iterator it = qBinaryFind(d->cells.constBegin(), d->cells.constEnd(), helper);
+    Q_ASSERT(it != d->cells.constEnd());
     Q_ASSERT(*it == cellFragment);
-    const int insertCellIndex = it - d->cells.begin();
+    const int insertCellIndex = it - d->cells.constBegin();
     int insertFragment = d->cells.value(insertCellIndex + 1, d->fragment_end);
     uint insertPos = p->fragmentMap().position(insertFragment);