diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-11-29 14:07:46 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-01 19:18:34 +0100 |
| commit | dd02fcd711d689595eb16c36163045c80ff798b4 (patch) | |
| tree | 98059d7cf82b447eebcd83bc425b2f31bc545c05 /src/plugins/accessible/widgets/itemviews.cpp | |
| parent | 63fa222e246b887d04be6e65a28cb29404587a89 (diff) | |
Make cell a proper QAccessible2Interface.
Change-Id: I9b245037e8448f39ed2cb80d1ef5fb0714173518
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/plugins/accessible/widgets/itemviews.cpp')
| -rw-r--r-- | src/plugins/accessible/widgets/itemviews.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index 6b986154b7..8bd6a6a452 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -220,7 +220,7 @@ QAccessibleTable2Cell *QAccessibleTable2::cell(const QModelIndex &index) const return 0; } -QAccessibleTable2CellInterface *QAccessibleTable2::cellAt(int row, int column) const +QAccessibleInterface *QAccessibleTable2::cellAt(int row, int column) const { Q_ASSERT(role() != QAccessible::Tree); QModelIndex index = view->model()->index(row, column); @@ -272,9 +272,9 @@ QString QAccessibleTable2::rowDescription(int row) const return view->model()->headerData(row, Qt::Vertical).toString(); } -QList<QAccessibleTable2CellInterface*> QAccessibleTable2::selectedCells() const +QList<QAccessibleInterface *> QAccessibleTable2::selectedCells() const { - QList<QAccessibleTable2CellInterface*> cells; + QList<QAccessibleInterface*> cells; Q_FOREACH (const QModelIndex &index, view->selectionModel()->selectedIndexes()) { cells.append(cell(index)); } @@ -588,7 +588,7 @@ QAccessible::Relation QAccessibleTree::relationTo(const QAccessibleInterface *) return QAccessible::Unrelated; } -QAccessibleTable2CellInterface *QAccessibleTree::cellAt(int row, int column) const +QAccessibleInterface *QAccessibleTree::cellAt(int row, int column) const { QModelIndex index = indexFromLogical(row, column); if (!index.isValid()) { @@ -626,6 +626,13 @@ QAccessibleTable2Cell::QAccessibleTable2Cell(QAbstractItemView *view_, const QMo Q_ASSERT(index_.isValid()); } +void *QAccessibleTable2Cell::interface_cast(QAccessible::InterfaceType t) +{ + if (t == QAccessible::Table2CellInterface) + return static_cast<QAccessibleTable2CellInterface*>(this); + return 0; +} + int QAccessibleTable2Cell::columnExtent() const { return 1; } int QAccessibleTable2Cell::rowExtent() const { return 1; } @@ -705,9 +712,9 @@ void QAccessibleTable2Cell::rowColumnExtents(int *row, int *column, int *rowExte *selected = isSelected(); } -QAccessibleTable2Interface* QAccessibleTable2Cell::table() const +QAccessibleInterface *QAccessibleTable2Cell::table() const { - return QAccessible::queryAccessibleInterface(view)->table2Interface(); + return QAccessible::queryAccessibleInterface(view); } QAccessible::Role QAccessibleTable2Cell::role() const |