whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Frederik Gladhorn 2013-08-12 16:34:44 +02:00 committed by The Qt Project
parent ce16e70985
commit 59b6a67b94
5 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/accessible/qaccessible2_p.h
View File

@ -127,12 +127,6 @@ public:
virtual int rowIndex() const = 0;
// Returns a boolean value indicating whether this cell is selected.
virtual bool isSelected() const = 0;
// Gets the row and column indexes and extents of this cell accessible and whether or not it is selected.
// ### Is this really needed??
//
// ### Maybe change to QSize cellSize(), we already have accessors for the row, column and selected
virtual void rowColumnExtents(int *row, int *column, int *rowExtents, int *columnExtents, bool *selected) const = 0;
// Returns a reference to the accessbile of the containing table.
virtual QAccessibleInterface* table() const = 0;
};

7
src/platformsupport/linuxaccessibility/atspiadaptor.cpp
View File

@ -2242,11 +2242,14 @@ bool AtSpiAdaptor::tableInterface(QAccessibleInterface *interface, const QString
col = index % cols;
QAccessibleTableCellInterface *cell = interface->tableInterface()->cellAt(row, col)->tableCellInterface();
if (cell) {
cell->rowColumnExtents(&row, &col, &rowExtents, &colExtents, &isSelected);
row = cell->rowIndex();
col = cell->columnIndex();
rowExtents = cell->rowExtent();
colExtents = cell->columnExtent();
isSelected = cell->isSelected();
success = true;
}
}
QVariantList list;
list << success << row << col << rowExtents << colExtents << isSelected;
connection.send(message.createReply(list));

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

@ -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);

1
src/plugins/accessible/widgets/itemviews.h
View File

@ -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

8
src/plugins/platforms/windows/accessible/iaccessible2.cpp
View File

@ -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;
}