From 0cba86f7a4ebacc103990ecf16bc407da55cc49e Mon Sep 17 00:00:00 2001 From: Jan-Arve Saether Date: Wed, 8 Aug 2012 17:17:24 +0200 Subject: Group functions in QAccessibleTextInterface Do the same in QAccessibleTextWidget I got a bit annoyed by this, should hopefully make life easier when forward porting QPlainTextEdit Change-Id: Ib4b90d1892974ea39ecfcbc5cad6ed0694207b58 Reviewed-by: Frederik Gladhorn --- .../accessible/widgets/qaccessiblewidgets.h | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'src/plugins/accessible/widgets/qaccessiblewidgets.h') diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.h b/src/plugins/accessible/widgets/qaccessiblewidgets.h index e403465ba3..8b34353a6b 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.h +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.h @@ -76,13 +76,18 @@ public: QAccessibleTextWidget(QWidget *o, QAccessible::Role r = QAccessible::EditableText, const QString &name = QString()); // QAccessibleTextInterface + // selection + void selection(int selectionIndex, int *startOffset, int *endOffset) const; + int selectionCount() const; void addSelection(int startOffset, int endOffset); - QString attributes(int offset, int *startOffset, int *endOffset) const; + void removeSelection(int selectionIndex); + void setSelection(int selectionIndex, int startOffset, int endOffset); + + // cursor 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; + void setCursorPosition(int position); + + // text QString text(int startOffset, int endOffset) const; QString textBeforeOffset(int offset, QAccessible2::BoundaryType boundaryType, int *startOffset, int *endOffset) const; @@ -90,11 +95,13 @@ public: int *startOffset, int *endOffset) const; QString textAtOffset(int offset, QAccessible2::BoundaryType 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; + // character <-> geometry + QRect characterRect(int offset) const; + int offsetAtPoint(const QPoint &point) const; + + QString attributes(int offset, int *startOffset, int *endOffset) const; // QAccessibleEditableTextInterface void deleteText(int startOffset, int endOffset); -- cgit v1.2.3