From 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 10:36:49 +0200 Subject: Replace Q_DECL_OVERRIDE with override where possible Remaining uses of Q_DECL_OVERRIDE are in: src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.cpp doc/global/qt-cpp-defines.qdocconf (definition and documentation of Q_DECL_OVERRIDE) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba Reviewed-by: Lars Knoll Reviewed-by: Ville Voutilainen Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/widgets/accessible/complexwidgets.cpp | 32 ++--- src/widgets/accessible/complexwidgets_p.h | 36 +++--- src/widgets/accessible/itemviews_p.h | 176 +++++++++++++------------- src/widgets/accessible/qaccessiblemenu_p.h | 54 ++++---- src/widgets/accessible/qaccessiblewidget.h | 36 +++--- src/widgets/accessible/qaccessiblewidgets_p.h | 132 +++++++++---------- src/widgets/accessible/rangecontrols_p.h | 72 +++++------ src/widgets/accessible/simplewidgets_p.h | 118 ++++++++--------- 8 files changed, 328 insertions(+), 328 deletions(-) (limited to 'src/widgets/accessible') diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index efbca0331d..94ad011533 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -89,16 +89,16 @@ public: : m_parent(parent), m_index(index) {} - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE { + void *interface_cast(QAccessible::InterfaceType t) override { if (t == QAccessible::ActionInterface) { return static_cast(this); } return 0; } - QObject *object() const Q_DECL_OVERRIDE { return 0; } - QAccessible::Role role() const Q_DECL_OVERRIDE { return QAccessible::PageTab; } - QAccessible::State state() const Q_DECL_OVERRIDE { + QObject *object() const override { return 0; } + QAccessible::Role role() const override { return QAccessible::PageTab; } + QAccessible::State state() const override { if (!isValid()) { QAccessible::State s; s.invalid = true; @@ -106,7 +106,7 @@ public: } return parent()->state(); } - QRect rect() const Q_DECL_OVERRIDE { + QRect rect() const override { if (!isValid()) return QRect(); @@ -116,13 +116,13 @@ public: return rec; } - bool isValid() const Q_DECL_OVERRIDE { return m_parent.data() && m_parent->count() > m_index; } + bool isValid() const override { return m_parent.data() && m_parent->count() > m_index; } - 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; } + QAccessibleInterface *childAt(int, int) const override { return 0; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE + QString text(QAccessible::Text t) const override { if (!isValid()) return QString(); @@ -152,26 +152,26 @@ public: return str; } - void setText(QAccessible::Text, const QString &) Q_DECL_OVERRIDE {} + void setText(QAccessible::Text, const QString &) override {} - QAccessibleInterface *parent() const Q_DECL_OVERRIDE { + QAccessibleInterface *parent() const override { return QAccessible::queryAccessibleInterface(m_parent.data()); } - QAccessibleInterface *child(int) const Q_DECL_OVERRIDE { return 0; } + QAccessibleInterface *child(int) const override { return 0; } // action interface - QStringList actionNames() const Q_DECL_OVERRIDE + QStringList actionNames() const override { return QStringList(pressAction()); } - void doAction(const QString &actionName) Q_DECL_OVERRIDE + void doAction(const QString &actionName) override { if (isValid() && actionName == pressAction()) m_parent->setCurrentIndex(m_index); } - QStringList keyBindingsForAction(const QString &) const Q_DECL_OVERRIDE + QStringList keyBindingsForAction(const QString &) const override { return QStringList(); } diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h index 6f5c950631..c842490603 100644 --- a/src/widgets/accessible/complexwidgets_p.h +++ b/src/widgets/accessible/complexwidgets_p.h @@ -85,11 +85,11 @@ public: Undefined }; - 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; + QAccessibleInterface *child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + bool isValid() const override; + QAccessibleInterface *childAt(int x, int y) const override; //protected: QAbstractScrollArea *abstractScrollArea() const; @@ -114,11 +114,11 @@ public: explicit QAccessibleTabBar(QWidget *w); ~QAccessibleTabBar(); - int childCount() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + int childCount() const override; + QString text(QAccessible::Text t) const override; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; protected: QTabBar *tabBar() const; @@ -132,18 +132,18 @@ class QAccessibleComboBox : public QAccessibleWidget public: explicit QAccessibleComboBox(QWidget *w); - 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; + int childCount() const override; + QAccessibleInterface *childAt(int x, int y) const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QAccessibleInterface* child(int index) const override; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; // QAccessibleActionInterface - 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; + QStringList actionNames() const override; + QString localizedActionDescription(const QString &actionName) const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; protected: QComboBox *comboBox() const; diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h index 72841b8a0f..61d0387f9c 100644 --- a/src/widgets/accessible/itemviews_p.h +++ b/src/widgets/accessible/itemviews_p.h @@ -71,48 +71,48 @@ class QAccessibleTable :public QAccessibleTableInterface, public QAccessibleObje { public: explicit QAccessibleTable(QWidget *w); - bool isValid() const Q_DECL_OVERRIDE; + bool isValid() const override; - 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; + QAccessible::Role role() const override; + QAccessible::State state() const override; + QString text(QAccessible::Text t) const override; + QRect rect() const override; - 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 *childAt(int x, int y) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *) const override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // table interface - 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; + virtual QAccessibleInterface *cellAt(int row, int column) const override; + virtual QAccessibleInterface *caption() const override; + virtual QAccessibleInterface *summary() const override; + virtual QString columnDescription(int column) const override; + virtual QString rowDescription(int row) const override; + virtual int columnCount() const override; + virtual int rowCount() const override; // selection - virtual int selectedCellCount() const Q_DECL_OVERRIDE; - virtual int selectedColumnCount() const Q_DECL_OVERRIDE; - virtual int selectedRowCount() const Q_DECL_OVERRIDE; - virtual QList selectedCells() const Q_DECL_OVERRIDE; - virtual QList selectedColumns() const Q_DECL_OVERRIDE; - virtual QList 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; + virtual int selectedCellCount() const override; + virtual int selectedColumnCount() const override; + virtual int selectedRowCount() const override; + virtual QList selectedCells() const override; + virtual QList selectedColumns() const override; + virtual QList selectedRows() const override; + virtual bool isColumnSelected(int column) const override; + virtual bool isRowSelected(int row) const override; + virtual bool selectRow(int row) override; + virtual bool selectColumn(int column) override; + virtual bool unselectRow(int row) override; + virtual bool unselectColumn(int column) override; QAbstractItemView *view() const; - void modelChange(QAccessibleTableModelChangeEvent *event) Q_DECL_OVERRIDE; + void modelChange(QAccessibleTableModelChangeEvent *event) override; protected: inline QAccessible::Role cellRole() const { @@ -153,19 +153,19 @@ public: {} - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *childAt(int x, int y) const override; + int childCount() const override; + QAccessibleInterface *child(int index) const override; - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE; + int indexOfChild(const QAccessibleInterface *) const override; - int rowCount() const Q_DECL_OVERRIDE; + int rowCount() const override; // table interface - 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; + QAccessibleInterface *cellAt(int row, int column) const override; + QString rowDescription(int row) const override; + bool isRowSelected(int row) const override; + bool selectRow(int row) override; private: QModelIndex indexFromLogical(int row, int column = 0) const; @@ -179,37 +179,37 @@ class QAccessibleTableCell: public QAccessibleInterface, public QAccessibleTable public: QAccessibleTableCell(QAbstractItemView *view, const QModelIndex &m_index, QAccessible::Role role); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; - QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; } - 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; + void *interface_cast(QAccessible::InterfaceType t) override; + QObject *object() const override { return Q_NULLPTR; } + QAccessible::Role role() const override; + QAccessible::State state() const override; + QRect rect() const override; + bool isValid() const override; - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return Q_NULLPTR; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int) const override; // cell interface - virtual int columnExtent() const Q_DECL_OVERRIDE; - virtual QList columnHeaderCells() const Q_DECL_OVERRIDE; - virtual int columnIndex() const Q_DECL_OVERRIDE; - virtual int rowExtent() const Q_DECL_OVERRIDE; - virtual QList 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; + virtual int columnExtent() const override; + virtual QList columnHeaderCells() const override; + virtual int columnIndex() const override; + virtual int rowExtent() const override; + virtual QList rowHeaderCells() const override; + virtual int rowIndex() const override; + virtual bool isSelected() const override; + virtual QAccessibleInterface* table() const override; //action interface - 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; + virtual QStringList actionNames() const override; + virtual void doAction(const QString &actionName) override; + virtual QStringList keyBindingsForAction(const QString &actionName) const override; private: QHeaderView *verticalHeader() const; @@ -234,21 +234,21 @@ public: // For header cells, pass the header view in addition QAccessibleTableHeaderCell(QAbstractItemView *view, int index, Qt::Orientation orientation); - QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; } - 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; + QObject *object() const override { return Q_NULLPTR; } + QAccessible::Role role() const override; + QAccessible::State state() const override; + QRect rect() const override; + bool isValid() const override; - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return Q_NULLPTR; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; private: QHeaderView *headerView() const; @@ -273,23 +273,23 @@ public: :view(view_) {} - QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; } - 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; } + QObject *object() const override { return Q_NULLPTR; } + QAccessible::Role role() const override { return QAccessible::Pane; } + QAccessible::State state() const override { return QAccessible::State(); } + QRect rect() const override { return QRect(); } + bool isValid() const override { return true; } - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return Q_NULLPTR; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text) const Q_DECL_OVERRIDE { return QString(); } - void setText(QAccessible::Text, const QString &) Q_DECL_OVERRIDE {} + QString text(QAccessible::Text) const override { return QString(); } + void setText(QAccessible::Text, const QString &) override {} - QAccessibleInterface *parent() const Q_DECL_OVERRIDE { + QAccessibleInterface *parent() const override { return QAccessible::queryAccessibleInterface(view); } - QAccessibleInterface *child(int) const Q_DECL_OVERRIDE { + QAccessibleInterface *child(int) const override { return Q_NULLPTR; } diff --git a/src/widgets/accessible/qaccessiblemenu_p.h b/src/widgets/accessible/qaccessiblemenu_p.h index 52afeb5a04..4372ae4dcc 100644 --- a/src/widgets/accessible/qaccessiblemenu_p.h +++ b/src/widgets/accessible/qaccessiblemenu_p.h @@ -69,14 +69,14 @@ class QAccessibleMenu : public QAccessibleWidget public: explicit QAccessibleMenu(QWidget *w); - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *childAt(int x, int y) const override; - 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; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; + QAccessibleInterface *child(int index) const override; + QAccessibleInterface *parent() const override; + int indexOfChild( const QAccessibleInterface *child ) const override; protected: QMenu *menu() const; @@ -88,10 +88,10 @@ class QAccessibleMenuBar : public QAccessibleWidget public: explicit QAccessibleMenuBar(QWidget *w); - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int childCount() const override; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + int indexOfChild(const QAccessibleInterface *child) const override; protected: QMenuBar *menuBar() const; @@ -105,28 +105,28 @@ public: explicit QAccessibleMenuItem(QWidget *owner, QAction *w); ~QAccessibleMenuItem(); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; - 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; + int childCount() const override; + QAccessibleInterface *childAt(int x, int y) const override; + bool isValid() const override; + int indexOfChild(const QAccessibleInterface * child) const override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - QObject * object() const Q_DECL_OVERRIDE; - QWindow *window() const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; + QObject * object() const override; + QWindow *window() const 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; + QRect rect() const override; + QAccessible::Role role() const override; + void setText(QAccessible::Text t, const QString & text) override; + QAccessible::State state() const override; + QString text(QAccessible::Text t) const override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; QWidget *owner() const; protected: diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index e09c3ff489..63789a595f 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -54,32 +54,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 Q_DECL_OVERRIDE; + bool isValid() const override; - QWindow *window() const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QVector > relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE; - QAccessibleInterface *focusChild() const Q_DECL_OVERRIDE; + QWindow *window() const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QVector > relations(QAccessible::Relation match = QAccessible::AllRelations) const override; + QAccessibleInterface *focusChild() const override; - QRect rect() const Q_DECL_OVERRIDE; + QRect rect() const override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; + QAccessible::State state() const override; - QColor foregroundColor() const Q_DECL_OVERRIDE; - QColor backgroundColor() const Q_DECL_OVERRIDE; + QColor foregroundColor() const override; + QColor backgroundColor() const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; protected: ~QAccessibleWidget(); QWidget *widget() const; diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h index 050930243d..e663d70de6 100644 --- a/src/widgets/accessible/qaccessiblewidgets_p.h +++ b/src/widgets/accessible/qaccessiblewidgets_p.h @@ -85,40 +85,40 @@ class QAccessibleTextWidget : public QAccessibleWidget, public: QAccessibleTextWidget(QWidget *o, QAccessible::Role r = QAccessible::EditableText, const QString &name = QString()); - QAccessible::State state() const Q_DECL_OVERRIDE; + QAccessible::State state() const override; // QAccessibleTextInterface // selection - 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; + void selection(int selectionIndex, int *startOffset, int *endOffset) const override; + int selectionCount() const override; + void addSelection(int startOffset, int endOffset) override; + void removeSelection(int selectionIndex) override; + void setSelection(int selectionIndex, int startOffset, int endOffset) override; // cursor - int cursorPosition() const Q_DECL_OVERRIDE; - void setCursorPosition(int position) Q_DECL_OVERRIDE; + int cursorPosition() const override; + void setCursorPosition(int position) override; // text - QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE; + QString text(int startOffset, int endOffset) const override; QString textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - int characterCount() const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; + int characterCount() const override; // character <-> geometry - QRect characterRect(int offset) const Q_DECL_OVERRIDE; - int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE; + QRect characterRect(int offset) const override; + int offsetAtPoint(const QPoint &point) const override; - QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + QString attributes(int offset, int *startOffset, int *endOffset) const override; // QAccessibleEditableTextInterface - 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; + void deleteText(int startOffset, int endOffset) override; + void insertText(int offset, const QString &text) override; + void replaceText(int startOffset, int endOffset, const QString &text) override; using QAccessibleWidget::text; @@ -138,25 +138,25 @@ class QAccessiblePlainTextEdit : public QAccessibleTextWidget public: explicit QAccessiblePlainTextEdit(QWidget *o); - 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; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessible::State state() const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleTextInterface - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + void scrollToSubstring(int startIndex, int endIndex) override; using QAccessibleTextWidget::text; protected: QPlainTextEdit *plainTextEdit() 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; + QPoint scrollBarPosition() const override; + QTextCursor textCursor() const override; + void setTextCursor(const QTextCursor &textCursor) override; + QTextDocument *textDocument() const override; + QWidget *viewport() const override; }; class QAccessibleTextEdit : public QAccessibleTextWidget @@ -164,25 +164,25 @@ class QAccessibleTextEdit : public QAccessibleTextWidget public: explicit QAccessibleTextEdit(QWidget *o); - 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; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessible::State state() const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleTextInterface - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + void scrollToSubstring(int startIndex, int endIndex) override; using QAccessibleTextWidget::text; protected: QTextEdit *textEdit() 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; + QPoint scrollBarPosition() const override; + QTextCursor textCursor() const override; + void setTextCursor(const QTextCursor &textCursor) override; + QTextDocument *textDocument() const override; + QWidget *viewport() const override; }; #endif // QT_NO_TEXTEDIT #endif //QT_NO_CURSOR @@ -192,10 +192,10 @@ class QAccessibleStackedWidget : public QAccessibleWidget public: explicit QAccessibleStackedWidget(QWidget *widget); - 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; + QAccessibleInterface *childAt(int x, int y) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QAccessibleInterface *child(int index) const override; protected: QStackedWidget *stackedWidget() const; @@ -222,9 +222,9 @@ class QAccessibleMdiArea : public QAccessibleWidget public: explicit QAccessibleMdiArea(QWidget *widget); - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; protected: QMdiArea *mdiArea() const; @@ -235,13 +235,13 @@ class QAccessibleMdiSubWindow : public QAccessibleWidget public: explicit QAccessibleMdiSubWindow(QWidget *widget); - 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; + QString text(QAccessible::Text textType) const override; + void setText(QAccessible::Text textType, const QString &text) override; + QAccessible::State state() const override; + int childCount() const override; + QAccessibleInterface *child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QRect rect() const override; protected: QMdiSubWindow *mdiSubWindow() const; @@ -262,7 +262,7 @@ class QAccessibleTextBrowser : public QAccessibleTextEdit public: explicit QAccessibleTextBrowser(QWidget *widget); - QAccessible::Role role() const Q_DECL_OVERRIDE; + QAccessible::Role role() const override; }; #endif // QT_CONFIG(textbrowser) && QT_NO_CURSOR @@ -272,10 +272,10 @@ class QAccessibleCalendarWidget : public QAccessibleWidget public: explicit QAccessibleCalendarWidget(QWidget *widget); - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; protected: QCalendarWidget *calendarWidget() const; @@ -291,11 +291,11 @@ class QAccessibleDockWidget: public QAccessibleWidget { public: explicit QAccessibleDockWidget(QWidget *widget); - 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; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; + int childCount() const override; + QRect rect () const override; + QString text(QAccessible::Text t) const override; QDockWidget *dockWidget() const; protected: @@ -310,10 +310,10 @@ class QAccessibleMainWindow : public QAccessibleWidget public: explicit QAccessibleMainWindow(QWidget *widget); - 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; + QAccessibleInterface *child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *iface) const override; + QAccessibleInterface *childAt(int x, int y) const override; QMainWindow *mainWindow() const; }; diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index 49f57fa1c6..41c3747c05 100644 --- a/src/widgets/accessible/rangecontrols_p.h +++ b/src/widgets/accessible/rangecontrols_p.h @@ -78,41 +78,41 @@ public: explicit QAccessibleAbstractSpinBox(QWidget *w); virtual ~QAccessibleAbstractSpinBox(); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleValueInterface - 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; + QVariant currentValue() const override; + void setCurrentValue(const QVariant &value) override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; // QAccessibleTextInterface - 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; + void addSelection(int startOffset, int endOffset) override; + QString attributes(int offset, int *startOffset, int *endOffset) const override; + int cursorPosition() const override; + QRect characterRect(int offset) const override; + int selectionCount() const override; + int offsetAtPoint(const QPoint &point) const override; + void selection(int selectionIndex, int *startOffset, int *endOffset) const override; + QString text(int startOffset, int endOffset) const override; QString textBeforeOffset (int offset, QAccessible::TextBoundaryType boundaryType, - int *endOffset, int *startOffset) const Q_DECL_OVERRIDE; + int *endOffset, int *startOffset) const override; QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, - 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; + int *startOffset, int *endOffset) const override; + void removeSelection(int selectionIndex) override; + void setCursorPosition(int position) override; + void setSelection(int selectionIndex, int startOffset, int endOffset) override; + int characterCount() const override; + void scrollToSubstring(int startIndex, int endIndex) override; // QAccessibleEditableTextInterface - 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; + void deleteText(int startOffset, int endOffset) override; + void insertText(int offset, const QString &text) override; + void replaceText(int startOffset, int endOffset, const QString &text) override; protected: QAbstractSpinBox *abstractSpinBox() const; @@ -135,7 +135,7 @@ class QAccessibleDoubleSpinBox : public QAccessibleAbstractSpinBox public: explicit QAccessibleDoubleSpinBox(QWidget *widget); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; using QAccessibleAbstractSpinBox::text; protected: @@ -148,14 +148,14 @@ class QAccessibleAbstractSlider: public QAccessibleWidget, public QAccessibleVal { public: explicit QAccessibleAbstractSlider(QWidget *w, QAccessible::Role r = QAccessible::Slider); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleValueInterface - 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; + QVariant currentValue() const override; + void setCurrentValue(const QVariant &value) override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; protected: QAbstractSlider *abstractSlider() const; @@ -167,7 +167,7 @@ class QAccessibleScrollBar : public QAccessibleAbstractSlider { public: explicit QAccessibleScrollBar(QWidget *w); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; protected: QScrollBar *scrollBar() const; @@ -179,7 +179,7 @@ class QAccessibleSlider : public QAccessibleAbstractSlider { public: explicit QAccessibleSlider(QWidget *w); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; protected: QSlider *slider() const; @@ -192,7 +192,7 @@ class QAccessibleDial : public QAccessibleAbstractSlider public: explicit QAccessibleDial(QWidget *w); - QString text(QAccessible::Text textType) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text textType) const override; protected: QDial *dial() const; diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index c25aa31425..08ce1a9d77 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -72,14 +72,14 @@ class QAccessibleButton : public QAccessibleWidget public: QAccessibleButton(QWidget *w); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::State state() const override; + QRect rect() const override; + QAccessible::Role role() const override; - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; protected: QAbstractButton *button() const; @@ -92,15 +92,15 @@ class QAccessibleToolButton : public QAccessibleButton public: QAccessibleToolButton(QWidget *w); - QAccessible::State state() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; + QAccessible::State state() const override; + QAccessible::Role role() const override; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *child(int index) const override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; protected: QToolButton *toolButton() const; @@ -114,16 +114,16 @@ class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInte public: explicit QAccessibleDisplay(QWidget *w, QAccessible::Role role = QAccessible::StaticText); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; - QVector >relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + QVector >relations(QAccessible::Relation match = QAccessible::AllRelations) const override; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleImageInterface - QString imageDescription() const Q_DECL_OVERRIDE; - QSize imageSize() const Q_DECL_OVERRIDE; - QPoint imagePosition() const Q_DECL_OVERRIDE; + QString imageDescription() const override; + QSize imageSize() const override; + QPoint imagePosition() const override; }; #if QT_CONFIG(groupbox) @@ -132,16 +132,16 @@ class QAccessibleGroupBox : public QAccessibleWidget public: explicit QAccessibleGroupBox(QWidget *w); - QAccessible::State state() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QAccessible::State state() const override; + QAccessible::Role role() const override; + QString text(QAccessible::Text t) const override; - QVector >relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE; + QVector >relations(QAccessible::Relation match = QAccessible::AllRelations) const override; //QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &) const override; private: QGroupBox *groupBox() const; @@ -154,36 +154,36 @@ class QAccessibleLineEdit : public QAccessibleWidget, public QAccessibleTextInte public: explicit QAccessibleLineEdit(QWidget *o, const QString &name = QString()); - 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; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessible::State state() const override; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleTextInterface - 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; + void addSelection(int startOffset, int endOffset) override; + QString attributes(int offset, int *startOffset, int *endOffset) const override; + int cursorPosition() const override; + QRect characterRect(int offset) const override; + int selectionCount() const override; + int offsetAtPoint(const QPoint &point) const override; + void selection(int selectionIndex, int *startOffset, int *endOffset) const override; + QString text(int startOffset, int endOffset) const override; QString textBeforeOffset (int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, - 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; + int *startOffset, int *endOffset) const override; + void removeSelection(int selectionIndex) override; + void setCursorPosition(int position) override; + void setSelection(int selectionIndex, int startOffset, int endOffset) override; + int characterCount() const override; + void scrollToSubstring(int startIndex, int endIndex) override; // QAccessibleEditableTextInterface - 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; + void deleteText(int startOffset, int endOffset) override; + void insertText(int offset, const QString &text) override; + void replaceText(int startOffset, int endOffset, const QString &text) override; protected: QLineEdit *lineEdit() const; friend class QAccessibleAbstractSpinBox; @@ -195,14 +195,14 @@ class QAccessibleProgressBar : public QAccessibleDisplay, public QAccessibleValu { public: explicit QAccessibleProgressBar(QWidget *o); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleValueInterface - 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 {} + QVariant currentValue() const override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; + void setCurrentValue(const QVariant &) override {} protected: QProgressBar *progressBar() const; @@ -214,9 +214,9 @@ class QAccessibleWindowContainer : public QAccessibleWidget { public: QAccessibleWindowContainer(QWidget *w); - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int i) const Q_DECL_OVERRIDE; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QAccessibleInterface *child(int i) const override; private: QWindowContainer *container() const; -- cgit v1.2.3