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, 15 insertions, 22 deletions

diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.h b/src/plugins/accessible/widgets/qaccessiblemenu.h
index 2ac8b37b6e..ae5c4ba8cd 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.h
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.h
@@ -61,10 +61,8 @@ public:
     int childCount() const;
     int childAt(int x, int y) const;
 
-    QRect rect(int child) const;
-    QString text(Text t, int child) const;
-    Role role(int child) const;
-    State state(int child) const;
+    QString text(Text t) const;
+    Role role() const;
     QAccessibleInterface *child(int index) const;
     QAccessibleInterface *parent() const;
     int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
@@ -83,12 +81,8 @@ public:
     QAccessibleInterface *child(int index) const;
     int childCount() const;
 
-    QRect rect(int child) const;
-    QString text(Text t, int child) const;
-    Role role(int child) const;
-    State state(int child) const;
     int navigate(RelationFlag relation, int entry, QAccessibleInterface **target) const;
-    int indexOfChild( const QAccessibleInterface *child ) const;
+    int indexOfChild(const QAccessibleInterface *child) const;
 
 protected:
     QMenuBar *menuBar() const;
@@ -103,22 +97,21 @@ public:
     explicit QAccessibleMenuItem(QWidget *owner, QAction *w);
 
     virtual ~QAccessibleMenuItem();
-    virtual QString actionText ( int action, Text t, int child ) const;
-    virtual int childAt ( int x, int y ) const;
-    virtual int childCount () const;
-    virtual int indexOfChild ( const QAccessibleInterface * child ) const;
-    virtual bool isValid () const;
+    virtual int childAt(int x, int y) const;
+    virtual int childCount() const;
+    virtual int indexOfChild(const QAccessibleInterface * child) const;
+    virtual bool isValid() const;
 
     QAccessibleInterface *parent() const;
     QAccessibleInterface *child(int index) const;
-    virtual int navigate ( RelationFlag relation, int entry, QAccessibleInterface ** target ) const;
-    virtual QObject * object () const;
-    virtual QRect rect ( int child ) const;
-    virtual Relation relationTo ( int child, const QAccessibleInterface * other, int otherChild ) const;
-    virtual Role role ( int child ) const;
-    virtual void setText ( Text t, int child, const QString & text );
-    virtual State state ( int child ) const;
-    virtual QString text ( Text t, int child ) const;
+    virtual int navigate(RelationFlag relation, int entry, QAccessibleInterface ** target) const;
+    virtual QObject * object() const;
+    virtual QRect rect() const;
+    virtual Relation relationTo(const QAccessibleInterface *other) const;
+    virtual Role role() const;
+    virtual void setText(Text t, const QString & text );
+    virtual State state() const;
+    virtual QString text(Text t) const;
 
     // QAccessibleActionInterface
     QStringList actionNames() const;