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, 6 insertions, 14 deletions

diff --git a/src/widgets/accessible/qaccessible.h b/src/widgets/accessible/qaccessible.h
index f03f86ce7a..cbfbca61c5 100644
--- a/src/widgets/accessible/qaccessible.h
+++ b/src/widgets/accessible/qaccessible.h
@@ -177,11 +177,8 @@ public:
         //AlertHigh       = 0x10000000, /* reused for HasInvokeExtension */
         Protected       = 0x20000000,
         HasPopup        = 0x40000000,
-        Modal           = 0x80000000,
+        Modal           = 0x80000000
 
-        // #### Qt5 ManagesDescendants
-        // #### Qt5 remove HasInvokeExtension
-        HasInvokeExtension = 0x10000000 // internal
     };
     Q_DECLARE_FLAGS(State, StateFlag)
 
@@ -399,7 +396,7 @@ public:
     virtual QString actionText(int action, Text t, int child) const = 0;
     virtual bool doAction(int action, int child, const QVariantList &params = QVariantList()) = 0;
 
-    QVariant invokeMethod(Method method, int child = 0,
+    virtual QVariant invokeMethod(Method method, int child = 0,
                           const QVariantList &params = QVariantList());
 
     inline QSet<Method> supportedMethods()
@@ -432,19 +429,14 @@ public:
     inline QAccessibleTable2Interface *table2Interface()
     { return reinterpret_cast<QAccessibleTable2Interface *>(cast_helper(QAccessible2::Table2Interface)); }
 
-private:
-    QAccessible2Interface *cast_helper(QAccessible2::InterfaceType);
-};
-
-class Q_WIDGETS_EXPORT QAccessibleInterfaceEx: public QAccessibleInterface
-{
-public:
-    virtual QVariant invokeMethodEx(Method method, int child, const QVariantList &params) = 0;
+    // FIXME
     virtual QVariant virtual_hook(const QVariant &data);
     virtual QAccessible2Interface *interface_cast(QAccessible2::InterfaceType)
     { return 0; }
-};
 
+private:
+    QAccessible2Interface *cast_helper(QAccessible2::InterfaceType);
+};
 
 class Q_WIDGETS_EXPORT QAccessibleEvent : public QEvent
 {