diff options
Diffstat (limited to 'src/gui/accessible')
-rw-r--r-- | src/gui/accessible/qaccessible.h | 7 | ||||
-rw-r--r-- | src/gui/accessible/qaccessible2.h | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index f374e05dc2..4043fa6e42 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -317,7 +317,8 @@ public: TableInterface, ActionInterface, ImageInterface, - Table2Interface + Table2Interface, + Table2CellInterface }; typedef QAccessibleInterface*(*InterfaceFactory)(const QString &key, QObject*); @@ -355,6 +356,7 @@ class QAccessibleTableInterface; class QAccessibleActionInterface; class QAccessibleImageInterface; class QAccessibleTable2Interface; +class QAccessibleTable2CellInterface; class Q_GUI_EXPORT QAccessibleInterface : public QAccessible { @@ -414,6 +416,9 @@ public: inline QAccessibleTable2Interface *table2Interface() { return reinterpret_cast<QAccessibleTable2Interface *>(interface_cast(QAccessible::Table2Interface)); } + inline QAccessibleTable2CellInterface *table2CellInterface() + { return reinterpret_cast<QAccessibleTable2CellInterface *>(interface_cast(QAccessible::Table2CellInterface)); } + // FIXME virtual QVariant virtual_hook(const QVariant &data); virtual void *interface_cast(QAccessible::InterfaceType) diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h index e0db9e039b..1080c343a2 100644 --- a/src/gui/accessible/qaccessible2.h +++ b/src/gui/accessible/qaccessible2.h @@ -163,8 +163,6 @@ public: class Q_GUI_EXPORT QAccessibleTableInterface { public: - - virtual QAccessibleInterface *accessibleAt(int row, int column) = 0; virtual QAccessibleInterface *caption() = 0; virtual int childIndex(int rowIndex, int columnIndex) = 0; @@ -194,7 +192,7 @@ public: int *columnSpan, bool *isSelected) = 0; }; -class Q_GUI_EXPORT QAccessibleTable2CellInterface: public QAccessibleInterface +class Q_GUI_EXPORT QAccessibleTable2CellInterface { public: // Returns the number of columns occupied by this cell accessible. @@ -217,7 +215,7 @@ public: // Gets the row and column indexes and extents of this cell accessible and whether or not it is 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 QAccessibleTable2Interface* table() const = 0; + virtual QAccessibleInterface* table() const = 0; // #### Qt5 this should not be here but part of the state virtual bool isExpandable() const = 0; @@ -228,7 +226,7 @@ class Q_GUI_EXPORT QAccessibleTable2Interface public: // Returns the cell at the specified row and column in the table. - virtual QAccessibleTable2CellInterface *cellAt (int row, int column) const = 0; + virtual QAccessibleInterface *cellAt (int row, int column) const = 0; // Returns the caption for the table. virtual QAccessibleInterface *caption() const = 0; // Returns the description text of the specified column in the table. @@ -246,7 +244,7 @@ public: // Returns the description text of the specified row in the table. virtual QString rowDescription(int row) const = 0; // Returns a list of accessibles currently selected. - virtual QList<QAccessibleTable2CellInterface*> selectedCells() const = 0; + virtual QList<QAccessibleInterface*> selectedCells() const = 0; // Returns a list of column indexes currently selected (0 based). virtual QList<int> selectedColumns() const = 0; // Returns a list of row indexes currently selected (0 based). |