QAccessibleToolButton fixes.

ToolButtons now consist of only one button.
They implement the action interface so that the menu
can be opened programmatically and the button clicked/checked.
The menu shows in the hierarchy as child of the button.

Change-Id: Ifebe5e19b4c55a9db4fb688274da906293566cc2
Reviewed-on: http://codereview.qt-project.org/5536
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>

1 files changed, 12 insertions, 11 deletions

diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h
index 2851202222..aa68cf3626 100644
--- a/src/plugins/accessible/widgets/simplewidgets.h
+++ b/src/plugins/accessible/widgets/simplewidgets.h
@@ -62,8 +62,8 @@ class QAccessibleButton : public QAccessibleWidget, public QAccessibleActionInte
 public:
     QAccessibleButton(QWidget *w, Role r);
 
-    QString text(Text t, int child) const;
-    State state(int child) const;
+    QString text(Text t, int child = 0) const;
+    State state(int child = 0) const;
 
     QString actionText(int action, Text text, int child) const;
     bool doAction(int action, int child, const QVariantList &params);
@@ -86,17 +86,10 @@ class QAccessibleToolButton : public QAccessibleButton
 public:
     QAccessibleToolButton(QWidget *w, Role role);
 
-    enum ToolButtonElements {
-        ToolButtonSelf        = 0,
-        ButtonExecute,
-        ButtonDropMenu
-    };
-
-    Role role(int child) const;
-    State state(int child) const;
+    State state(int) const;
 
     int childCount() const;
-    QRect rect(int child) const;
+    QAccessibleInterface *child(int index) const;
 
     QString text(Text t, int child) const;
 
@@ -104,6 +97,14 @@ public:
     QString actionText(int action, Text text, int child) const;
     bool doAction(int action, int child, const QVariantList &params);
 
+    // QAccessibleActionInterface
+    int actionCount();
+    void doAction(int actionIndex);
+    QString description(int actionIndex);
+    QString name(int actionIndex);
+    QString localizedName(int actionIndex);
+    QStringList keyBindings(int actionIndex);
+
 protected:
     QToolButton *toolButton() const;