diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-05 14:37:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-08 11:35:44 +0200 |
| commit | 8307ab784eb4d8d22441ee61f02cb381684ca3a2 (patch) | |
| tree | 9ad1be637574d2979b5a63b3087dfab7770daf2f /src/plugins/accessible/widgets/simplewidgets.cpp | |
| parent | 6f0dc9f4c7c1405bdbfef32395d0fb091bb0c8c8 (diff) | |
Make QTextCursor accessibility boundary finder available
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 <jan-arve.saether@digia.com>
Diffstat (limited to 'src/plugins/accessible/widgets/simplewidgets.cpp')
| -rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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<QWidget*> 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) { |