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

Utils: Streamline TreeModel API

Browse Source 
The LeveledTreeModel case is general enough to cover
the UniformTreeModel case, so merge them and rename to
TreeModel. The former TreeModel is now BaseTreeModel.

BaseTreeModels should not be instantiated directly,
a tree model with non-uniform basic items is available
as TreeModel<>.

Done-with: Eike Ziller <eike.ziller@qt.io>
Change-Id: I64a65617ab68c0cde39cf65f4bc092ef808ee6fb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-06-24 09:36:42 +02:00
committed by hjk
parent 2459652234
commit 53415cece1
41 changed files with 270 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ class CMakeToolTreeItem;
// CMakeToolItemModel
// --------------------------------------------------------------------------
class CMakeToolItemModel : public LeveledTreeModel<TreeItem, TreeItem, CMakeToolTreeItem>
class CMakeToolItemModel : public TreeModel<TreeItem, TreeItem, CMakeToolTreeItem>
{
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::CMakeSettingsPage)
@@ -229,12 +229,12 @@ void CMakeToolItemModel::updateCMakeTool(const Core::Id &id, const QString &disp
CMakeToolTreeItem *CMakeToolItemModel::cmakeToolItem(const Core::Id &id) const
{
return findSecondLevelItem([id](CMakeToolTreeItem *n) { return n->m_id == id; });
return findItemAtLevel<2>([id](CMakeToolTreeItem *n) { return n->m_id == id; });
}
CMakeToolTreeItem *CMakeToolItemModel::cmakeToolItem(const QModelIndex &index) const
{
return secondLevelItemForIndex(index);
return itemForIndexAtLevel<2>(index);
}
void CMakeToolItemModel::removeCMakeTool(const Core::Id &id)
@@ -252,7 +252,7 @@ void CMakeToolItemModel::apply()
CMakeToolManager::deregisterCMakeTool(id);
QList<CMakeToolTreeItem *> toRegister;
forSecondLevelItems([&toRegister](CMakeToolTreeItem *item) {
forItemsAtLevel<2>([&toRegister](CMakeToolTreeItem *item) {
item->m_changed = false;
if (CMakeTool *cmake = CMakeToolManager::findById(item->m_id)) {
cmake->setDisplayName(item->m_name);
@@ -304,7 +304,7 @@ void CMakeToolItemModel::setDefaultItemId(const Core::Id &id)
QString CMakeToolItemModel::uniqueDisplayName(const QString &base) const
{
QStringList names;
forSecondLevelItems([&names](CMakeToolTreeItem *item) { names << item->m_name; });
forItemsAtLevel<2>([&names](CMakeToolTreeItem *item) { names << item->m_name; });
return ProjectExplorer::Project::makeUnique(base, names);
}