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

diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
index a8f38b61a3..dc16d80c5f 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
@@ -251,10 +251,10 @@ static int qTextBlockPosition(QTextBlock block)
   Constructs a QAccessibleTextEdit object for a \a widget.
 */
 QAccessibleTextEdit::QAccessibleTextEdit(QWidget *o)
-: QAccessibleWidgetEx(o, EditableText)
+: QAccessibleWidget(o, EditableText)
 {
     Q_ASSERT(widget()->inherits("QTextEdit"));
-    childOffset = QAccessibleWidgetEx::childCount();
+    childOffset = QAccessibleWidget::childCount();
 }
 
 /*! Returns the text edit. */
@@ -266,7 +266,7 @@ QTextEdit *QAccessibleTextEdit::textEdit() const
 QRect QAccessibleTextEdit::rect(int child) const
 {
     if (child <= childOffset)
-        return QAccessibleWidgetEx::rect(child);
+        return QAccessibleWidget::rect(child);
 
      QTextEdit *edit = textEdit();
      QTextBlock block = qTextBlockAt(edit->document(), child - childOffset - 1);
@@ -294,7 +294,7 @@ int QAccessibleTextEdit::childAt(int x, int y) const
     if (block.isValid())
         return qTextBlockPosition(block) + childOffset;
 
-    return QAccessibleWidgetEx::childAt(x, y);
+    return QAccessibleWidget::childAt(x, y);
 }
 
 /*! \reimp */
@@ -307,14 +307,14 @@ QString QAccessibleTextEdit::text(Text t, int child) const
             return textEdit()->toPlainText();
     }
 
-    return QAccessibleWidgetEx::text(t, child);
+    return QAccessibleWidget::text(t, child);
 }
 
 /*! \reimp */
 void QAccessibleTextEdit::setText(Text t, int child, const QString &text)
 {
     if (t != Value || (child > 0 && child <= childOffset)) {
-        QAccessibleWidgetEx::setText(t, child, text);
+        QAccessibleWidget::setText(t, child, text);
         return;
     }
     if (textEdit()->isReadOnly())
@@ -338,10 +338,10 @@ QAccessible::Role QAccessibleTextEdit::role(int child) const
 {
     if (child > childOffset)
         return EditableText;
-    return QAccessibleWidgetEx::role(child);
+    return QAccessibleWidget::role(child);
 }
 
-QVariant QAccessibleTextEdit::invokeMethodEx(QAccessible::Method method, int child,
+QVariant QAccessibleTextEdit::invokeMethod(QAccessible::Method method, int child,
                                                      const QVariantList &params)
 {
     if (child)
@@ -352,7 +352,7 @@ QVariant QAccessibleTextEdit::invokeMethodEx(QAccessible::Method method, int chi
         QSet<QAccessible::Method> set;
         set << ListSupportedMethods << SetCursorPosition << GetCursorPosition;
         return QVariant::fromValue(set | qvariant_cast<QSet<QAccessible::Method> >(
-                    QAccessibleWidgetEx::invokeMethodEx(method, child, params)));
+                    QAccessibleWidget::invokeMethod(method, child, params)));
     }
     case SetCursorPosition:
         setCursorPosition(params.value(0).toInt());
@@ -360,7 +360,7 @@ QVariant QAccessibleTextEdit::invokeMethodEx(QAccessible::Method method, int chi
     case GetCursorPosition:
         return textEdit()->textCursor().position();
     default:
-        return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
+        return QAccessibleWidget::invokeMethod(method, child, params);
     }
 }
 
@@ -373,12 +373,12 @@ int QAccessibleTextEdit::childCount() const
 #ifndef QT_NO_STACKEDWIDGET
 // ======================= QAccessibleStackedWidget ======================
 QAccessibleStackedWidget::QAccessibleStackedWidget(QWidget *widget)
-    : QAccessibleWidgetEx(widget, LayeredPane)
+    : QAccessibleWidget(widget, LayeredPane)
 {
     Q_ASSERT(qobject_cast<QStackedWidget *>(widget));
 }
 
