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>

1 files changed, 14 insertions, 0 deletions

diff --git a/src/plugins/accessible/widgets/rangecontrols.cpp b/src/plugins/accessible/widgets/rangecontrols.cpp
index db10a1bff3..684b45d7c5 100644
--- a/src/plugins/accessible/widgets/rangecontrols.cpp
+++ b/src/plugins/accessible/widgets/rangecontrols.cpp
@@ -87,6 +87,13 @@ QString QAccessibleAbstractSpinBox::text(Text t) const
     return QAccessibleWidget::text(t);
 }
 
+void *QAccessibleAbstractSpinBox::interface_cast(QAccessible::InterfaceType t)
+{
+    if (t == QAccessible::ValueInterface)
+        return static_cast<QAccessibleValueInterface*>(this);
+    return QAccessibleWidget::interface_cast(t);
+}
+
 QVariant QAccessibleAbstractSpinBox::currentValue()
 {
     QVariant result = abstractSpinBox()->property("value");
@@ -244,6 +251,13 @@ QAccessibleAbstractSlider::QAccessibleAbstractSlider(QWidget *w, Role r)
     Q_ASSERT(qobject_cast<QAbstractSlider *>(w));
 }
 
+void *QAccessibleAbstractSlider::interface_cast(QAccessible::InterfaceType t)
+{
+    if (t == QAccessible::ValueInterface)
+        return static_cast<QAccessibleValueInterface*>(this);
+    return QAccessibleWidget::interface_cast(t);
+}
+
 QVariant QAccessibleAbstractSlider::currentValue()
 {
     return abstractSlider()->value();