Accessibility: childAt returns interface

childAt used to return an integer.
Return an interface instead.

Not requiring a direct child to be returned allows optimizing
by bypassing iterating through the hierarchy of accessibles.
For QtQuick this is the only sensible way of implementing this.

The bridges are still responsible for finding the top-most element.

The default implementation in QAccessibleObject is sufficient
to return direct children. The implementation in
QAccessibleApplication is therfore no longer needed.

Change-Id: Id7100dd5bcc3a98de516a7f4a12eaaa41cb46d26
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.h b/src/plugins/accessible/widgets/qaccessiblemenu.h
index cf6a703b0c..4ce161309b 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.h
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.h
@@ -59,7 +59,7 @@ public:
     explicit QAccessibleMenu(QWidget *w);
 
     int childCount() const;
-    int childAt(int x, int y) const;
+    QAccessibleInterface *childAt(int x, int y) const;
 
     QString text(QAccessible::Text t) const;
     QAccessible::Role role() const;
@@ -95,13 +95,13 @@ class QAccessibleMenuItem : public QAccessibleInterface, public QAccessibleActio
 public:
     explicit QAccessibleMenuItem(QWidget *owner, QAction *w);
 
-    virtual ~QAccessibleMenuItem();
-
+    ~QAccessibleMenuItem();
     void *interface_cast(QAccessible::InterfaceType t);
-    int childAt(int x, int y) const;
+
     int childCount() const;
-    int indexOfChild(const QAccessibleInterface * child) const;
+    QAccessibleInterface *childAt(int x, int y) const;
     bool isValid() const;
+    int indexOfChild(const QAccessibleInterface * child) const;
 
     QAccessibleInterface *parent() const;
     QAccessibleInterface *child(int index) const;