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, 4 insertions, 4 deletions

diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h
index 7cc14410cf..2851202222 100644
--- a/src/plugins/accessible/widgets/simplewidgets.h
+++ b/src/plugins/accessible/widgets/simplewidgets.h
@@ -55,7 +55,7 @@ class QLineEdit;
 class QToolButton;
 class QProgressBar;
 
-class QAccessibleButton : public QAccessibleWidgetEx, public QAccessibleActionInterface
+class QAccessibleButton : public QAccessibleWidget, public QAccessibleActionInterface
 {
     Q_ACCESSIBLE_OBJECT
     Q_DECLARE_TR_FUNCTIONS(QAccessibleButton)
@@ -111,7 +111,7 @@ protected:
 };
 #endif // QT_NO_TOOLBUTTON
 
-class QAccessibleDisplay : public QAccessibleWidgetEx, public QAccessibleImageInterface
+class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInterface
 {
     Q_ACCESSIBLE_OBJECT
 public:
@@ -130,7 +130,7 @@ public:
 };
 
 #ifndef QT_NO_LINEEDIT
-class QAccessibleLineEdit : public QAccessibleWidgetEx, public QAccessibleTextInterface,
+class QAccessibleLineEdit : public QAccessibleWidget, public QAccessibleTextInterface,
                             public QAccessibleSimpleEditableTextInterface
 {
     Q_ACCESSIBLE_OBJECT
@@ -140,7 +140,7 @@ public:
     QString text(Text t, int child) const;
     void setText(Text t, int control, const QString &text);
     State state(int child) const;
-    QVariant invokeMethodEx(QAccessible::Method method, int child, const QVariantList &params);
+    QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList &params);
 
     // QAccessibleTextInterface
     void addSelection(int startOffset, int endOffset);