From 204108d37bbe6b17b43f6cc997c369e338c274df Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 29 Aug 2011 13:28:23 +0200 Subject: Remove AccessibleEx classes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Morten Johan Sørvig Reviewed-by: Jan-Arve Sæther --- src/plugins/accessible/widgets/simplewidgets.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/accessible/widgets/simplewidgets.h') 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 ¶ms); + QVariant invokeMethod(QAccessible::Method method, int child, const QVariantList ¶ms); // QAccessibleTextInterface void addSelection(int startOffset, int endOffset); -- cgit v1.2.3