From 8307ab784eb4d8d22441ee61f02cb381684ca3a2 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 5 Mar 2013 14:37:37 +0100 Subject: Make QTextCursor accessibility boundary finder available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows re-using the function in QtQuick. In addition TextBoundaryType is moved to QAccessible and QAccessible2 as namespace ceases to exist. Change-Id: I184bc2c181a22ca51ac4db4e5a080dc26d4acfe0 Reviewed-by: Jan Arve Sæther --- src/gui/accessible/qaccessible2.cpp | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) (limited to 'src/gui/accessible/qaccessible2.cpp') diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp index bd9ecde260..d790fac071 100644 --- a/src/gui/accessible/qaccessible2.cpp +++ b/src/gui/accessible/qaccessible2.cpp @@ -48,17 +48,6 @@ QT_BEGIN_NAMESPACE -/*! - \namespace QAccessible2 - \ingroup accessibility - \internal - - \brief The QAccessible2 namespace defines constants relating to - IAccessible2-based interfaces - - \l{IAccessible2 Specification} -*/ - /*! \class QAccessibleTextInterface \internal @@ -139,7 +128,7 @@ QT_BEGIN_NAMESPACE of that item; returns an empty string if there is no such an item. Sets \a startOffset and \a endOffset values to -1 on error. */ -QString QAccessibleTextInterface::textBeforeOffset(int offset, QAccessible2::BoundaryType boundaryType, +QString QAccessibleTextInterface::textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const { const QString txt = text(0, characterCount()); @@ -155,13 +144,13 @@ QString QAccessibleTextInterface::textBeforeOffset(int offset, QAccessible2::Bou QTextBoundaryFinder::BoundaryType type; switch (boundaryType) { - case QAccessible2::CharBoundary: + case QAccessible::CharBoundary: type = QTextBoundaryFinder::Grapheme; break; - case QAccessible2::WordBoundary: + case QAccessible::WordBoundary: type = QTextBoundaryFinder::Word; break; - case QAccessible2::SentenceBoundary: + case QAccessible::SentenceBoundary: type = QTextBoundaryFinder::Sentence; break; default: @@ -199,7 +188,7 @@ QString QAccessibleTextInterface::textBeforeOffset(int offset, QAccessible2::Bou of that item; returns an empty string if there is no such an item. Sets \a startOffset and \a endOffset values to -1 on error. */ -QString QAccessibleTextInterface::textAfterOffset(int offset, QAccessible2::BoundaryType boundaryType, +QString QAccessibleTextInterface::textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const { const QString txt = text(0, characterCount()); @@ -215,13 +204,13 @@ QString QAccessibleTextInterface::textAfterOffset(int offset, QAccessible2::Boun QTextBoundaryFinder::BoundaryType type; switch (boundaryType) { - case QAccessible2::CharBoundary: + case QAccessible::CharBoundary: type = QTextBoundaryFinder::Grapheme; break; - case QAccessible2::WordBoundary: + case QAccessible::WordBoundary: type = QTextBoundaryFinder::Word; break; - case QAccessible2::SentenceBoundary: + case QAccessible::SentenceBoundary: type = QTextBoundaryFinder::Sentence; break; default: @@ -259,7 +248,7 @@ QString QAccessibleTextInterface::textAfterOffset(int offset, QAccessible2::Boun of that item; returns an empty string if there is no such an item. Sets \a startOffset and \a endOffset values to -1 on error. */ -QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible2::BoundaryType boundaryType, +QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const { const QString txt = text(0, characterCount()); @@ -275,13 +264,13 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible2::Boundar QTextBoundaryFinder::BoundaryType type; switch (boundaryType) { - case QAccessible2::CharBoundary: + case QAccessible::CharBoundary: type = QTextBoundaryFinder::Grapheme; break; - case QAccessible2::WordBoundary: + case QAccessible::WordBoundary: type = QTextBoundaryFinder::Word; break; - case QAccessible2::SentenceBoundary: + case QAccessible::SentenceBoundary: type = QTextBoundaryFinder::Sentence; break; default: -- cgit v1.2.3