Accessible ComboBox: remove virt children, add actions.

Simplify the combobox implementation by removing child logic.
Instead have an option to open the combobox.

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

1 files changed, 10 insertions, 12 deletions

diff --git a/src/plugins/accessible/widgets/complexwidgets.h b/src/plugins/accessible/widgets/complexwidgets.h
index d29f4b9021..048222870e 100644
--- a/src/plugins/accessible/widgets/complexwidgets.h
+++ b/src/plugins/accessible/widgets/complexwidgets.h
@@ -258,32 +258,30 @@ protected:
 #endif // QT_NO_TABBAR
 
 #ifndef QT_NO_COMBOBOX
-class QAccessibleComboBox : public QAccessibleWidget
+class QAccessibleComboBox : public QAccessibleWidget, public QAccessibleActionInterface
 {
     Q_ACCESSIBLE_OBJECT
 public:
     explicit QAccessibleComboBox(QWidget *w);
 
-    enum ComboBoxElements {
-        ComboBoxSelf        = 0,
-        CurrentText,
-        OpenList,
-        PopupList
-    };
-
     int childCount() const;
     int childAt(int x, int y) const;
     int indexOfChild(const QAccessibleInterface *child) const;
-    int navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const;
+    QAccessibleInterface* child(int index) const;
 
     QString text(Text t, int child) const;
-    QRect rect(int child) const;
-    Role role(int child) const;
-    State state(int child) const;
 
     bool doAction(int action, int child, const QVariantList &params);
     QString actionText(int action, Text t, int child) const;
 
+    // QAccessibleActionInterface
+    int actionCount();
+    void doAction(int actionIndex);
+    QString description(int actionIndex);
+    QString name(int actionIndex);
+    QString localizedName(int actionIndex);
+    QStringList keyBindings(int actionIndex);
+
 protected:
     QComboBox *comboBox() const;
 };