diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 16:34:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 18:45:24 +0200 |
commit | 59b6a67b94fab5aa36a01beb0d8665575b678f64 (patch) | |
tree | 09ab6d0a7806feffa621138b1bf3732869ec1e00 /src/plugins | |
parent | ce16e70985384a8371cca65a5c3b8ec4c7563f5c (diff) |
Remove rowColumnExtents from QAccessibleTableCellInterface
The API is broken and available in individual functions.
Don't make it more complicated than necessary to implement
the interfaces for new widgets.
Change-Id: Ie408c369ef05b2b8e7ac666b25153d090fcf3aae
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/accessible/widgets/itemviews.cpp | 9 | ||||
-rw-r--r-- | src/plugins/accessible/widgets/itemviews.h | 1 | ||||
-rw-r--r-- | src/plugins/platforms/windows/accessible/iaccessible2.cpp | 8 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index d460ec2c98..86c7812553 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -1010,15 +1010,6 @@ void QAccessibleTableCell::unselectCell() view->selectionModel()->select(m_index, QItemSelectionModel::Deselect); } -void QAccessibleTableCell::rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const -{ - *row = m_index.row(); - *column = m_index.column(); - *rowExtents = 1; - *columnExtents = 1; - *selected = isSelected(); -} - QAccessibleInterface *QAccessibleTableCell::table() const { return QAccessible::queryAccessibleInterface(view); diff --git a/src/plugins/accessible/widgets/itemviews.h b/src/plugins/accessible/widgets/itemviews.h index 09dacde7a2..72b2339dd3 100644 --- a/src/plugins/accessible/widgets/itemviews.h +++ b/src/plugins/accessible/widgets/itemviews.h @@ -194,7 +194,6 @@ public: virtual QList<QAccessibleInterface*> rowHeaderCells() const; virtual int rowIndex() const; virtual bool isSelected() const; - virtual void rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const; virtual QAccessibleInterface* table() const; //action interface diff --git a/src/plugins/platforms/windows/accessible/iaccessible2.cpp b/src/plugins/platforms/windows/accessible/iaccessible2.cpp index 7a28fd9074..a0f2c1812f 100644 --- a/src/plugins/platforms/windows/accessible/iaccessible2.cpp +++ b/src/plugins/platforms/windows/accessible/iaccessible2.cpp @@ -1207,10 +1207,14 @@ HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::get_rowColumnExtents(long *row, { QAccessibleInterface *accessible = accessibleInterface(); accessibleDebugClientCalls(accessible); - if (!accessible) + if (!accessible || !tableCellInterface()) return E_FAIL; - tableCellInterface()->rowColumnExtents((int*)row, (int*)column, (int*)rowExtents, (int*)columnExtents, (bool*)isSelected); + *row = (long)tableCellInterface()->rowIndex(); + *column = (long)tableCellInterface()->columnIndex(); + *rowExtents = (long)tableCellInterface()->rowExtent(); + *columnExtents = (long)tableCellInterface()->columnExtent(); + *isSelected = tableCellInterface()->isSelected(); return S_OK; } |