1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Q_DECL_OVERRIDE to accessibility classes

Browse Source 
This actually shows two completely unused functions in QAccessibleTabBar
(fixed in follow up patch).

Change-Id: If6f464c022617b2ee1db654936e3ff9931103eb6
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
This commit is contained in:
Frederik Gladhorn 2013-10-04 00:17:57 +02:00 committed by The Qt Project
parent 0206c1e4e7
commit 4e337ee703
8 changed files with 310 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/accessible/qaccessibleobject.h
View File

@ -57,13 +57,13 @@ class Q_GUI_EXPORT QAccessibleObject : public QAccessibleInterface
public:
explicit QAccessibleObject(QObject *object);
bool isValid() const;
QObject *object() const;
bool isValid() const Q_DECL_OVERRIDE;
QObject *object() const Q_DECL_OVERRIDE;
// properties
QRect rect() const;
void setText(QAccessible::Text t, const QString &text);
QAccessibleInterface *childAt(int x, int y) const;
QRect rect() const Q_DECL_OVERRIDE;
void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
protected:
virtual ~QAccessibleObject();
@ -78,20 +78,20 @@ class Q_GUI_EXPORT QAccessibleApplication : public QAccessibleObject
public:
QAccessibleApplication();
QWindow *window() const;
QWindow *window() const Q_DECL_OVERRIDE;
// relations
int childCount() const;
int indexOfChild(const QAccessibleInterface*) const;
QAccessibleInterface *focusChild() const;
int childCount() const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE;
QAccessibleInterface *focusChild() const Q_DECL_OVERRIDE;
// navigation
QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const;
QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
// properties and state
QString text(QAccessible::Text t) const;
QAccessible::Role role() const;
QAccessible::State state() const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
QAccessible::Role role() const Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
};
#endif // QT_NO_ACCESSIBILITY

36
src/plugins/accessible/widgets/complexwidgets.h
View File

@ -73,11 +73,11 @@ public:
Undefined
};
QAccessibleInterface *child(int index) const;
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
bool isValid() const;
QAccessibleInterface *childAt(int x, int y) const;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
//protected:
QAbstractScrollArea *abstractScrollArea() const;
@ -102,14 +102,14 @@ public:
explicit QAccessibleTabBar(QWidget *w);
~QAccessibleTabBar();
int childCount() const;
QString text(QAccessible::Text t) const;
int childCount() const Q_DECL_OVERRIDE;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
bool setSelected(int child, bool on, bool extend);
QVector<int> selection() const;
QAccessibleInterface* child(int index) const;
int indexOfChild(const QAccessibleInterface *child) const;
QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
protected:
QTabBar *tabBar() const;
@ -123,18 +123,18 @@ class QAccessibleComboBox : public QAccessibleWidget
public:
explicit QAccessibleComboBox(QWidget *w);
int childCount() const;
QAccessibleInterface *childAt(int x, int y) const;
int indexOfChild(const QAccessibleInterface *child) const;
QAccessibleInterface* child(int index) const;
int childCount() const Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE;
QString text(QAccessible::Text t) const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
// QAccessibleActionInterface
QStringList actionNames() const;
QString localizedActionDescription(const QString &actionName) const;
void doAction(const QString &actionName);
QStringList keyBindingsForAction(const QString &actionName) const;
QStringList actionNames() const Q_DECL_OVERRIDE;
QString localizedActionDescription(const QString &actionName) const Q_DECL_OVERRIDE;
void doAction(const QString &actionName) Q_DECL_OVERRIDE;
QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE;
protected:
QComboBox *comboBox() const;

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

