From bf3c3d4ff8671143b700a94192144097f826590c Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 10 Jun 2016 14:51:13 +0200 Subject: [PATCH] ProjectExplorer: Use LeveledTreeModel for ToolChainModel More typesafety. This also reveals recently introduced mis-counting of levels. Change-Id: I8d90bab57c7122ca08ec2980f4a35fd80db802b3 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/toolchainoptionspage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 2b48ba1d8f4..9f1ece689aa 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -198,7 +198,7 @@ public: void apply(); public: - TreeModel m_model; + LeveledTreeModel m_model; QList m_factories; QTreeView *m_toolChainView; DetailsWidget *m_container; @@ -252,7 +252,7 @@ void ToolChainOptionsWidget::removeToolChain(ToolChain *tc) } } - auto item = m_model.findItemAtLevel(1, [tc](ToolChainTreeItem *item) { + auto item = m_model.findSecondLevelItem([tc](ToolChainTreeItem *item) { return tc->isAutoDetected() && item->toolChain == tc; }); delete m_model.takeItem(item); @@ -284,7 +284,7 @@ void ToolChainOptionsWidget::apply() Q_ASSERT(m_toRemoveList.isEmpty()); // Update tool chains: - m_model.forEachItemAtLevel(1, [this](ToolChainTreeItem *item) { + m_model.forSecondLevelItems([this](ToolChainTreeItem *item) { if (item->parent() == m_manualRoot && item->changed) { Q_ASSERT(item->toolChain); if (item->widget)