feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qt6: Workaround for ListModel iterators

Browse Source 
Change-Id: I622b42b8aea4f06b62e8739f7e8abb234ed7d3b4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-22 13:50:25 +02:00
parent 5363256acd
commit efc39f971e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/listmodel.h
View File

@@ -67,10 +67,8 @@ public:
void clear() { rootItem()->removeChildren(); } void clear() { rootItem()->removeChildren(); }
using const_iterator = typename QVector<ChildType *>::const_iterator; auto begin() const { return rootItem()->begin(); }
const_iterator begin() const { return const_iterator(rootItem()->begin()); } auto end() const { return rootItem()->end(); }
const_iterator end() const { return const_iterator(rootItem()->end()); }
}; };
template <class ItemData> template <class ItemData>

4
src/plugins/python/pythonsettings.cpp
View File

@@ -165,8 +165,8 @@ void InterpreterOptionsWidget::apply()
} }
QList<Interpreter> interpreters; QList<Interpreter> interpreters;
for (const ListItem<Interpreter> *treeItem : m_model) for (const TreeItem *treeItem : m_model)
interpreters << treeItem->itemData; interpreters << static_cast<const ListItem<Interpreter> *>(treeItem)->itemData;
PythonSettings::setInterpreter(interpreters, m_defaultId); PythonSettings::setInterpreter(interpreters, m_defaultId);
} }