From 74c9f9d83f9f5cb934d0b62b468c74df5a3b9a0d Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Date: Tue, 22 Nov 2011 18:08:05 +0100
Subject: Accessibility: childAt returns interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/widgets/accessible/qaccessiblewidget.cpp | 22 ----------------------
 src/widgets/accessible/qaccessiblewidget.h   |  1 -
 2 files changed, 23 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index a1c53e934e..a2295f4749 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -221,28 +221,6 @@ QObject *QAccessibleWidget::parentObject() const
     return parent;
 }
 
-/*! \reimp */
-int QAccessibleWidget::childAt(int x, int y) const
-{
-    QWidget *w = widget();
-    if (!w->isVisible())
-        return -1;
-    QPoint gp = w->mapToGlobal(QPoint(0, 0));
-    if (!QRect(gp.x(), gp.y(), w->width(), w->height()).contains(x, y))
-        return -1;
-
-    for (int i = 0; i < childCount(); ++i) {
-        QAccessibleInterface *childIface = child(i);
-        bool found = false;
-        if (childIface->rect().contains(x, y))
-            found = true;
-        delete childIface;
-        if (found)
-            return i + 1;
-    }
-    return 0;
-}
-
 /*! \reimp */
 QRect QAccessibleWidget::rect() const
 {
diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h
index b807dbc088..01730f7070 100644
--- a/src/widgets/accessible/qaccessiblewidget.h
+++ b/src/widgets/accessible/qaccessiblewidget.h
@@ -64,7 +64,6 @@ public:
     int indexOfChild(const QAccessibleInterface *child) const;
     QAccessible::Relation relationTo(const QAccessibleInterface *other) const;
 
-    int childAt(int x, int y) const;
     QRect rect() const;
 
     QAccessibleInterface *parent() const;
-- 
cgit v1.2.3