1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a QT_STRICT_ITERATORS ifdef

Browse Source 
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>
This commit is contained in:
Sérgio Martins 2017-05-20 09:27:24 +01:00
parent da8ace713a
commit 6ec3a97297
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/itemmodels/qsortfilterproxymodel.cpp
View File

@ -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));
}
}