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

C++: Handle invalid indices in OverviewModel

Browse Source 
This makes the following ModelTests pass:

ModelTest::nonDestructiveBasicTest()

  Q_ASSERT(model->data(QModelIndex()) == QVariant());

  Qt::ItemFlags flags = model->flags(QModelIndex());
  Q_ASSERT(flags == Qt::ItemIsDropEnabled || flags == 0);

Task-number: QTCREATORBUG-13142
Change-Id: If639981079b79d8b5b3bed22fb47453650449706
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-04-28 10:43:22 +02:00
parent 23cc5f965b
commit 18e1dbed54
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/cplusplus/OverviewModel.cpp
View File

@@ -140,6 +140,9 @@ int OverviewModel::columnCount(const QModelIndex &) const
QVariant OverviewModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid())
return QVariant();
// account for no symbol item
if (!index.parent().isValid() && index.row() == 0) {
switch (role) {
@@ -243,7 +246,9 @@ void OverviewModel::rebuild(Document::Ptr doc)
Qt::ItemFlags OverviewModel::flags(const QModelIndex &index) const
{
Q_UNUSED(index)
if (!index.isValid())
return 0;
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
}