Remove virtual child integers.

This makes the accessibility apis much
simpler and less error prone.

Disable the itemviews implementation that is in complex widgets.
The itemviews will use the new code from itemviews.h/cpp everywhere now.

QToolBox was broken before, now at least it simply exposes all its children.
The children are the buttons (tabs of the toolbox) and their contents.

Change-Id: I45e218f49f02aebbd678ddfe29f94c2a112a2125
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/integrationtests/macgui/tst_macgui.cpp b/tests/auto/integrationtests/macgui/tst_macgui.cpp
index 1552db21ab..9ff2897aa8 100644
--- a/tests/auto/integrationtests/macgui/tst_macgui.cpp
+++ b/tests/auto/integrationtests/macgui/tst_macgui.cpp
@@ -116,8 +116,8 @@ void tst_MacGui::dummy()
     box->show();
 
     // Find the "OK" button and schedule a press.
-    InterfaceChildPair interface = wn.find(QAccessible::Name, "OK", box);
-    QVERIFY(interface.iface);
+    QAccessibleInterface *interface = wn.find(QAccessible::Name, "OK", box);
+    QVERIFY(interface);
     const int delay = 1000;
     clickLater(interface, Qt::LeftButton, delay);
 
@@ -142,8 +142,8 @@ void tst_MacGui::splashScreenModality()
     box.show();
 
     // Find the "OK" button and schedule a press.
-    InterfaceChildPair interface = wn.find(QAccessible::Name, "OK", &box);
-    QVERIFY(interface.iface);
+    QAccessibleInterface *interface = wn.find(QAccessible::Name, "OK", &box);
+    QVERIFY(interface);
     const int delay = 1000;
     clickLater(interface, Qt::LeftButton, delay);
 
@@ -220,8 +220,8 @@ void tst_MacGui::spinBoxArrowButtons()
     const QImage noFocus = grabWindowContents(&colorWidget).toImage();
 
     // Set focus by clicking the less button.
-    InterfaceChildPair lessInterface = wn.find(QAccessible::Name, "Less", &spinBox);
-    QVERIFY(lessInterface.iface);
+    QAccessibleInterface *lessInterface = wn.find(QAccessible::Name, "Less", &spinBox);
+    QVERIFY(lessInterface);
     const int delay = 500;
     clickLater(lessInterface, Qt::LeftButton, delay);
     const int timeout = 1;
@@ -231,7 +231,7 @@ void tst_MacGui::spinBoxArrowButtons()
     const QImage focus = grabWindowContents(&colorWidget).toImage();
 
     // Compare the arrow area of the less button to see if it moved.
-    const QRect lessRect = lessInterface.iface->rect(lessInterface.possibleChild);
+    const QRect lessRect = lessInterface->rect();
     const QRect lessLocalRect(colorWidget.mapFromGlobal(lessRect.topLeft()), colorWidget.mapFromGlobal(lessRect.bottomRight()));
     const QRect compareRect = lessLocalRect.adjusted(5, 3, -5, -7);
     QVERIFY(noFocus.copy(compareRect) == focus.copy(compareRect));