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

CMake: Fix warnings about cmake configuration model

Browse Source 
The index was handled wrongly.

Change-Id: I8a98c7a16e32798a9b7662c6c5c1683d248580da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-10-26 16:32:20 +02:00
parent 10ddde4125
commit aa118539a4
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cmakeprojectmanager/configmodel.cpp
View File

@@ -44,17 +44,12 @@ ConfigModel::ConfigModel(QObject *parent) : QAbstractTableModel(parent)
int ConfigModel::rowCount(const QModelIndex &parent) const int ConfigModel::rowCount(const QModelIndex &parent) const
{ {
QTC_ASSERT(parent.model() == nullptr || parent.model() == this, return 0); return parent.isValid() ? 0 : m_configuration.count();
if (parent.isValid())
return 0;
return m_configuration.count();
} }
int ConfigModel::columnCount(const QModelIndex &parent) const int ConfigModel::columnCount(const QModelIndex &parent) const
{ {
QTC_ASSERT(!parent.isValid(), return 0); return parent.isValid() ? 0 : 3;
QTC_ASSERT(parent.model() == nullptr, return 0);
return 3;
} }
Qt::ItemFlags ConfigModel::flags(const QModelIndex &index) const Qt::ItemFlags ConfigModel::flags(const QModelIndex &index) const