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

TreeModel: Rework tree iteration

Browse Source 
Use function objects to apply directly during a depth-first
walk of the tree instead of faking a flat container of tree
nodes. Less code, and allows even some non-const operations.

Change-Id: I804ab11df358fe937b40809cbcb772e6f3ff8dc5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2016-05-04 16:41:15 +02:00
parent aa2e135379
commit dee7ad3806
14 changed files with 85 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -241,7 +241,7 @@ void CMakeToolItemModel::apply()
foreach (const Core::Id &id, m_removedItems)
CMakeToolManager::deregisterCMakeTool(id);
foreach (auto item, itemsAtLevel<CMakeToolTreeItem *>(2)) {
forEachItemAtLevel<CMakeToolTreeItem *>(2, [](CMakeToolTreeItem *item) {
item->m_changed = false;
bool isNew = false;
@@ -262,7 +262,7 @@ void CMakeToolItemModel::apply()
item->m_changed = true;
}
}
}
});
CMakeToolManager::setDefaultCMakeTool(defaultItemId());
}
@@ -293,8 +293,9 @@ void CMakeToolItemModel::setDefaultItemId(const Core::Id &id)
QString CMakeToolItemModel::uniqueDisplayName(const QString &base) const
{
QStringList names;
foreach (CMakeToolTreeItem *item, itemsAtLevel<CMakeToolTreeItem *>(2))
forEachItemAtLevel<CMakeToolTreeItem *>(2, [&names](CMakeToolTreeItem *item) {
names << item->m_name;
});
return ProjectExplorer::Project::makeUnique(base, names);
}