diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 15:41:47 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 15:42:22 +0200 |
| commit | 90297a64f203959f90041887ea31f4bd04bc059a (patch) | |
| tree | 86f8ad6a5af26fd618cdb2e20601e6df89ac94d6 /src/platformsupport | |
| parent | 537a4bc4011d32de193dc31caf09a44c1810ab33 (diff) | |
| parent | f273d6fbc02055ff3999adc0df76360ca0670435 (diff) | |
Merge branch 'stable' into dev
Change-Id: Icff019d74ae04c628a80f66aa478e4db40fae464
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/linuxaccessibility/atspiadaptor.cpp | 14 | ||||
| -rw-r--r-- | src/platformsupport/linuxaccessibility/atspiadaptor_p.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp index e4702e8497..6efd5085ac 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp +++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp @@ -1791,7 +1791,7 @@ bool AtSpiAdaptor::textInterface(QAccessibleInterface *interface, const QString int offset = message.arguments().at(0).toInt(); int start; int end; - QString result = interface->textInterface()->textAtOffset(offset, QAccessible2::CharBoundary, &start, &end); + QString result = interface->textInterface()->textAtOffset(offset, QAccessible::CharBoundary, &start, &end); sendReply(connection, message, (int) *(qPrintable (result))); } else if (function == QLatin1String("GetCharacterExtents")) { int offset = message.arguments().at(0).toInt(); @@ -1879,23 +1879,23 @@ bool AtSpiAdaptor::textInterface(QAccessibleInterface *interface, const QString return true; } -QAccessible2::BoundaryType AtSpiAdaptor::qAccessibleBoundaryType(int atspiTextBoundaryType) const +QAccessible::TextBoundaryType AtSpiAdaptor::qAccessibleBoundaryType(int atspiTextBoundaryType) const { switch (atspiTextBoundaryType) { case ATSPI_TEXT_BOUNDARY_CHAR: - return QAccessible2::CharBoundary; + return QAccessible::CharBoundary; case ATSPI_TEXT_BOUNDARY_WORD_START: case ATSPI_TEXT_BOUNDARY_WORD_END: - return QAccessible2::WordBoundary; + return QAccessible::WordBoundary; case ATSPI_TEXT_BOUNDARY_SENTENCE_START: case ATSPI_TEXT_BOUNDARY_SENTENCE_END: - return QAccessible2::SentenceBoundary; + return QAccessible::SentenceBoundary; case ATSPI_TEXT_BOUNDARY_LINE_START: case ATSPI_TEXT_BOUNDARY_LINE_END: - return QAccessible2::LineBoundary; + return QAccessible::LineBoundary; } Q_ASSERT_X(0, "", "Requested invalid boundary type."); - return QAccessible2::CharBoundary; + return QAccessible::CharBoundary; } // FIXME all attribute methods below should share code diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h index aafaecfeae..6f005c33ab 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h +++ b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h @@ -128,7 +128,7 @@ private: QVariantList getAttributeValue(QAccessibleInterface *, int offset, const QString &attributeName) const; QRect getCharacterExtents(QAccessibleInterface *, int offset, uint coordType) const; QRect getRangeExtents(QAccessibleInterface *, int startOffset, int endOffset, uint coordType) const; - QAccessible2::BoundaryType qAccessibleBoundaryType(int atspiTextBoundaryType) const; + QAccessible::TextBoundaryType qAccessibleBoundaryType(int atspiTextBoundaryType) const; static bool inheritsQAction(QObject *object); // private vars |