-QVariant QAccessibleStackedWidget::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleStackedWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
 {
     return QVariant();
 }
@@ -426,7 +426,7 @@ int QAccessibleStackedWidget::navigate(RelationFlag relation, int entry, QAccess
         targetObject = stackedWidget()->widget(entry-1);
         break;
     default:
-        return QAccessibleWidgetEx::navigate(relation, entry, target);
+        return QAccessibleWidget::navigate(relation, entry, target);
     }
     *target = QAccessible::queryAccessibleInterface(targetObject);
     return *target ? 0 : -1;
@@ -441,7 +441,7 @@ QStackedWidget *QAccessibleStackedWidget::stackedWidget() const
 #ifndef QT_NO_TOOLBOX
 // ======================= QAccessibleToolBox ======================
 QAccessibleToolBox::QAccessibleToolBox(QWidget *widget)
-    : QAccessibleWidgetEx(widget, LayeredPane)
+    : QAccessibleWidget(widget, LayeredPane)
 {
     Q_ASSERT(qobject_cast<QToolBox *>(widget));
 }
@@ -449,14 +449,14 @@ QAccessibleToolBox::QAccessibleToolBox(QWidget *widget)
 QString QAccessibleToolBox::text(Text textType, int child) const
 {
     if (textType != Value || child <= 0 || child > toolBox()->count())
-        return QAccessibleWidgetEx::text(textType, child);
+        return QAccessibleWidget::text(textType, child);
     return toolBox()->itemText(child - 1);
 }
 
 void QAccessibleToolBox::setText(Text textType, int child, const QString &text)
 {
     if (textType != Value || child <= 0 || child > toolBox()->count()) {
-        QAccessibleWidgetEx::setText(textType, child, text);
+        QAccessibleWidget::setText(textType, child, text);
         return;
     }
     toolBox()->setItemText(child - 1, text);
@@ -466,7 +466,7 @@ QAccessible::State QAccessibleToolBox::state(int child) const
 {
     QWidget *childWidget = toolBox()->widget(child - 1);
     if (!childWidget)
-        return QAccessibleWidgetEx::state(child);
+        return QAccessibleWidget::state(child);
     QAccessible::State childState = QAccessible::Normal;
     if (toolBox()->currentWidget() == childWidget)
         childState |= QAccessible::Expanded;
@@ -475,7 +475,7 @@ QAccessible::State QAccessibleToolBox::state(int child) const
     return childState;
 }
 
-QVariant QAccessibleToolBox::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleToolBox::invokeMethod(QAccessible::Method, int, const QVariantList &)
 {
     return QVariant();
 }
@@ -502,7 +502,7 @@ int QAccessibleToolBox::navigate(RelationFlag relation, int entry, QAccessibleIn
 {
     *target = 0;
     if (entry <= 0 || entry > toolBox()->count())
-        return QAccessibleWidgetEx::navigate(relation, entry, target);
+        return QAccessibleWidget::navigate(relation, entry, target);
     int index = -1;
     if (relation == QAccessible::Up)
         index = entry - 2;
@@ -521,7 +521,7 @@ QToolBox * QAccessibleToolBox::toolBox() const
 // ======================= QAccessibleMdiArea ======================
 #ifndef QT_NO_MDIAREA
 QAccessibleMdiArea::QAccessibleMdiArea(QWidget *widget)
-    : QAccessibleWidgetEx(widget, LayeredPane)
+    : QAccessibleWidget(widget, LayeredPane)
 {
     Q_ASSERT(qobject_cast<QMdiArea *>(widget));
 }
@@ -529,18 +529,18 @@ QAccessibleMdiArea::QAccessibleMdiArea(QWidget *widget)
 QAccessible::State QAccessibleMdiArea::state(int child) const
 {
     if (child < 0)
-        return QAccessibleWidgetEx::state(child);
+        return QAccessibleWidget::state(child);
     if (child == 0)
         return QAccessible::Normal;
     QList<QMdiSubWindow *> subWindows = mdiArea()->subWindowList();
     if (subWindows.isEmpty() || child > subWindows.count())
-        return QAccessibleWidgetEx::state(child);
+        return QAccessibleWidget::state(child);
     if (subWindows.at(child - 1) == mdiArea()->activeSubWindow())
         return QAccessible::Focused;
     return QAccessible::Normal;
 }
 
-QVariant QAccessibleMdiArea::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleMdiArea::invokeMethod(QAccessible::Method, int, const QVariantList &)
 {
     return QVariant();
 }
@@ -580,7 +580,7 @@ int QAccessibleMdiArea::navigate(RelationFlag relation, int entry, QAccessibleIn
         targetObject = mdiAreaNavigate(mdiArea(), relation, entry);
         break;
     default:
-        return QAccessibleWidgetEx::navigate(relation, entry, target);
+        return QAccessibleWidget::navigate(relation, entry, target);
     }
     *target = QAccessible::queryAccessibleInterface(targetObject);
     return *target ? 0: -1;
@@ -593,7 +593,7 @@ QMdiArea *QAccessibleMdiArea::mdiArea() const
 
 // ======================= QAccessibleMdiSubWindow ======================
 QAccessibleMdiSubWindow::QAccessibleMdiSubWindow(QWidget *widget)
-    : QAccessibleWidgetEx(widget, QAccessible::Window)
+    : QAccessibleWidget(widget, QAccessible::Window)
 {
     Q_ASSERT(qobject_cast<QMdiSubWindow *>(widget));
 }
@@ -605,7 +605,7 @@ QString QAccessibleMdiSubWindow::text(Text textType, int child) const
         title.replace(QLatin1String("[*]"), QLatin1String(""));
         return title;
     }
-    return QAccessibleWidgetEx::text(textType, child);
+    return QAccessibleWidget::text(textType, child);
 }
 
 void QAccessibleMdiSubWindow::setText(Text textType, int child, const QString &text)
@@ -613,13 +613,13 @@ void QAccessibleMdiSubWindow::setText(Text textType, int child, const QString &t
     if (textType == QAccessible::Name && (child == 0 || child == 1))
         mdiSubWindow()->setWindowTitle(text);
     else
-        QAccessibleWidgetEx::setText(textType, child, text);
+        QAccessibleWidget::setText(textType, child, text);
 }
 
 QAccessible::State QAccessibleMdiSubWindow::state(int child) const
 {
     if (child != 0 || !mdiSubWindow()->parent())
-        return QAccessibleWidgetEx::state(child);
+        return QAccessibleWidget::state(child);
     QAccessible::State state = QAccessible::Normal | QAccessible::Focusable;
     if (!mdiSubWindow()->isMaximized())
         state |= (QAccessible::Movable | QAccessible::Sizeable);
@@ -635,7 +635,7 @@ QAccessible::State QAccessibleMdiSubWindow::state(int child) const
     return state;
 }
 
-QVariant QAccessibleMdiSubWindow::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleMdiSubWindow::invokeMethod(QAccessible::Method, int, const QVariantList &)
 {
     return QVariant();
 }
@@ -659,7 +659,7 @@ int QAccessibleMdiSubWindow::navigate(RelationFlag relation, int entry, QAccessi
     *target = 0;
 
     if (!mdiSubWindow()->parent())
-        return QAccessibleWidgetEx::navigate(relation, entry, target);
+        return QAccessibleWidget::navigate(relation, entry, target);
 
     QWidget *targetObject = 0;
     QMdiSubWindow *source = mdiSubWindow();
@@ -691,7 +691,7 @@ int QAccessibleMdiSubWindow::navigate(RelationFlag relation, int entry, QAccessi
         break;
     }
     default:
-        return QAccessibleWidgetEx::navigate(relation, entry, target);
+        return QAccessibleWidget::navigate(relation, entry, target);
     }
     *target = QAccessible::queryAccessibleInterface(targetObject);
     return *target ? 0: -1;
@@ -702,7 +702,7 @@ QRect QAccessibleMdiSubWindow::rect(int child) const
     if (mdiSubWindow()->isHidden())
         return QRect();
     if (!mdiSubWindow()->parent())
-        return QAccessibleWidgetEx::rect(child);
+        return QAccessibleWidget::rect(child);
     const QPoint pos = mdiSubWindow()->mapToGlobal(QPoint(0, 0));
     if (child == 0)
         return QRect(pos, mdiSubWindow()->size());
@@ -721,7 +721,7 @@ int QAccessibleMdiSubWindow::childAt(int x, int y) const
     if (!mdiSubWindow()->isVisible())
         return -1;
     if (!mdiSubWindow()->parent())
-        return QAccessibleWidgetEx::childAt(x, y);
+        return QAccessibleWidget::childAt(x, y);
     const QRect globalGeometry = rect(0);
     if (!globalGeometry.isValid())
         return -1;
@@ -742,7 +742,7 @@ QMdiSubWindow *QAccessibleMdiSubWindow::mdiSubWindow() const
 // ======================= QAccessibleWorkspace ======================
 #ifndef QT_NO_WORKSPACE
 QAccessibleWorkspace::QAccessibleWorkspace(QWidget *widget)
-    : QAccessibleWidgetEx(widget, LayeredPane)
+    : QAccessibleWidget(widget, LayeredPane)
 {
     Q_ASSERT(qobject_cast<QWorkspace *>(widget));
 }
@@ -750,18 +750,18 @@ QAccessibleWorkspace::QAccessibleWorkspace(QWidget *widget)
 QAccessible::State QAccessibleWorkspace::state(int child) const
 {
     if (child < 0)
-        return QAccessibleWidgetEx::state(child);
+        return QAccessibleWidget::state(child);
     if (child == 0)
         return QAccessible::Normal;
     QWidgetList subWindows = workspace()->windowList();
     if (subWindows.isEmpty() || child > subWindows.count())
-        return QAccessibleWidgetEx::state(child);
+        return QAccessibleWidget::state(child);
     if (subWindows.at(child - 1) == workspace()->activeWindow())
         return QAccessible::Focused;
     return QAccessible::Normal;
 }
 
-QVariant QAccessibleWorkspace::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleWorkspace::invokeMethod(QAccessible::Method, int, const QVariantList &)
 {
     return QVariant();
 }
@@ -801,7 +801,7 @@ int QAccessibleWorkspace::navigate(RelationFlag relation, int entry, QAccessible
         targetObject = mdiAreaNavigate(workspace(), relation, entry);
         break;
     default:
-        return QAccessibleWidgetEx::navigate(relation, entry, target);
+        return QAccessibleWidget::navigate(relation, entry, target);
     }
     *target = QAccessible::queryAccessibleInterface(targetObject);
     return *target ? 0: -1;
@@ -816,12 +816,12 @@ QWorkspace *QAccessibleWorkspace::workspace() const
 #ifndef QT_NO_DIALOGBUTTONBOX
 // ======================= QAccessibleDialogButtonBox ======================
 QAccessibleDialogButtonBox::QAccessibleDialogButtonBox(QWidget *widget)
-    : QAccessibleWidgetEx(widget, Grouping)
+    : QAccessibleWidget(widget, Grouping)
 {
     Q_ASSERT(qobject_cast<QDialogButtonBox*>(widget));
 }
 
-QVariant QAccessibleDialogButtonBox::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleDialogButtonBox::invokeMethod(QAccessible::Method, int, const QVariantList &)
 {
     return QVariant();
 }
@@ -845,12 +845,12 @@ QAccessible::Role QAccessibleTextBrowser::role(int child) const
 #ifndef QT_NO_CALENDARWIDGET
 // ===================== QAccessibleCalendarWidget ========================
 QAccessibleCalendarWidget::QAccessibleCalendarWidget(QWidget *widget)
-    : QAccessibleWidgetEx(widget, Table)
+    : QAccessibleWidget(widget, Table)
 {
     Q_ASSERT(qobject_cast<QCalendarWidget *>(widget));
 }
 
-QVariant QAccessibleCalendarWidget::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleCalendarWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
 {
     return QVariant();
 }
@@ -873,7 +873,7 @@ int QAccessibleCalendarWidget::navigate(RelationFlag relation, int entry, QAcces
 {
     *target = 0;
     if (entry <= 0 || entry > childCount())
-        return QAccessibleWidgetEx::navigate(relation, entry, target);
+        return QAccessibleWidget::navigate(relation, entry, target);
     QWidget *targetWidget = 0;
     switch (relation) {
     case Child:
@@ -895,7 +895,7 @@ int QAccessibleCalendarWidget::navigate(RelationFlag relation, int entry, QAcces
             targetWidget = calendarView();
         break;
     default:
-        return QAccessibleWidgetEx::navigate(relation, entry, target);
+        return QAccessibleWidget::navigate(relation, entry, target);
     }
     *target = queryAccessibleInterface(targetWidget);
     return *target ? 0: -1;
@@ -906,7 +906,7 @@ QRect QAccessibleCalendarWidget::rect(int child) const
     if (!calendarWidget()->isVisible() || child > childCount())
         return QRect();
     if (child == 0)
-        return QAccessibleWidgetEx::rect(child);
+        return QAccessibleWidget::rect(child);
     QWidget *childWidget = 0;
     if (childCount() == 2)
         childWidget = child == 1 ? navigationBar() : calendarView();
@@ -953,7 +953,7 @@ QWidget *QAccessibleCalendarWidget::navigationBar() const
 
 #ifndef QT_NO_DOCKWIDGET
 QAccessibleDockWidget::QAccessibleDockWidget(QWidget *widget)
-    : QAccessibleWidgetEx(widget, Window)
+    : QAccessibleWidget(widget, Window)
 {
 
 }
@@ -972,7 +972,7 @@ int QAccessibleDockWidget::navigate(RelationFlag relation, int entry, QAccessibl
         *iface = 0;
         return -1;
     }
-    return QAccessibleWidgetEx::navigate(relation, entry, iface);
+    return QAccessibleWidget::navigate(relation, entry, iface);
 }
 
 int QAccessibleDockWidget::childAt(int x, int y) const
@@ -1020,7 +1020,7 @@ QAccessible::Role QAccessibleDockWidget::role(int child) const
 QAccessible::State QAccessibleDockWidget::state(int child) const
 {
     //### mark tabified widgets as invisible
-    return QAccessibleWidgetEx::state(child);
+    return QAccessibleWidget::state(child);
 }
 
 QRect QAccessibleDockWidget::rect (int child ) const
@@ -1050,7 +1050,7 @@ QRect QAccessibleDockWidget::rect (int child ) const
     return rect;
 }
 
-QVariant QAccessibleDockWidget::invokeMethodEx(QAccessible::Method, int, const QVariantList &)
+QVariant QAccessibleDockWidget::invokeMethod(QAccessible::Method, int, const QVariantList &)
 {
     return QVariant();
 }
@@ -1714,9 +1714,9 @@ void QAccessibleTextEdit::setAttributes(int startOffset, int endOffset, const QS
 
 #ifndef QT_NO_MAINWINDOW
 QAccessibleMainWindow::QAccessibleMainWindow(QWidget *widget)
-    : QAccessibleWidgetEx(widget, Window) { }
+    : QAccessibleWidget(widget, Window) { }
 
-QVariant QAccessibleMainWindow::invokeMethodEx(QAccessible::Method /*method*/, int /*child*/, const QVariantList & /*params*/)
+QVariant QAccessibleMainWindow::invokeMethod(QAccessible::Method /*method*/, int /*child*/, const QVariantList & /*params*/)
 {
     return QVariant();
 }
@@ -1743,7 +1743,7 @@ int QAccessibleMainWindow::navigate(RelationFlag relation, int entry, QAccessibl
             return *iface ? 0 : -1;
         }
     }
-    return QAccessibleWidgetEx::navigate(relation, entry, iface);
+    return QAccessibleWidget::navigate(relation, entry, iface);
 }
 
 int QAccessibleMainWindow::childAt(int x, int y) const