Remove AccessibleEx classes.

This was a binary compatibility hack to extend the accessibility
framework towards IAccessible2. Start fixing it properly.

Change-Id: I82bb0daa6469930c5bf6e440c919159603d56a83
Reviewed-on: http://codereview.qt-project.org/4750
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>

1 files changed, 2 insertions, 38 deletions

diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h
index 3b68e30a63..52b4566d13 100644
--- a/src/widgets/accessible/qaccessiblewidget.h
+++ b/src/widgets/accessible/qaccessiblewidget.h
@@ -77,6 +77,8 @@ public:
     bool doAction(int action, int child, const QVariantList &params);
 #endif
 
+    QVariant invokeMethod(Method method, int child, const QVariantList &params);
+
 protected:
     ~QAccessibleWidget();
     QWidget *widget() const;
@@ -89,48 +91,10 @@ protected:
     void setAccelerator(const QString &accel);
 
 private:
-    friend class QAccessibleWidgetEx;
     QAccessibleWidgetPrivate *d;
     Q_DISABLE_COPY(QAccessibleWidget)
 };
 
-class Q_WIDGETS_EXPORT QAccessibleWidgetEx : public QAccessibleObjectEx
-{
-public:
-    explicit QAccessibleWidgetEx(QWidget *o, Role r = Client, const QString& name = QString());
-
-    int childCount() const;
-    int indexOfChild(const QAccessibleInterface *child) const;
-    Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const;
-
-    int childAt(int x, int y) const;
-    QRect rect(int child) const;
-    int navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const;
-
-    QString text(Text t, int child) const;
-    Role role(int child) const;
-    State state(int child) const;
-
-    QString actionText(int action, Text t, int child) const;
-    bool doAction(int action, int child, const QVariantList &params);
-
-    QVariant invokeMethodEx(Method method, int child, const QVariantList &params);
-
-protected:
-    ~QAccessibleWidgetEx();
-    QWidget *widget() const;
-    QObject *parentObject() const;
-
-    void addControllingSignal(const QString &signal);
-    void setValue(const QString &value);
-    void setDescription(const QString &desc);
-    void setHelp(const QString &help);
-    void setAccelerator(const QString &accel);
-
-private:
-    QAccessibleWidgetPrivate *d;
-    Q_DISABLE_COPY(QAccessibleWidgetEx)
-};
 
 #endif // QT_NO_ACCESSIBILITY