diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2017-05-20 09:27:24 +0100 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2017-05-20 16:00:07 +0000 |
| commit | 6ec3a972971a6a83b74f5ccbb24c7bb088a863d3 (patch) | |
| tree | 633290ed3e541309d75197219e5cc4754d6991e9 /src/corelib/itemmodels | |
| parent | da8ace713a19d2a8c9831ddf50d17607bc4856cc (diff) | |
Remove a QT_STRICT_ITERATORS ifdef
Having special code paths defeats the purpose of QT_STRICT_ITERATORS
and is ugly.
Change-Id: Ie0bdbf1a9639a0903bcd020f526629ab2e69883b
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/itemmodels')
| -rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 7824559f5f..539c190ac3 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -1012,12 +1012,7 @@ void QSortFilterProxyModelPrivate::updateChildrenMapping(const QModelIndex &sour // reinsert moved, mapped indexes QVector<QPair<QModelIndex, Mapping*> >::iterator it = moved_source_index_mappings.begin(); for (; it != moved_source_index_mappings.end(); ++it) { -#ifdef QT_STRICT_ITERATORS - source_index_mapping.insert((*it).first, (*it).second); - (*it).second->map_iter = source_index_mapping.constFind((*it).first); -#else - (*it).second->map_iter = source_index_mapping.insert((*it).first, (*it).second); -#endif + (*it).second->map_iter = QHash<QModelIndex, Mapping *>::const_iterator(source_index_mapping.insert((*it).first, (*it).second)); } } |