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

CMake: Improve delegates for CMake configuration

Browse Source 
Change-Id: Ib1d2bfca1b2faafd36c53f24c6649e73ee0af190
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-09-14 15:18:50 +02:00
parent 632f2a7709
commit f4ff420036
6 changed files with 173 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/treemodel.cpp
View File

@@ -986,8 +986,7 @@ int BaseTreeModel::rowCount(const QModelIndex &idx) const
if (idx.column() > 0)
return 0;
const TreeItem *item = itemForIndex(idx);
QTC_ASSERT(item, return 0);
return item->childCount();
return item ? item->childCount() : 0;
}
int BaseTreeModel::columnCount(const QModelIndex &idx) const
@@ -1112,7 +1111,7 @@ TreeItem *BaseTreeModel::itemForIndex(const QModelIndex &idx) const
CHECK_INDEX(idx);
TreeItem *item = idx.isValid() ? static_cast<TreeItem*>(idx.internalPointer()) : m_root;
QTC_ASSERT(item, return 0);
QTC_ASSERT(item->m_model == this, return 0);
QTC_ASSERT(item->m_model == static_cast<const BaseTreeModel *>(this), return 0);
return item;
}