diff options
author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2012-08-08 17:17:24 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-14 09:16:16 +0200 |
commit | 0cba86f7a4ebacc103990ecf16bc407da55cc49e (patch) | |
tree | a6344724a3fdd4113d5165ef6b25f0497ff6b593 | |
parent | 4564103d538abbb3ce9f2f11963465f8529b3c7d (diff) |
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 <frederik.gladhorn@nokia.com>
-rw-r--r-- | src/gui/accessible/qaccessible2.h | 25 | ||||
-rw-r--r-- | src/plugins/accessible/widgets/qaccessiblewidgets.h | 23 |
2 files changed, 31 insertions, 17 deletions
diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h index 91f6b73f3e..be65629148 100644 --- a/src/gui/accessible/qaccessible2.h +++ b/src/gui/accessible/qaccessible2.h @@ -70,14 +70,18 @@ class Q_GUI_EXPORT QAccessibleTextInterface { public: virtual ~QAccessibleTextInterface() {} - + // selection + virtual void selection(int selectionIndex, int *startOffset, int *endOffset) const = 0; + virtual int selectionCount() const = 0; virtual void addSelection(int startOffset, int endOffset) = 0; - virtual QString attributes(int offset, int *startOffset, int *endOffset) const = 0; + virtual void removeSelection(int selectionIndex) = 0; + virtual void setSelection(int selectionIndex, int startOffset, int endOffset) = 0; + + // cursor virtual int cursorPosition() const = 0; - virtual QRect characterRect(int offset) const = 0; - virtual int selectionCount() const = 0; - virtual int offsetAtPoint(const QPoint &point) const = 0; - virtual void selection(int selectionIndex, int *startOffset, int *endOffset) const = 0; + virtual void setCursorPosition(int position) = 0; + + // text virtual QString text(int startOffset, int endOffset) const = 0; virtual QString textBeforeOffset (int offset, QAccessible2::BoundaryType boundaryType, int *startOffset, int *endOffset) const = 0; @@ -85,11 +89,14 @@ public: int *startOffset, int *endOffset) const = 0; virtual QString textAtOffset(int offset, QAccessible2::BoundaryType boundaryType, int *startOffset, int *endOffset) const = 0; - virtual void removeSelection(int selectionIndex) = 0; - virtual void setCursorPosition(int position) = 0; - virtual void setSelection(int selectionIndex, int startOffset, int endOffset) = 0; virtual int characterCount() const = 0; + + // character <-> geometry + virtual QRect characterRect(int offset) const = 0; + virtual int offsetAtPoint(const QPoint &point) const = 0; + virtual void scrollToSubstring(int startIndex, int endIndex) = 0; + virtual QString attributes(int offset, int *startOffset, int *endOffset) const = 0; }; class Q_GUI_EXPORT QAccessibleEditableTextInterface 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); |