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

diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index 36e786ff6b..f74aba2e62 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -85,10 +85,10 @@ QString Q_GUI_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::Bounda
 
 /*!
   Creates a QAccessibleButton object for \a w.
-  \a role is propagated to the QAccessibleWidgetEx constructor.
+  \a role is propagated to the QAccessibleWidget constructor.
 */
 QAccessibleButton::QAccessibleButton(QWidget *w, Role role)
-: QAccessibleWidgetEx(w, role)
+: QAccessibleWidget(w, role)
 {
     Q_ASSERT(button());
     if (button()->isCheckable())
@@ -132,7 +132,7 @@ QString QAccessibleButton::actionText(int action, Text text, int child) const
         }
         break;
     }
-    return QAccessibleWidgetEx::actionText(action, text, child);
+    return QAccessibleWidget::actionText(action, text, child);
 }
 
 /*! \reimp */
@@ -155,7 +155,7 @@ bool QAccessibleButton::doAction(int action, int child, const QVariantList &para
         }
         return true;
     }
-    return QAccessibleWidgetEx::doAction(action, child, params);
+    return QAccessibleWidget::doAction(action, child, params);
 }
 
 /*! \reimp */
@@ -183,14 +183,14 @@ QString QAccessibleButton::text(Text t, int child) const
         break;
     }
     if (str.isEmpty())
-        str = QAccessibleWidgetEx::text(t, child);
+        str = QAccessibleWidget::text(t, child);
     return qt_accStripAmp(str);
 }
 
 /*! \reimp */
 QAccessible::State QAccessibleButton::state(int child) const
 {
-    State state = QAccessibleWidgetEx::state(child);
+    State state = QAccessibleWidget::state(child);
 
     QAbstractButton *b = button();
     QCheckBox *cb = qobject_cast<QCheckBox *>(b);
@@ -307,7 +307,7 @@ QStringList QAccessibleButton::keyBindings(int actionIndex)
 
 /*!
   Creates a QAccessibleToolButton object for \a w.
-  \a role is propagated to the QAccessibleWidgetEx constructor.
+  \a role is propagated to the QAccessibleWidget constructor.
 */
 QAccessibleToolButton::QAccessibleToolButton(QWidget *w, Role role)
 : QAccessibleButton(w, role)
@@ -497,10 +497,10 @@ bool QAccessibleToolButton::doAction(int action, int child, const QVariantList &
 
 /*!
   Constructs a QAccessibleDisplay object for \a w.
-  \a role is propagated to the QAccessibleWidgetEx constructor.
+  \a role is propagated to the QAccessibleWidget constructor.
 */
 QAccessibleDisplay::QAccessibleDisplay(QWidget *w, Role role)
-: QAccessibleWidgetEx(w, role)
+: QAccessibleWidget(w, role)
 {
 }
 
@@ -524,7 +524,7 @@ QAccessible::Role QAccessibleDisplay::role(int child) const
         return ProgressBar;
 #endif
     }
-    return QAccessibleWidgetEx::role(child);
+    return QAccessibleWidget::role(child);
 }
 
 /*! \reimp */
@@ -562,7 +562,7 @@ QString QAccessibleDisplay::text(Text t, int child) const
         break;
     }
     if (str.isEmpty())
-        str = QAccessibleWidgetEx::text(t, child);;
+        str = QAccessibleWidget::text(t, child);;
     return qt_accStripAmp(str);
 }
 
@@ -570,7 +570,7 @@ QString QAccessibleDisplay::text(Text t, int child) const
 QAccessible::Relation QAccessibleDisplay::relationTo(int child, const QAccessibleInterface *other,
                                                      int otherChild) const
 {
-    Relation relation = QAccessibleWidgetEx::relationTo(child, other, otherChild);
+    Relation relation = QAccessibleWidget::relationTo(child, other, otherChild);
     if (child || otherChild)
         return relation;
 
@@ -615,7 +615,7 @@ int QAccessibleDisplay::navigate(RelationFlag rel, int entry, QAccessibleInterfa
         if (*target)
             return 0;
     }
-    return QAccessibleWidgetEx::navigate(rel, entry, target);
+    return QAccessibleWidget::navigate(rel, entry, target);
 }
 
 /*! \internal */
@@ -671,10 +671,10 @@ QRect QAccessibleDisplay::imagePosition(QAccessible2::CoordinateType coordType)
 
 /*!
   Constructs a QAccessibleLineEdit object for \a w.
-  \a name is propagated to the QAccessibleWidgetEx constructor.
+  \a name is propagated to the QAccessibleWidget constructor.
 */
 QAccessibleLineEdit::QAccessibleLineEdit(QWidget *w, const QString &name)
-: QAccessibleWidgetEx(w, EditableText, name), QAccessibleSimpleEditableTextInterface(this)
+: QAccessibleWidget(w, EditableText, name), QAccessibleSimpleEditableTextInterface(this)
 {
     addControllingSignal(QLatin1String("textChanged(const QString&)"));
     addControllingSignal(QLatin1String("returnPressed()"));
@@ -699,7 +699,7 @@ QString QAccessibleLineEdit::text(Text t, int child) const
         break;
     }
     if (str.isEmpty())
-        str = QAccessibleWidgetEx::text(t, child);;
+        str = QAccessibleWidget::text(t, child);;
     return qt_accStripAmp(str);
 }
 
@@ -707,7 +707,7 @@ QString QAccessibleLineEdit::text(Text t, int child) const
 void QAccessibleLineEdit::setText(Text t, int control, const QString &text)
 {
     if (t != Value || control) {
-        QAccessibleWidgetEx::setText(t, control, text);
+        QAccessibleWidget::setText(t, control, text);
         return;
     }
 
@@ -723,7 +723,7 @@ void QAccessibleLineEdit::setText(Text t, int control, const QString &text)
 /*! \reimp */
 QAccessible::State QAccessibleLineEdit::state(int child) const
 {
-    State state = QAccessibleWidgetEx::state(child);
+    State state = QAccessibleWidget::state(child);
 
     QLineEdit *l = lineEdit();
     if (l->isReadOnly())
@@ -741,7 +741,7 @@ QAccessible::State QAccessibleLineEdit::state(int child) const
     return state;
 }
 
-QVariant QAccessibleLineEdit::invokeMethodEx(QAccessible::Method method, int child,
+QVariant QAccessibleLineEdit::invokeMethod(QAccessible::Method method, int child,
                                                      const QVariantList &params)
 {
     if (child)
@@ -752,7 +752,7 @@ QVariant QAccessibleLineEdit::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());
@@ -760,7 +760,7 @@ QVariant QAccessibleLineEdit::invokeMethodEx(QAccessible::Method method, int chi
     case GetCursorPosition:
         return cursorPosition();
     default:
-        return QAccessibleWidgetEx::invokeMethodEx(method, child, params);
+        return QAccessibleWidget::invokeMethod(method, child, params);
     }
 }