diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
commit | 7702fe86029c771e641a918baa221b9737c0f18e (patch) | |
tree | 8e0795bc4c701518e1c66922f8e8b0cb359da155 /tests/auto/other | |
parent | 1dd54b5647d33416c39fb41fdab560c815356951 (diff) | |
parent | 38550c562d918e783bb609622bc8fb46de1bfec4 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/qaccessibility/accessiblewidgets.h | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/tests/auto/other/qaccessibility/accessiblewidgets.h b/tests/auto/other/qaccessibility/accessiblewidgets.h index 35b1ec890b..0c337a72f4 100644 --- a/tests/auto/other/qaccessibility/accessiblewidgets.h +++ b/tests/auto/other/qaccessibility/accessiblewidgets.h @@ -98,53 +98,54 @@ public: return 0; } CustomTextWidgetIface(CustomTextWidget *w): QAccessibleWidget(w) {} - void *interface_cast(QAccessible::InterfaceType t) { + void *interface_cast(QAccessible::InterfaceType t) override + { if (t == QAccessible::TextInterface) return static_cast<QAccessibleTextInterface*>(this); return 0; } // this is mostly to test the base implementation for textBefore/At/After - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE + QString text(QAccessible::Text t) const override { if (t == QAccessible::Value) return textWidget()->text; return QAccessibleWidget::text(t); } - QString textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const + QString textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const override { if (offset == -2) offset = textWidget()->cursorPosition; return QAccessibleTextInterface::textBeforeOffset(offset, boundaryType, startOffset, endOffset); } - QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const + QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const override { if (offset == -2) offset = textWidget()->cursorPosition; return QAccessibleTextInterface::textAtOffset(offset, boundaryType, startOffset, endOffset); } - QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const + QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const override { if (offset == -2) offset = textWidget()->cursorPosition; return QAccessibleTextInterface::textAfterOffset(offset, boundaryType, startOffset, endOffset); } - void selection(int, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE + void selection(int, int *startOffset, int *endOffset) const override { *startOffset = *endOffset = -1; } - int selectionCount() const Q_DECL_OVERRIDE { return 0; } - void addSelection(int, int) Q_DECL_OVERRIDE {} - void removeSelection(int) Q_DECL_OVERRIDE {} - void setSelection(int, int, int) Q_DECL_OVERRIDE {} - int cursorPosition() const Q_DECL_OVERRIDE { return textWidget()->cursorPosition; } - void setCursorPosition(int position) Q_DECL_OVERRIDE { textWidget()->cursorPosition = position; } - QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE { return textWidget()->text.mid(startOffset, endOffset); } - int characterCount() const Q_DECL_OVERRIDE { return textWidget()->text.length(); } - QRect characterRect(int) const Q_DECL_OVERRIDE { return QRect(); } - int offsetAtPoint(const QPoint &) const Q_DECL_OVERRIDE { return 0; } - void scrollToSubstring(int, int) Q_DECL_OVERRIDE {} - QString attributes(int, int *, int *) const Q_DECL_OVERRIDE + int selectionCount() const override { return 0; } + void addSelection(int, int) override {} + void removeSelection(int) override {} + void setSelection(int, int, int) override {} + int cursorPosition() const override { return textWidget()->cursorPosition; } + void setCursorPosition(int position) override { textWidget()->cursorPosition = position; } + QString text(int startOffset, int endOffset) const override { return textWidget()->text.mid(startOffset, endOffset); } + int characterCount() const override { return textWidget()->text.length(); } + QRect characterRect(int) const override { return QRect(); } + int offsetAtPoint(const QPoint &) const override { return 0; } + void scrollToSubstring(int, int) override {} + QString attributes(int, int *, int *) const override { return QString(); } private: |