@ -62,48 +62,48 @@ class QAccessibleTable :public QAccessibleTableInterface, public QAccessibleObje
{
public:
explicit QAccessibleTable(QWidget *w);
bool isValid() const;
bool isValid() const Q_DECL_OVERRIDE;
QAccessible::Role role() const;
QAccessible::State state() const;
QString text(QAccessible::Text t) const;
QRect rect() const;
QAccessible::Role role() const Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
QRect rect() const Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int x, int y) const;
int childCount() const;
int indexOfChild(const QAccessibleInterface *) const;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE;
QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const;
QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
void *interface_cast(QAccessible::InterfaceType t);
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
// table interface
virtual QAccessibleInterface *cellAt(int row, int column) const;
virtual QAccessibleInterface *caption() const;
virtual QAccessibleInterface *summary() const;
virtual QString columnDescription(int column) const;
virtual QString rowDescription(int row) const;
virtual int columnCount() const;
virtual int rowCount() const;
virtual QAccessibleInterface *cellAt(int row, int column) const Q_DECL_OVERRIDE;
virtual QAccessibleInterface *caption() const Q_DECL_OVERRIDE;
virtual QAccessibleInterface *summary() const Q_DECL_OVERRIDE;
virtual QString columnDescription(int column) const Q_DECL_OVERRIDE;
virtual QString rowDescription(int row) const Q_DECL_OVERRIDE;
virtual int columnCount() const Q_DECL_OVERRIDE;
virtual int rowCount() const Q_DECL_OVERRIDE;
// selection
virtual int selectedCellCount() const;
virtual int selectedColumnCount() const;
virtual int selectedRowCount() const;
virtual QList<QAccessibleInterface*> selectedCells() const;
virtual QList<int> selectedColumns() const;
virtual QList<int> selectedRows() const;
virtual bool isColumnSelected(int column) const;
virtual bool isRowSelected(int row) const;
virtual bool selectRow(int row);
virtual bool selectColumn(int column);
virtual bool unselectRow(int row);
virtual bool unselectColumn(int column);
virtual int selectedCellCount() const Q_DECL_OVERRIDE;
virtual int selectedColumnCount() const Q_DECL_OVERRIDE;
virtual int selectedRowCount() const Q_DECL_OVERRIDE;
virtual QList<QAccessibleInterface*> selectedCells() const Q_DECL_OVERRIDE;
virtual QList<int> selectedColumns() const Q_DECL_OVERRIDE;
virtual QList<int> selectedRows() const Q_DECL_OVERRIDE;
virtual bool isColumnSelected(int column) const Q_DECL_OVERRIDE;
virtual bool isRowSelected(int row) const Q_DECL_OVERRIDE;
virtual bool selectRow(int row) Q_DECL_OVERRIDE;
virtual bool selectColumn(int column) Q_DECL_OVERRIDE;
virtual bool unselectRow(int row) Q_DECL_OVERRIDE;
virtual bool unselectColumn(int column) Q_DECL_OVERRIDE;
QAbstractItemView *view() const;
void modelChange(QAccessibleTableModelChangeEvent *event);
void modelChange(QAccessibleTableModelChangeEvent *event) Q_DECL_OVERRIDE;
protected:
inline QAccessible::Role cellRole() const {
@ -143,19 +143,19 @@ public:
{}
QAccessibleInterface *childAt(int x, int y) const;
int childCount() const;
QAccessibleInterface *child(int index) const;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *) const;
int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE;
int rowCount() const;
int rowCount() const Q_DECL_OVERRIDE;
// table interface
QAccessibleInterface *cellAt(int row, int column) const;
QString rowDescription(int row) const;
bool isRowSelected(int row) const;
bool selectRow(int row);
QAccessibleInterface *cellAt(int row, int column) const Q_DECL_OVERRIDE;
QString rowDescription(int row) const Q_DECL_OVERRIDE;
bool isRowSelected(int row) const Q_DECL_OVERRIDE;
bool selectRow(int row) Q_DECL_OVERRIDE;
private:
QModelIndex indexFromLogical(int row, int column = 0) const;
@ -168,37 +168,37 @@ class QAccessibleTableCell: public QAccessibleInterface, public QAccessibleTable
public:
QAccessibleTableCell(QAbstractItemView *view, const QModelIndex &m_index, QAccessible::Role role);
void *interface_cast(QAccessible::InterfaceType t);
QObject *object() const { return 0; }
QAccessible::Role role() const;
QAccessible::State state() const;
QRect rect() const;
bool isValid() const;
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
QObject *object() const Q_DECL_OVERRIDE { return 0; }
QAccessible::Role role() const Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
QRect rect() const Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int, int) const { return 0; }
int childCount() const { return 0; }
int indexOfChild(const QAccessibleInterface *) const { return -1; }
QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return 0; }
int childCount() const Q_DECL_OVERRIDE { return 0; }
int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; }
QString text(QAccessible::Text t) const;
void setText(QAccessible::Text t, const QString &text);
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
QAccessibleInterface *parent() const;
QAccessibleInterface *child(int) const;
QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int) const Q_DECL_OVERRIDE;
// cell interface
virtual int columnExtent() const;
virtual QList<QAccessibleInterface*> columnHeaderCells() const;
virtual int columnIndex() const;
virtual int rowExtent() const;
virtual QList<QAccessibleInterface*> rowHeaderCells() const;
virtual int rowIndex() const;
virtual bool isSelected() const;
virtual QAccessibleInterface* table() const;
virtual int columnExtent() const Q_DECL_OVERRIDE;
virtual QList<QAccessibleInterface*> columnHeaderCells() const Q_DECL_OVERRIDE;
virtual int columnIndex() const Q_DECL_OVERRIDE;
virtual int rowExtent() const Q_DECL_OVERRIDE;
virtual QList<QAccessibleInterface*> rowHeaderCells() const Q_DECL_OVERRIDE;
virtual int rowIndex() const Q_DECL_OVERRIDE;
virtual bool isSelected() const Q_DECL_OVERRIDE;
virtual QAccessibleInterface* table() const Q_DECL_OVERRIDE;
//action interface
virtual QStringList actionNames() const;
virtual void doAction(const QString &actionName);
virtual QStringList keyBindingsForAction(const QString &actionName) const;
virtual QStringList actionNames() const Q_DECL_OVERRIDE;
virtual void doAction(const QString &actionName) Q_DECL_OVERRIDE;
virtual QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE;
private:
QHeaderView *verticalHeader() const;
@ -221,21 +221,21 @@ public:
// For header cells, pass the header view in addition
QAccessibleTableHeaderCell(QAbstractItemView *view, int index, Qt::Orientation orientation);
QObject *object() const { return 0; }
QAccessible::Role role() const;
QAccessible::State state() const;
QRect rect() const;
bool isValid() const;
QObject *object() const Q_DECL_OVERRIDE { return 0; }
QAccessible::Role role() const Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
QRect rect() const Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int, int) const { return 0; }
int childCount() const { return 0; }
int indexOfChild(const QAccessibleInterface *) const { return -1; }
QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return 0; }
int childCount() const Q_DECL_OVERRIDE { return 0; }
int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; }
QString text(QAccessible::Text t) const;
void setText(QAccessible::Text t, const QString &text);
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const;
QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
private:
QHeaderView *headerView() const;
@ -258,23 +258,23 @@ public:
:view(view_)
{}
QObject *object() const { return 0; }
QAccessible::Role role() const { return QAccessible::Pane; }
QAccessible::State state() const { return QAccessible::State(); }
QRect rect() const { return QRect(); }
bool isValid() const { return true; }
QObject *object() const Q_DECL_OVERRIDE { return 0; }
QAccessible::Role role() const Q_DECL_OVERRIDE { return QAccessible::Pane; }
QAccessible::State state() const Q_DECL_OVERRIDE { return QAccessible::State(); }
QRect rect() const Q_DECL_OVERRIDE { return QRect(); }
bool isValid() const Q_DECL_OVERRIDE { return true; }
QAccessibleInterface *childAt(int, int) const { return 0; }
int childCount() const { return 0; }
int indexOfChild(const QAccessibleInterface *) const { return -1; }
QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return 0; }
int childCount() const Q_DECL_OVERRIDE { return 0; }
int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; }
QString text(QAccessible::Text) const { return QString(); }
void setText(QAccessible::Text, const QString &) {}
QString text(QAccessible::Text) const Q_DECL_OVERRIDE { return QString(); }
void setText(QAccessible::Text, const QString &) Q_DECL_OVERRIDE {}
QAccessibleInterface *parent() const {
QAccessibleInterface *parent() const Q_DECL_OVERRIDE {
return QAccessible::queryAccessibleInterface(view);
}
QAccessibleInterface *child(int) const {
QAccessibleInterface *child(int) const Q_DECL_OVERRIDE {
return 0;
}

52
src/plugins/accessible/widgets/qaccessiblemenu.h
View File

@ -59,14 +59,14 @@ class QAccessibleMenu : public QAccessibleWidget
public:
explicit QAccessibleMenu(QWidget *w);
int childCount() const;
QAccessibleInterface *childAt(int x, int y) const;
int childCount() const Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
QString text(QAccessible::Text t) const;
QAccessible::Role role() const;
QAccessibleInterface *child(int index) const;
QAccessibleInterface *parent() const;
int indexOfChild( const QAccessibleInterface *child ) const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
QAccessible::Role role() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
int indexOfChild( const QAccessibleInterface *child ) const Q_DECL_OVERRIDE;
protected:
QMenu *menu() const;
@ -78,10 +78,10 @@ class QAccessibleMenuBar : public QAccessibleWidget
public:
explicit QAccessibleMenuBar(QWidget *w);
QAccessibleInterface *child(int index) const;
int childCount() const;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
protected:
QMenuBar *menuBar() const;
@ -95,26 +95,26 @@ public:
explicit QAccessibleMenuItem(QWidget *owner, QAction *w);
~QAccessibleMenuItem();
void *interface_cast(QAccessible::InterfaceType t);
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
int childCount() const;
QAccessibleInterface *childAt(int x, int y) const;
bool isValid() const;
int indexOfChild(const QAccessibleInterface * child) const;
int childCount() const Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface * child) const Q_DECL_OVERRIDE;
QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const;
QObject * object() const;
QRect rect() const;
QAccessible::Role role() const;
void setText(QAccessible::Text t, const QString & text);
QAccessible::State state() const;
QString text(QAccessible::Text t) const;
QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
QObject * object() const Q_DECL_OVERRIDE;
QRect rect() const Q_DECL_OVERRIDE;
QAccessible::Role role() const Q_DECL_OVERRIDE;
void setText(QAccessible::Text t, const QString & text) Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
// QAccessibleActionInterface
QStringList actionNames() const;
void doAction(const QString &actionName);
QStringList keyBindingsForAction(const QString &actionName) const;
QStringList actionNames() const Q_DECL_OVERRIDE;
void doAction(const QString &actionName) Q_DECL_OVERRIDE;
QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE;
QWidget *owner() const;
protected:

150
src/plugins/accessible/widgets/qaccessiblewidgets.h
View File

@ -79,36 +79,36 @@ public:
// QAccessibleTextInterface
// selection
void selection(int selectionIndex, int *startOffset, int *endOffset) const;
int selectionCount() const;
void addSelection(int startOffset, int endOffset);
void removeSelection(int selectionIndex);
void setSelection(int selectionIndex, int startOffset, int endOffset);
void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
int selectionCount() const Q_DECL_OVERRIDE;
void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE;
void removeSelection(int selectionIndex) Q_DECL_OVERRIDE;
void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE;
// cursor
int cursorPosition() const;
void setCursorPosition(int position);
int cursorPosition() const Q_DECL_OVERRIDE;
void setCursorPosition(int position) Q_DECL_OVERRIDE;
// text
QString text(int startOffset, int endOffset) const;
QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE;
QString textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType,
int *startOffset, int *endOffset) const;
int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType,
int *startOffset, int *endOffset) const;
int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType,
int *startOffset, int *endOffset) const;
int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
int characterCount() const;
// character <-> geometry
QRect characterRect(int offset) const;
int offsetAtPoint(const QPoint &point) const;
QRect characterRect(int offset) const Q_DECL_OVERRIDE;
int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE;
QString attributes(int offset, int *startOffset, int *endOffset) const;
QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
// QAccessibleEditableTextInterface
void deleteText(int startOffset, int endOffset);
void insertText(int offset, const QString &text);
void replaceText(int startOffset, int endOffset, const QString &text);
void deleteText(int startOffset, int endOffset) Q_DECL_OVERRIDE;
void insertText(int offset, const QString &text) Q_DECL_OVERRIDE;
void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE;
using QAccessibleWidget::text;
@ -128,25 +128,25 @@ class QAccessiblePlainTextEdit : public QAccessibleTextWidget
public:
explicit QAccessiblePlainTextEdit(QWidget *o);
QString text(QAccessible::Text t) const;
void setText(QAccessible::Text t, const QString &text);
QAccessible::State state() const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
void *interface_cast(QAccessible::InterfaceType t);
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
// QAccessibleTextInterface
void scrollToSubstring(int startIndex, int endIndex);
void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE;
using QAccessibleTextWidget::text;
protected:
QPlainTextEdit *plainTextEdit() const;
QPoint scrollBarPosition() const;
QTextCursor textCursor() const;
void setTextCursor(const QTextCursor &textCursor);
QTextDocument *textDocument() const;
QWidget *viewport() const;
QPoint scrollBarPosition() const Q_DECL_OVERRIDE;
QTextCursor textCursor() const Q_DECL_OVERRIDE;
void setTextCursor(const QTextCursor &textCursor) Q_DECL_OVERRIDE;
QTextDocument *textDocument() const Q_DECL_OVERRIDE;
QWidget *viewport() const Q_DECL_OVERRIDE;
};
class QAccessibleTextEdit : public QAccessibleTextWidget
@ -154,25 +154,25 @@ class QAccessibleTextEdit : public QAccessibleTextWidget
public:
explicit QAccessibleTextEdit(QWidget *o);
QString text(QAccessible::Text t) const;
void setText(QAccessible::Text t, const QString &text);
QAccessible::State state() const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
void *interface_cast(QAccessible::InterfaceType t);
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
// QAccessibleTextInterface
void scrollToSubstring(int startIndex, int endIndex);
void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE;
using QAccessibleTextWidget::text;
protected:
QTextEdit *textEdit() const;
QPoint scrollBarPosition() const;
QTextCursor textCursor() const;
void setTextCursor(const QTextCursor &textCursor);
QTextDocument *textDocument() const;
QWidget *viewport() const;
QPoint scrollBarPosition() const Q_DECL_OVERRIDE;
QTextCursor textCursor() const Q_DECL_OVERRIDE;
void setTextCursor(const QTextCursor &textCursor) Q_DECL_OVERRIDE;
QTextDocument *textDocument() const Q_DECL_OVERRIDE;
QWidget *viewport() const Q_DECL_OVERRIDE;
};
#endif // QT_NO_TEXTEDIT
#endif //QT_NO_CURSOR
@ -182,10 +182,10 @@ class QAccessibleStackedWidget : public QAccessibleWidget
public:
explicit QAccessibleStackedWidget(QWidget *widget);
QAccessibleInterface *childAt(int x, int y) const;
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
QAccessibleInterface *child(int index) const;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
protected:
QStackedWidget *stackedWidget() const;
@ -212,9 +212,9 @@ class QAccessibleMdiArea : public QAccessibleWidget
public:
explicit QAccessibleMdiArea(QWidget *widget);
int childCount() const;
QAccessibleInterface *child(int index) const;
int indexOfChild(const QAccessibleInterface *child) const;
int childCount() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
protected:
QMdiArea *mdiArea() const;
@ -225,13 +225,13 @@ class QAccessibleMdiSubWindow : public QAccessibleWidget
public:
explicit QAccessibleMdiSubWindow(QWidget *widget);
QString text(QAccessible::Text textType) const;
void setText(QAccessible::Text textType, const QString &text);
QAccessible::State state() const;
int childCount() const;
QAccessibleInterface *child(int index) const;
int indexOfChild(const QAccessibleInterface *child) const;
QRect rect() const;
QString text(QAccessible::Text textType) const Q_DECL_OVERRIDE;
void setText(QAccessible::Text textType, const QString &text) Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
QRect rect() const Q_DECL_OVERRIDE;
protected:
QMdiSubWindow *mdiSubWindow() const;
@ -250,7 +250,7 @@ class QAccessibleTextBrowser : public QAccessibleTextEdit
public:
explicit QAccessibleTextBrowser(QWidget *widget);
QAccessible::Role role() const;
QAccessible::Role role() const Q_DECL_OVERRIDE;
};
#endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR
@ -260,10 +260,10 @@ class QAccessibleCalendarWidget : public QAccessibleWidget
public:
explicit QAccessibleCalendarWidget(QWidget *widget);
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
int childCount() const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
protected:
QCalendarWidget *calendarWidget() const;
@ -279,10 +279,10 @@ class QAccessibleDockWidget: public QAccessibleWidget
{
public:
explicit QAccessibleDockWidget(QWidget *widget);
QAccessibleInterface *child(int index) const;
int indexOfChild(const QAccessibleInterface *child) const;
int childCount() const;
QRect rect () const;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
QRect rect () const Q_DECL_OVERRIDE;
QDockWidget *dockWidget() const;
};
@ -292,18 +292,18 @@ class QAccessibleTitleBar : public QAccessibleInterface
public:
explicit QAccessibleTitleBar(QDockWidget *widget);
QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const;
int indexOfChild(const QAccessibleInterface *child) const;
int childCount() const;
QAccessibleInterface *childAt(int x, int y) const;
void setText(QAccessible::Text t, const QString &text);
QString text(QAccessible::Text t) const;
QAccessible::Role role() const;
QRect rect () const;
QAccessible::State state() const;
QObject *object() const;
bool isValid() const;
QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
QAccessible::Role role() const Q_DECL_OVERRIDE;
QRect rect () const Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
QObject *object() const Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QPointer<QDockWidget> m_dockWidget;
@ -319,10 +319,10 @@ class QAccessibleMainWindow : public QAccessibleWidget
public:
explicit QAccessibleMainWindow(QWidget *widget);
QAccessibleInterface *child(int index) const;
int childCount() const;
int indexOfChild(const QAccessibleInterface *iface) const;
QAccessibleInterface *childAt(int x, int y) const;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *iface) const Q_DECL_OVERRIDE;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
QMainWindow *mainWindow() const;
};

