aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-02-01 10:15:09 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-01 16:30:03 +0100
commitae6acb42a3fae459034ea153565bb08a9b88ad54 (patch)
tree6acbf30422f458c1302ffd63e698f0eb9288b772 /src/quick
parenta83dafe49a8d3533cb972782dd2df62746139233 (diff)
Accessibility: Use new updateAccessibility() API in declarative.
Change-Id: I7ab5c767c9d21c9cad1ee7f7c1f6e21ed4dccef3 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickaccessibleattached.cpp2
-rw-r--r--src/quick/items/qquickaccessibleattached_p.h4
-rw-r--r--src/quick/items/qquickitem.cpp4
-rw-r--r--src/quick/items/qquicktextinput.cpp4
4 files changed, 7 insertions, 7 deletions
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 @@ 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 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;