diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-24 16:42:11 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-26 00:34:40 +0200 |
commit | c4fbe872be1316f2fd65aa62863d6617cb129a3f (patch) | |
tree | c4fd8ad3b714c0362db5de4945685e0a3775a65d /src | |
parent | 576d4a1cce4a58cca9dddfb8b3878b66169aabcf (diff) |
Itemviews: compile with QT_STRICT_ITERATORS
Just a few mixed up iterators.
Change-Id: I19f62457ee24bc844fadd182ba61866e259e9636
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.cpp | 2 | ||||
-rw-r--r-- | src/sql/models/qsqltablemodel.cpp | 2 | ||||
-rw-r--r-- | src/widgets/dialogs/qfilesystemmodel.cpp | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qlistview.cpp | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qtreeview.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 68e5e89db3..875bb81967 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -1114,7 +1114,7 @@ void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &sourc if (!source_top_left.isValid() || !source_bottom_right.isValid()) return; QModelIndex source_parent = source_top_left.parent(); - IndexMap::const_iterator it = source_index_mapping.find(source_parent); + IndexMap::const_iterator it = source_index_mapping.constFind(source_parent); if (it == source_index_mapping.constEnd()) { // Don't care, since we don't have mapping for this index return; diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index 30c3f032e0..ddec24709f 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -691,7 +691,7 @@ bool QSqlTableModel::submitAll() bool success = true; for (QSqlTableModelPrivate::CacheMap::Iterator it = d->cache.begin(); - it != d->cache.constEnd(); ++it) { + it != d->cache.end(); ++it) { if (it.value().submitted()) continue; 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 |