From c4fbe872be1316f2fd65aa62863d6617cb129a3f Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 24 May 2012 16:42:11 +0200
Subject: Itemviews: compile with QT_STRICT_ITERATORS

Just a few mixed up iterators.

Change-Id: I19f62457ee24bc844fadd182ba61866e259e9636
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
 src/widgets/dialogs/qfilesystemmodel.cpp | 2 +-
 src/widgets/itemviews/qlistview.cpp      | 4 ++--
 src/widgets/itemviews/qtreeview.cpp      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index 06733a8932..ff92adb5e6 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -1142,7 +1142,7 @@ void QFileSystemModelPrivate::sortChildren(int column, const QModelIndex &parent
     QList<QPair<QFileSystemModelPrivate::QFileSystemNode*, int> > values;
     QHash<QString, QFileSystemNode *>::const_iterator iterator;
     int i = 0;
-    for(iterator = indexNode->children.begin() ; iterator != indexNode->children.end() ; ++iterator) {
+    for(iterator = indexNode->children.constBegin() ; iterator != indexNode->children.constEnd() ; ++iterator) {
         if (filtersAcceptsNode(iterator.value())) {
             values.append(QPair<QFileSystemModelPrivate::QFileSystemNode*, int>((iterator.value()), i));
         } else {
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index d7e7cb3ebc..147187d2ea 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -2637,9 +2637,9 @@ void QIconModeViewBase::paintDragDrop(QPainter *painter)
         painter->translate(draggedItemsDelta());
         QStyleOptionViewItemV4 option = viewOptions();
         option.state &= ~QStyle::State_MouseOver;
-        QVector<QModelIndex>::const_iterator it = draggedItems.begin();
+        QVector<QModelIndex>::const_iterator it = draggedItems.constBegin();
         QListViewItem item = indexToListViewItem(*it);
-        for (; it != draggedItems.end(); ++it) {
+        for (; it != draggedItems.constEnd(); ++it) {
             item = indexToListViewItem(*it);
             option.rect = viewItemRect(item);
             delegate(*it)->paint(painter, option, *it);
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index 510ae41d2d..f2a2ef2ca2 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -2020,14 +2020,14 @@ void QTreeView::doItemsLayout()
         //clean the QSet that may contains old (and this invalid) indexes
         d->hasRemovedItems = false;
         QSet<QPersistentModelIndex>::iterator it = d->expandedIndexes.begin();
-        while (it != d->expandedIndexes.constEnd()) {
+        while (it != d->expandedIndexes.end()) {
             if (!it->isValid())
                 it = d->expandedIndexes.erase(it);
             else
                 ++it;
         }
         it = d->hiddenIndexes.begin();
-        while (it != d->hiddenIndexes.constEnd()) {
+        while (it != d->hiddenIndexes.end()) {
             if (!it->isValid())
                 it = d->hiddenIndexes.erase(it);
             else
-- 
cgit v1.2.3