AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify a function to fix a warning reported by ICC

Browse Source 
ICC thinks that the return statement is missing:
src/plugins/accessible/widgets/itemviews.cpp(867): error #1011: missing return statement at end of non-void function "QAccessibleTableHeaderCell::parent"

Clearly it's wrong, but the function is overly complex for no good
reason. So just simplify it instead.

Change-Id: Ic63029df18b4712d9864a4dc66b6751b2d4574b7
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
This commit is contained in:
Thiago Macieira 2013-01-28 21:28:22 -08:00 committed by The Qt Project
parent 2d98bd48e5
commit 7abc1a6a82
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/accessible/widgets/itemviews.cpp
View File

@ -1046,14 +1046,11 @@ bool QAccessibleTableHeaderCell::isValid() const
QAccessibleInterface *QAccessibleTableHeaderCell::parent() const QAccessibleInterface *QAccessibleTableHeaderCell::parent() const
{ {
if (false) {
#ifndef QT_NO_TREEVIEW #ifndef QT_NO_TREEVIEW
} else if (qobject_cast<const QTreeView*>(view)) { if (qobject_cast<const QTreeView*>(view))
return new QAccessibleTree(view); return new QAccessibleTree(view);
#endif #endif
} else { return new QAccessibleTable(view);
return new QAccessibleTable(view);
}
} }
QAccessibleInterface *QAccessibleTableHeaderCell::child(int) const QAccessibleInterface *QAccessibleTableHeaderCell::child(int) const