mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing annoying compiler warning

Browse source 
Adding { } to if clause to avoid dangling warning
/Users/guidolerch/src/subsurface/qt-models/cylindermodel.cpp:117:
warning: add explicit braces to avoid dangling else [-Wdangling-else]

[Dirk Hohndel: combined two of Guido's patches to one that is simpler]

Signed-off-by: Guido Lerch <guido.lerch@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Guido Lerch 2015-10-22 00:17:05 +02:00 • committed by Dirk Hohndel
parent ac8e05c4ec
commit f1c682b55a
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-models/cylindermodel.cpp
View file

@ -111,18 +111,20 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
} }
break; break;
case Qt::DecorationRole: case Qt::DecorationRole:
if (index.column() == REMOVE) if (index.column() == REMOVE) {
if (rowCount() > 1) if (rowCount() > 1)
ret = trashIcon(); ret = trashIcon();
else else
ret = trashForbiddenIcon(); ret = trashForbiddenIcon();
}
break; break;
case Qt::SizeHintRole: case Qt::SizeHintRole:
if (index.column() == REMOVE) if (index.column() == REMOVE) {
if (rowCount() > 1) if (rowCount() > 1)
ret = trashIcon(); ret = trashIcon();
else else
ret = trashForbiddenIcon(); ret = trashForbiddenIcon();
}
break; break;
case Qt::ToolTipRole: case Qt::ToolTipRole: