Refactor QAccessibleActionInterface.

Some refinements done by Jan-Arve Sæther.

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

1 files changed, 5 insertions, 16 deletions

diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h
index 9ba5d9127e..252d994d1b 100644
--- a/src/plugins/accessible/widgets/simplewidgets.h
+++ b/src/plugins/accessible/widgets/simplewidgets.h
@@ -65,16 +65,9 @@ public:
     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);
-
-    // QAccessibleActionInterface
-    int actionCount();
-    void doAction(int actionIndex);
-    QString localizedDescription(int actionIndex);
-    QString name(int actionIndex);
-    QString localizedName(int actionIndex);
-    QStringList keyBindings(int actionIndex);
+    QStringList actionNames() const;
+    void doAction(const QString &actionName);
+    QStringList keyBindingsForAction(const QString &actionName) const;
 
 protected:
     QAbstractButton *button() const;
@@ -98,12 +91,8 @@ public:
     bool doAction(int action, int child, const QVariantList &params);
 
     // QAccessibleActionInterface
-    int actionCount();
-    void doAction(int actionIndex);
-    QString localizedDescription(int actionIndex);
-    QString name(int actionIndex);
-    QString localizedName(int actionIndex);
-    QStringList keyBindings(int actionIndex);
+    QStringList actionNames() const;
+    void doAction(const QString &actionName);
 
 protected:
     QToolButton *toolButton() const;