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/rangecontrols.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/rangecontrols.h')
| -rw-r--r-- | src/plugins/accessible/widgets/rangecontrols.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/accessible/widgets/rangecontrols.h b/src/plugins/accessible/widgets/rangecontrols.h index 6719329cd8..59eb8f934a 100644 --- a/src/plugins/accessible/widgets/rangecontrols.h +++ b/src/plugins/accessible/widgets/rangecontrols.h @@ -60,11 +60,11 @@ class QDial; #ifndef QT_NO_SPINBOX class QAccessibleAbstractSpinBox: public QAccessibleWidget, public QAccessibleValueInterface // TODO, public QAccessibleActionInterface { - Q_ACCESSIBLE_OBJECT public: explicit QAccessibleAbstractSpinBox(QWidget *w); QString text(Text t) const; + void *interface_cast(QAccessible::InterfaceType t); // QAccessibleValueInterface QVariant currentValue(); @@ -101,9 +101,9 @@ protected: class QAccessibleAbstractSlider: public QAccessibleWidget, public QAccessibleValueInterface { - Q_ACCESSIBLE_OBJECT public: explicit QAccessibleAbstractSlider(QWidget *w, Role r = Slider); + void *interface_cast(QAccessible::InterfaceType t); // QAccessibleValueInterface QVariant currentValue(); |