diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-01-28 21:28:22 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-11 23:33:00 +0100 |
| commit | 7abc1a6a828eb36d26901d4ea5ecf8b4514f3cd7 (patch) | |
| tree | 61f317720eef946b6d03dfd09446776af813da26 /src/plugins/accessible/widgets | |
| parent | 2d98bd48e5145b798dceb254ee57d3c975bcf6b9 (diff) | |
Simplify a function to fix a warning reported by ICC
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>
Diffstat (limited to 'src/plugins/accessible/widgets')
| -rw-r--r-- | src/plugins/accessible/widgets/itemviews.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index 71f47a7b56..17764a3c2e 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -1046,14 +1046,11 @@ bool QAccessibleTableHeaderCell::isValid() const QAccessibleInterface *QAccessibleTableHeaderCell::parent() const { - if (false) { #ifndef QT_NO_TREEVIEW - } else if (qobject_cast<const QTreeView*>(view)) { + if (qobject_cast<const QTreeView*>(view)) return new QAccessibleTree(view); #endif - } else { - return new QAccessibleTable(view); - } + return new QAccessibleTable(view); } QAccessibleInterface *QAccessibleTableHeaderCell::child(int) const |