From 04c65c2454c4328722526d0a8744bb32a498594b Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 1 Dec 2011 21:21:52 +0100 Subject: Accessibility: table2 -> table MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename the new interface after the old one has been removed. This interface is very close to the IAccessible2 Table2 interface. Change-Id: I8659232189fe0e8307151c743727de425c30ac9a Reviewed-by: Jan-Arve Sæther --- src/gui/accessible/qaccessible2.h | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) (limited to 'src/gui/accessible/qaccessible2.h') diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h index 1080c343a2..4155a1679a 100644 --- a/src/gui/accessible/qaccessible2.h +++ b/src/gui/accessible/qaccessible2.h @@ -160,39 +160,7 @@ public: virtual QVariant minimumValue() = 0; }; -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; - virtual QString columnDescription(int column) = 0; - virtual int columnSpan(int row, int column) = 0; - virtual QAccessibleInterface *columnHeader() = 0; - virtual int columnIndex(int childIndex) = 0; - virtual int columnCount() = 0; - virtual int rowCount() = 0; - virtual int selectedColumnCount() = 0; - virtual int selectedRowCount() = 0; - virtual QString rowDescription(int row) = 0; - virtual int rowSpan(int row, int column) = 0; - virtual QAccessibleInterface *rowHeader() = 0; - virtual int rowIndex(int childIndex) = 0; - virtual int selectedRows(int maxRows, QList *rows) = 0; - virtual int selectedColumns(int maxColumns, QList *columns) = 0; - virtual QAccessibleInterface *summary() = 0; - virtual bool isColumnSelected(int column) = 0; - virtual bool isRowSelected(int row) = 0; - virtual bool isSelected(int row, int column) = 0; - virtual void selectRow(int row) = 0; - virtual void selectColumn(int column) = 0; - virtual void unselectRow(int row) = 0; - virtual void unselectColumn(int column) = 0; - virtual void cellAtIndex(int index, int *row, int *column, int *rowSpan, - int *columnSpan, bool *isSelected) = 0; -}; - -class Q_GUI_EXPORT QAccessibleTable2CellInterface +class Q_GUI_EXPORT QAccessibleTableCellInterface { public: // Returns the number of columns occupied by this cell accessible. @@ -221,7 +189,7 @@ public: virtual bool isExpandable() const = 0; }; -class Q_GUI_EXPORT QAccessibleTable2Interface +class Q_GUI_EXPORT QAccessibleTableInterface { public: -- cgit v1.2.3