diff options
author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-08-29 13:28:23 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-15 09:11:35 +0200 |
commit | 204108d37bbe6b17b43f6cc997c369e338c274df (patch) | |
tree | eb5397083b5e5cbc17a47f67adc05e748b59d007 /src/plugins/accessible/widgets/complexwidgets.h | |
parent | 0478349f83803d82f7900846acfb5a6decf5efc0 (diff) |
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>
Diffstat (limited to 'src/plugins/accessible/widgets/complexwidgets.h')
-rw-r--r-- | src/plugins/accessible/widgets/complexwidgets.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/accessible/widgets/complexwidgets.h b/src/plugins/accessible/widgets/complexwidgets.h index 3c01445091..05d8bc232a 100644 --- a/src/plugins/accessible/widgets/complexwidgets.h +++ b/src/plugins/accessible/widgets/complexwidgets.h @@ -60,7 +60,7 @@ class QAbstractScrollArea; class QScrollArea; #ifndef QT_NO_SCROLLAREA -class QAccessibleAbstractScrollArea : public QAccessibleWidgetEx +class QAccessibleAbstractScrollArea : public QAccessibleWidget { public: explicit QAccessibleAbstractScrollArea(QWidget *widget); @@ -77,7 +77,7 @@ public: QString text(Text textType, int child) const; void setText(Text textType, int child, 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); int childCount() const; int indexOfChild(const QAccessibleInterface *child) const; bool isValid() const; @@ -103,7 +103,7 @@ public: #endif // QT_NO_SCROLLAREA #ifndef QT_NO_ITEMVIEWS -class QAccessibleHeader : public QAccessibleWidgetEx +class QAccessibleHeader : public QAccessibleWidget { Q_ACCESSIBLE_OBJECT public: @@ -229,7 +229,7 @@ private: #endif #ifndef QT_NO_TABBAR -class QAccessibleTabBar : public QAccessibleWidgetEx +class QAccessibleTabBar : public QAccessibleWidget { Q_ACCESSIBLE_OBJECT public: @@ -255,7 +255,7 @@ private: #endif // QT_NO_TABBAR #ifndef QT_NO_COMBOBOX -class QAccessibleComboBox : public QAccessibleWidgetEx +class QAccessibleComboBox : public QAccessibleWidget { Q_ACCESSIBLE_OBJECT public: |