diff options
author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2012-07-25 17:22:26 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 11:53:35 +0200 |
commit | 05815679d8f88c9d05832c34f8a4274f14ec0353 (patch) | |
tree | 311b903fccd96b1811f4d5ec2abce7dd49fc979c /src/plugins/accessible | |
parent | a03b14f68508cf08f051ed882604485f230cff30 (diff) |
Accessibility: fix updates for models with rootIndex set.
The accessible table/list implementation would ignore
when a root index is set, resulting in trying to use row/column
for the top level index, leading to accessing invalid indexes.
(cherry picked from commit def2ee829435c705055733a0f99c0ca44a012c50)
Conflicts:
src/plugins/accessible/widgets/itemviews.cpp
Change-Id: Ic2745ab3e262ccee2d43e0d532e165d2958f519e
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/plugins/accessible')
-rw-r--r-- | src/plugins/accessible/widgets/itemviews.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index 92e8f9fcac..9ecace5064 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -112,7 +112,13 @@ QAccessibleInterface *QAccessibleTable::childFromLogical(int logicalIndex) const } --row; } - return new QAccessibleTableCell(view(), view()->model()->index(row, column), cellRole()); + + QModelIndex index = view()->model()->index(row, column, view()->rootIndex()); + if (!index.isValid()) { + qWarning() << "QAccessibleTable::childFromLogical: Invalid index at: " << row << column; + return 0; + } + return new QAccessibleTableCell(view(), index, cellRole()); } QAccessibleTable::QAccessibleTable(QWidget *w) @@ -174,7 +180,7 @@ QAccessibleTableCell *QAccessibleTable::cell(const QModelIndex &index) const QAccessibleInterface *QAccessibleTable::cellAt(int row, int column) const { Q_ASSERT(role() != QAccessible::Tree); - QModelIndex index = view()->model()->index(row, column); + QModelIndex index = view()->model()->index(row, column, view()->rootIndex()); if (!index.isValid()) { qWarning() << "QAccessibleTable::cellAt: invalid index: " << index << " for " << view(); return 0; @@ -266,7 +272,7 @@ bool QAccessibleTable::isRowSelected(int row) const bool QAccessibleTable::selectRow(int row) { - QModelIndex index = view()->model()->index(row, 0); + QModelIndex index = view()->model()->index(row, 0, view()->rootIndex()); if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection) return false; view()->selectionModel()->select(index, QItemSelectionModel::Select); @@ -275,7 +281,7 @@ bool QAccessibleTable::selectRow(int row) bool QAccessibleTable::selectColumn(int column) { - QModelIndex index = view()->model()->index(0, column); + QModelIndex index = view()->model()->index(0, column, view()->rootIndex()); if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection) return false; view()->selectionModel()->select(index, QItemSelectionModel::Select); @@ -284,7 +290,7 @@ bool QAccessibleTable::selectColumn(int column) bool QAccessibleTable::unselectRow(int row) { - QModelIndex index = view()->model()->index(row, 0); + QModelIndex index = view()->model()->index(row, 0, view()->rootIndex()); if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection) return false; view()->selectionModel()->select(index, QItemSelectionModel::Deselect); @@ -293,7 +299,7 @@ bool QAccessibleTable::unselectRow(int row) bool QAccessibleTable::unselectColumn(int column) { - QModelIndex index = view()->model()->index(0, column); + QModelIndex index = view()->model()->index(0, column, view()->rootIndex()); if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection) return false; view()->selectionModel()->select(index, QItemSelectionModel::Columns & QItemSelectionModel::Deselect); |