From: Jan-Arve Saether <jan-arve.saether@nokia.com>
Date: Thu, 19 Jan 2012 11:01:55 +0000 (+0100)
Subject: Use queryAccessibleInterface instead of new QAccessibleQuickItem
X-Git-Tag: upstream/5.2.1~2866
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96d69b0fe409de354d369489a284677c30378787;p=platform%2Fupstream%2Fqtdeclarative.git

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>
---

diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.cpp b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
index fd087c4..b2c1098 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;
 }