diff options
author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-11-30 09:48:51 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-30 12:12:08 +0100 |
commit | 84e66f69ae2a2e0b70c8e51c93b6991bf3437e6d (patch) | |
tree | 64ec87aefef2c5749bd13b27a3501a3ce42b96ab /src/plugins/accessible/widgets/simplewidgets.h | |
parent | 55c3799bd32d6fd8ec4b5fa26ebe3e5fdbbc91b3 (diff) |
Fix casting. Casting is now done through the virtual interface_cast.
Change interface_cast to return void* to avoid using virtual
inheritance.
Get rid of the magic Q_ACCESSIBLE_OBJECT macro.
Change-Id: I94b824aef53f2ba657d39d406b387c8681d47ee4
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src/plugins/accessible/widgets/simplewidgets.h')
-rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h index 25c3150386..35fa6ee9b8 100644 --- a/src/plugins/accessible/widgets/simplewidgets.h +++ b/src/plugins/accessible/widgets/simplewidgets.h @@ -57,7 +57,6 @@ class QProgressBar; class QAccessibleButton : public QAccessibleWidget { - Q_ACCESSIBLE_OBJECT Q_DECLARE_TR_FUNCTIONS(QAccessibleButton) public: QAccessibleButton(QWidget *w, Role r); @@ -99,7 +98,6 @@ protected: class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInterface { - Q_ACCESSIBLE_OBJECT public: explicit QAccessibleDisplay(QWidget *w, Role role = StaticText); @@ -108,6 +106,7 @@ public: Relation relationTo(const QAccessibleInterface *other) const; int navigate(RelationFlag, int entry, QAccessibleInterface **target) const; + void *interface_cast(QAccessible::InterfaceType t); // QAccessibleImageInterface QString imageDescription(); @@ -119,7 +118,6 @@ public: class QAccessibleLineEdit : public QAccessibleWidget, public QAccessibleTextInterface, public QAccessibleSimpleEditableTextInterface { - Q_ACCESSIBLE_OBJECT public: explicit QAccessibleLineEdit(QWidget *o, const QString &name = QString()); @@ -127,6 +125,7 @@ public: void setText(Text t, const QString &text); State state() const; QVariant invokeMethod(QAccessible::Method method, const QVariantList ¶ms); + void *interface_cast(QAccessible::InterfaceType t); // QAccessibleTextInterface void addSelection(int startOffset, int endOffset); @@ -157,9 +156,9 @@ protected: #ifndef QT_NO_PROGRESSBAR class QAccessibleProgressBar : public QAccessibleDisplay, public QAccessibleValueInterface { - Q_ACCESSIBLE_OBJECT public: explicit QAccessibleProgressBar(QWidget *o); + void *interface_cast(QAccessible::InterfaceType t); // QAccessibleValueInterface QVariant currentValue(); |