aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Arve Saether <jan-arve.saether@nokia.com>2012-01-19 12:01:55 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-20 11:04:17 +0100
commit96d69b0fe409de354d369489a284677c30378787 (patch)
tree6698fc369c5997e0aa06047ee84101d23ec6071d
parent126ada14b21f62d9349756cc6a3ef835d40a3e7d (diff)
Use queryAccessibleInterface instead of new QAccessibleQuickItem
In some cases this could prevent us from actually returning the expected QAccessibleQuickItemValueInterface. This is also more future-proof in case we add more QAI subclasses. Change-Id: Id66dc21418671a3045d93c0a44dc74aa0aff30af Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
-rw-r--r--src/plugins/accessible/quick/qaccessiblequickitem.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.cpp b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
index fd087c4e1e..b2c1098e0a 100644
--- a/src/plugins/accessible/quick/qaccessiblequickitem.cpp
+++ b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
@@ -98,8 +98,7 @@ QAccessibleInterface *QAccessibleQuickItem::parent() const
if (parent == canvas->rootItem()) {
return QAccessible::queryAccessibleInterface(canvas);
} else {
- QDeclarativeAccessible *ancestor = new QAccessibleQuickItem(parent);
- return ancestor;
+ return QAccessible::queryAccessibleInterface(parent);
}
}
return 0;
@@ -116,7 +115,7 @@ QAccessibleInterface *QAccessibleQuickItem::child(int index) const
if (!child) // FIXME can this happen?
return 0;
- return new QAccessibleQuickItem(child);
+ return QAccessible::queryAccessibleInterface(child);
}
int QAccessibleQuickItem::navigate(QAccessible::RelationFlag rel, int entry, QAccessibleInterface **target) const
@@ -125,10 +124,6 @@ int QAccessibleQuickItem::navigate(QAccessible::RelationFlag rel, int entry, QAc
Q_UNUSED(entry);
Q_UNUSED(target);
*target = 0;
- if (entry == 0) {
- *target = new QAccessibleQuickItem(item());
- return 0;
- }
return -1;
}