From ae6acb42a3fae459034ea153565bb08a9b88ad54 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 1 Feb 2012 10:15:09 +0100 Subject: [PATCH] Accessibility: Use new updateAccessibility() API in declarative. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7ab5c767c9d21c9cad1ee7f7c1f6e21ed4dccef3 Reviewed-by: Jan-Arve Sæther --- src/qtquick1/graphicsitems/qdeclarativeaccessibleattached.cpp | 2 +- src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h | 4 ++-- src/quick/items/qquickaccessibleattached.cpp | 2 +- src/quick/items/qquickaccessibleattached_p.h | 4 ++-- src/quick/items/qquickitem.cpp | 4 ++-- src/quick/items/qquicktextinput.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached.cpp b/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached.cpp index 123391bb73..3a5d09b92f 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached.cpp @@ -59,7 +59,7 @@ QDeclarativeAccessibleAttached::QDeclarativeAccessibleAttached(QObject *parent) // Enable accessibility for items with accessible content. This also // enables accessibility for the ancestors of such items. item->d_func()->setAccessibleFlagAndListener(); - QAccessible::updateAccessibility(item, 0, QAccessible::ObjectCreated); + QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ObjectCreated, item, 0)); } QDeclarativeAccessibleAttached::~QDeclarativeAccessibleAttached() diff --git a/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h b/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h index b0135b8b28..6fccb7948f 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h +++ b/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h @@ -83,7 +83,7 @@ class Q_QTQUICK1_EXPORT QDeclarativeAccessibleAttached : public QObject { m_name = name; emit nameChanged(); - QAccessible::updateAccessibility(parent(), 0, QAccessible::NameChanged); + QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, parent(), 0)); } QString description() const { return m_description; } @@ -91,7 +91,7 @@ class Q_QTQUICK1_EXPORT QDeclarativeAccessibleAttached : public QObject { m_description = description; emit descriptionChanged(); - QAccessible::updateAccessibility(parent(), 0, QAccessible::DescriptionChanged); + QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::DescriptionChanged, parent(), 0)); } // Factory function diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp index ed52055424..8ea870c943 100644 --- a/src/quick/items/qquickaccessibleattached.cpp +++ b/src/quick/items/qquickaccessibleattached.cpp @@ -148,7 +148,7 @@ QQuickAccessibleAttached::QQuickAccessibleAttached(QObject *parent) // Enable accessibility for items with accessible content. This also // enables accessibility for the ancestors of souch items. item->d_func()->setAccessibleFlagAndListener(); - QAccessible::updateAccessibility(item, 0, QAccessible::ObjectCreated); + QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::ObjectCreated, item, 0)); } QQuickAccessibleAttached::~QQuickAccessibleAttached() diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index 56b57a3768..02b427337e 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_p.h @@ -85,7 +85,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickAccessibleAttached : public QObject if (name != m_name) { m_name = name; emit nameChanged(); - QAccessible::updateAccessibility(parent(), 0, QAccessible::NameChanged); + QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::NameChanged, parent(), 0)); } } @@ -95,7 +95,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickAccessibleAttached : public QObject if (m_description != description) { m_description = description; emit descriptionChanged(); - QAccessible::updateAccessibility(parent(), 0, QAccessible::DescriptionChanged); + QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::DescriptionChanged, parent(), 0)); } } diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 032427d438..5151310927 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2967,7 +2967,7 @@ void QQuickItem::inputMethodEvent(QInputMethodEvent *event) void QQuickItem::focusInEvent(QFocusEvent *) { - QAccessible::updateAccessibility(this, 0, QAccessible::Focus); + QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, this, 0)); } void QQuickItem::focusOutEvent(QFocusEvent *) @@ -3950,7 +3950,7 @@ void QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible) } if (isAccessible) - QAccessible::updateAccessibility(q, 0, effectiveVisible ? QAccessible::ObjectShow : QAccessible::ObjectHide ); + QAccessible::updateAccessibility(QAccessibleEvent(effectiveVisible ? QAccessible::ObjectShow : QAccessible::ObjectHide, q, 0)); emit q->visibleChanged(); } diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 0f723b1f42..3007ce18b4 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -3232,7 +3232,7 @@ void QQuickTextInputPrivate::internalSetText(const QString &txt, int pos, bool e Q_UNUSED(changed) #else if (changed) - QAccessible::updateAccessibility(q, 0, QAccessible::TextUpdated); + QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TextUpdated, q, 0)); #endif } @@ -3862,7 +3862,7 @@ bool QQuickTextInputPrivate::emitCursorPositionChanged() } #ifndef QT_NO_ACCESSIBILITY - QAccessible::updateAccessibility(q, 0, QAccessible::TextCaretMoved); + QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::TextCaretMoved, q, 0)); #endif return true;