Accessibility: Use new updateAccessibility() API in declarative.

Change-Id: I7ab5c767c9d21c9cad1ee7f7c1f6e21ed4dccef3
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>

diff --git a/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached.cpp b/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached.cpp
index 123391b..3a5d09b 100644 (file)
--- 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 b0135b8..6fccb79 100644 (file)
--- a/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeaccessibleattached_p.h
@@ -83,7 +83,7 @@ public:
     {
         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 @@ public:
     {
         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 ed52055..8ea870c 100644 (file)
--- 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 56b57a3..02b4273 100644 (file)
--- a/src/quick/items/qquickaccessibleattached_p.h
+++ b/src/quick/items/qquickaccessibleattached_p.h
@@ -85,7 +85,7 @@ public:
         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 @@ public:
         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 032427d..5151310 100644 (file)
--- 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 0f723b1..3007ce1 100644 (file)
--- 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;