34
src/plugins/accessible/widgets/rangecontrols.h
View File

@ -62,15 +62,15 @@ class QAccessibleAbstractSpinBox: public QAccessibleWidget, public QAccessibleVa
public:
explicit QAccessibleAbstractSpinBox(QWidget *w);
QString text(QAccessible::Text t) const;
void *interface_cast(QAccessible::InterfaceType t);
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
// QAccessibleValueInterface
QVariant currentValue() const;
void setCurrentValue(const QVariant &value);
QVariant maximumValue() const;
QVariant minimumValue() const;
QVariant minimumStepSize() const;
QVariant currentValue() const Q_DECL_OVERRIDE;
void setCurrentValue(const QVariant &value) Q_DECL_OVERRIDE;
QVariant maximumValue() const Q_DECL_OVERRIDE;
QVariant minimumValue() const Q_DECL_OVERRIDE;
QVariant minimumStepSize() const Q_DECL_OVERRIDE;
// FIXME Action interface
@ -92,7 +92,7 @@ class QAccessibleDoubleSpinBox : public QAccessibleAbstractSpinBox
public:
explicit QAccessibleDoubleSpinBox(QWidget *widget);
QString text(QAccessible::Text t) const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
protected:
QDoubleSpinBox *doubleSpinBox() const;
@ -103,14 +103,14 @@ class QAccessibleAbstractSlider: public QAccessibleWidget, public QAccessibleVal
{
public:
explicit QAccessibleAbstractSlider(QWidget *w, QAccessible::Role r = QAccessible::Slider);
void *interface_cast(QAccessible::InterfaceType t);
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
// QAccessibleValueInterface
QVariant currentValue() const;
void setCurrentValue(const QVariant &value);
QVariant maximumValue() const;
QVariant minimumValue() const;
QVariant minimumStepSize() const;
QVariant currentValue() const Q_DECL_OVERRIDE;
void setCurrentValue(const QVariant &value) Q_DECL_OVERRIDE;
QVariant maximumValue() const Q_DECL_OVERRIDE;
QVariant minimumValue() const Q_DECL_OVERRIDE;
QVariant minimumStepSize() const Q_DECL_OVERRIDE;
protected:
QAbstractSlider *abstractSlider() const;
@ -121,7 +121,7 @@ class QAccessibleScrollBar : public QAccessibleAbstractSlider
{
public:
explicit QAccessibleScrollBar(QWidget *w);
QString text(QAccessible::Text t) const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
protected:
QScrollBar *scrollBar() const;
@ -133,7 +133,7 @@ class QAccessibleSlider : public QAccessibleAbstractSlider
{
public:
explicit QAccessibleSlider(QWidget *w);
QString text(QAccessible::Text t) const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
protected:
QSlider *slider() const;
@ -146,7 +146,7 @@ class QAccessibleDial : public QAccessibleAbstractSlider
public:
explicit QAccessibleDial(QWidget *w);
QString text(QAccessible::Text textType) const;
QString text(QAccessible::Text textType) const Q_DECL_OVERRIDE;
protected:
QDial *dial() const;

108
src/plugins/accessible/widgets/simplewidgets.h
View File

@ -61,12 +61,12 @@ class QAccessibleButton : public QAccessibleWidget
public:
QAccessibleButton(QWidget *w, QAccessible::Role r);
QString text(QAccessible::Text t) const;
QAccessible::State state() const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
QStringList actionNames() const;
void doAction(const QString &actionName);
QStringList keyBindingsForAction(const QString &actionName) const;
QStringList actionNames() const Q_DECL_OVERRIDE;
void doAction(const QString &actionName) Q_DECL_OVERRIDE;
QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE;
protected:
QAbstractButton *button() const;
@ -78,16 +78,16 @@ class QAccessibleToolButton : public QAccessibleButton
public:
QAccessibleToolButton(QWidget *w, QAccessible::Role role);
QAccessible::State state() const;
QAccessible::State state() const Q_DECL_OVERRIDE;
int childCount() const;
QAccessibleInterface *child(int index) const;
int childCount() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
QString text(QAccessible::Text t) const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
// QAccessibleActionInterface
QStringList actionNames() const;
void doAction(const QString &actionName);
QStringList actionNames() const Q_DECL_OVERRIDE;
void doAction(const QString &actionName) Q_DECL_OVERRIDE;
protected:
QToolButton *toolButton() const;
@ -101,16 +101,16 @@ class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInte
public:
explicit QAccessibleDisplay(QWidget *w, QAccessible::Role role = QAccessible::StaticText);
QString text(QAccessible::Text t) const;
QAccessible::Role role() const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
QAccessible::Role role() const Q_DECL_OVERRIDE;
QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const;
void *interface_cast(QAccessible::InterfaceType t);
QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE;
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
// QAccessibleImageInterface
QString imageDescription() const;
QSize imageSize() const;
QRect imagePosition() const;
QString imageDescription() const Q_DECL_OVERRIDE;
QSize imageSize() const Q_DECL_OVERRIDE;
QRect imagePosition() const Q_DECL_OVERRIDE;
};
#ifndef QT_NO_GROUPBOX
@ -119,16 +119,16 @@ class QAccessibleGroupBox : public QAccessibleWidget
public:
explicit QAccessibleGroupBox(QWidget *w);
QAccessible::State state() const;
QAccessible::Role role() const;
QString text(QAccessible::Text t) const;
QAccessible::State state() const Q_DECL_OVERRIDE;
QAccessible::Role role() const Q_DECL_OVERRIDE;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const;
QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE;
//QAccessibleActionInterface
QStringList actionNames() const;
void doAction(const QString &actionName);
QStringList keyBindingsForAction(const QString &) const;
QStringList actionNames() const Q_DECL_OVERRIDE;
void doAction(const QString &actionName) Q_DECL_OVERRIDE;
QStringList keyBindingsForAction(const QString &) const Q_DECL_OVERRIDE;
private:
QGroupBox *groupBox() const;
@ -141,36 +141,36 @@ class QAccessibleLineEdit : public QAccessibleWidget, public QAccessibleTextInte
public:
explicit QAccessibleLineEdit(QWidget *o, const QString &name = QString());
QString text(QAccessible::Text t) const;
void setText(QAccessible::Text t, const QString &text);
QAccessible::State state() const;
void *interface_cast(QAccessible::InterfaceType t);
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
// QAccessibleTextInterface
void addSelection(int startOffset, int endOffset);
QString attributes(int offset, int *startOffset, int *endOffset) const;
int cursorPosition() const;
QRect characterRect(int offset) const;
int selectionCount() const;
int offsetAtPoint(const QPoint &point) const;
void selection(int selectionIndex, int *startOffset, int *endOffset) const;
QString text(int startOffset, int endOffset) const;
void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE;
QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
int cursorPosition() const Q_DECL_OVERRIDE;
QRect characterRect(int offset) const Q_DECL_OVERRIDE;
int selectionCount() const Q_DECL_OVERRIDE;
int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE;
void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE;
QString textBeforeOffset (int offset, QAccessible::TextBoundaryType boundaryType,
int *startOffset, int *endOffset) const;
int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType,
int *startOffset, int *endOffset) const;
int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType,
int *startOffset, int *endOffset) const;
void removeSelection(int selectionIndex);
void setCursorPosition(int position);
void setSelection(int selectionIndex, int startOffset, int endOffset);
int characterCount() const;
void scrollToSubstring(int startIndex, int endIndex);
int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
void removeSelection(int selectionIndex) Q_DECL_OVERRIDE;
void setCursorPosition(int position) Q_DECL_OVERRIDE;
void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE;
int characterCount() const Q_DECL_OVERRIDE;
void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE;
// QAccessibleEditableTextInterface
void deleteText(int startOffset, int endOffset);
void insertText(int offset, const QString &text);
void replaceText(int startOffset, int endOffset, const QString &text);
void deleteText(int startOffset, int endOffset) Q_DECL_OVERRIDE;
void insertText(int offset, const QString &text) Q_DECL_OVERRIDE;
void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE;
protected:
QLineEdit *lineEdit() const;
};
@ -181,14 +181,14 @@ class QAccessibleProgressBar : public QAccessibleDisplay, public QAccessibleValu
{
public:
explicit QAccessibleProgressBar(QWidget *o);
void *interface_cast(QAccessible::InterfaceType t);
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
// QAccessibleValueInterface
QVariant currentValue() const;
QVariant maximumValue() const;
QVariant minimumValue() const;
QVariant minimumStepSize() const;
inline void setCurrentValue(const QVariant &) {}
QVariant currentValue() const Q_DECL_OVERRIDE;
QVariant maximumValue() const Q_DECL_OVERRIDE;
QVariant minimumValue() const Q_DECL_OVERRIDE;
QVariant minimumStepSize() const Q_DECL_OVERRIDE;
void setCurrentValue(const QVariant &) Q_DECL_OVERRIDE {}
protected:
QProgressBar *progressBar() const;

36
src/widgets/accessible/qaccessiblewidget.h
View File

@ -55,32 +55,32 @@ class Q_WIDGETS_EXPORT QAccessibleWidget : public QAccessibleObject, public QAcc
{
public:
explicit QAccessibleWidget(QWidget *o, QAccessible::Role r = QAccessible::Client, const QString& name = QString());
bool isValid() const;
bool isValid() const Q_DECL_OVERRIDE;
QWindow *window() const;
int childCount() const;
int indexOfChild(const QAccessibleInterface *child) const;
QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > relations(QAccessible::Relation match = QAccessible::AllRelations) const;
QAccessibleInterface *focusChild() const;
QWindow *window() const Q_DECL_OVERRIDE;
int childCount() const Q_DECL_OVERRIDE;
int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE;
QAccessibleInterface *focusChild() const Q_DECL_OVERRIDE;
QRect rect() const;
QRect rect() const Q_DECL_OVERRIDE;
QAccessibleInterface *parent() const;
QAccessibleInterface *child(int index) const;
QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
QString text(QAccessible::Text t) const;
QAccessible::Role role() const;
QAccessible::State state() const;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
QAccessible::Role role() const Q_DECL_OVERRIDE;
QAccessible::State state() const Q_DECL_OVERRIDE;
QColor foregroundColor() const;
QColor backgroundColor() const;
QColor foregroundColor() const Q_DECL_OVERRIDE;
QColor backgroundColor() const Q_DECL_OVERRIDE;
void *interface_cast(QAccessible::InterfaceType t);
void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
// QAccessibleActionInterface
QStringList actionNames() const;
void doAction(const QString &actionName);
QStringList keyBindingsForAction(const QString &actionName) const;
QStringList actionNames() const Q_DECL_OVERRIDE;
void doAction(const QString &actionName) Q_DECL_OVERRIDE;
QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE;
protected:
~QAccessibleWidget();
QWidget *widget() const;