From beb72b2fbf17a20b4a9d51d75d79f9c3c69bb357 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sat, 22 Oct 2011 22:38:14 +0200 Subject: Remove virtual child integers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/plugins/accessible/widgets/simplewidgets.h | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'src/plugins/accessible/widgets/simplewidgets.h') diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h index 8642f8d9b9..25c3150386 100644 --- a/src/plugins/accessible/widgets/simplewidgets.h +++ b/src/plugins/accessible/widgets/simplewidgets.h @@ -62,8 +62,8 @@ class QAccessibleButton : public QAccessibleWidget public: QAccessibleButton(QWidget *w, Role r); - QString text(Text t, int child = 0) const; - State state(int child = 0) const; + QString text(Text t) const; + State state() const; QStringList actionNames() const; void doAction(const QString &actionName); @@ -79,16 +79,12 @@ class QAccessibleToolButton : public QAccessibleButton public: QAccessibleToolButton(QWidget *w, Role role); - State state(int) const; + State state() const; int childCount() const; QAccessibleInterface *child(int index) const; - QString text(Text t, int child) const; - - int actionCount(int child) const; - QString actionText(int action, Text text, int child) const; - bool doAction(int action, int child, const QVariantList ¶ms); + QString text(Text t) const; // QAccessibleActionInterface QStringList actionNames() const; @@ -107,10 +103,10 @@ class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInte public: explicit QAccessibleDisplay(QWidget *w, Role role = StaticText); - QString text(Text t, int child) const; - Role role(int child) const; + QString text(Text t) const; + Role role() const; - Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const; + Relation relationTo(const QAccessibleInterface *other) const; int navigate(RelationFlag, int entry, QAccessibleInterface **target) const; // QAccessibleImageInterface @@ -127,10 +123,10 @@ class QAccessibleLineEdit : public QAccessibleWidget, public QAccessibleTextInte public: explicit QAccessibleLineEdit(QWidget *o, const QString &name = QString()); - QString text(Text t, int child) const; - void setText(Text t, int control, const QString &text); - State state(int child) const; - QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms); + QString text(Text t) const; + void setText(Text t, const QString &text); + State state() const; + QVariant invokeMethod(QAccessible::Method method, const QVariantList ¶ms); // QAccessibleTextInterface void addSelection(int startOffset, int endOffset); -- cgit v1.2.3