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/plugins/accessible/widgets/simplewidgets.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/plugins/accessible/widgets/simplewidgets.cpp') diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index a9a43a7875..0112182a4b 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -67,7 +67,6 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_ACCESSIBILITY -using namespace QAccessible2; extern QList childWidgets(const QWidget *widget, bool includeTopLevel = false); QString Q_GUI_EXPORT qt_accStripAmp(const QString &text); @@ -724,7 +723,7 @@ QString QAccessibleLineEdit::text(int startOffset, int endOffset) const return lineEdit()->text().mid(startOffset, endOffset - startOffset); } -QString QAccessibleLineEdit::textBeforeOffset(int offset, BoundaryType boundaryType, +QString QAccessibleLineEdit::textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const { if (lineEdit()->echoMode() != QLineEdit::Normal) { @@ -734,7 +733,7 @@ QString QAccessibleLineEdit::textBeforeOffset(int offset, BoundaryType boundaryT return QAccessibleTextInterface::textBeforeOffset(offset, boundaryType, startOffset, endOffset); } -QString QAccessibleLineEdit::textAfterOffset(int offset, BoundaryType boundaryType, +QString QAccessibleLineEdit::textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const { if (lineEdit()->echoMode() != QLineEdit::Normal) { @@ -744,7 +743,7 @@ QString QAccessibleLineEdit::textAfterOffset(int offset, BoundaryType boundaryTy return QAccessibleTextInterface::textAfterOffset(offset, boundaryType, startOffset, endOffset); } -QString QAccessibleLineEdit::textAtOffset(int offset, BoundaryType boundaryType, +QString QAccessibleLineEdit::textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const { if (lineEdit()->echoMode() != QLineEdit::Normal) { -- cgit v1.2.3