From 6ec3a972971a6a83b74f5ccbb24c7bb088a863d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Sat, 20 May 2017 09:27:24 +0100 Subject: 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) --- src/corelib/itemmodels/qsortfilterproxymodel.cpp | 7 +------ 1 file changed, 1 insertion(+), 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 >::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::const_iterator(source_index_mapping.insert((*it).first, (*it).second)); } } -- cgit v1.2.3