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/widgets/accessible/qaccessible.cpp | 14 +++---- src/widgets/accessible/qaccessible.h | 20 +++------- src/widgets/accessible/qaccessibleobject.cpp | 23 ----------- src/widgets/accessible/qaccessibleobject.h | 26 ------------- src/widgets/accessible/qaccessiblewidget.cpp | 58 +--------------------------- src/widgets/accessible/qaccessiblewidget.h | 40 +------------------ 6 files changed, 15 insertions(+), 166 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/accessible/qaccessible.cpp b/src/widgets/accessible/qaccessible.cpp index e657cd0db1..f8f63b1577 100644 --- a/src/widgets/accessible/qaccessible.cpp +++ b/src/widgets/accessible/qaccessible.cpp @@ -1153,13 +1153,13 @@ QVector > QAccessibleInterfa */ QVariant QAccessibleInterface::invokeMethod(Method method, int child, const QVariantList ¶ms) { - if (!(state(0) & HasInvokeExtension)) - return QVariant(); - - return static_cast(this)->invokeMethodEx(method, child, params); + Q_UNUSED(method) + Q_UNUSED(child) + Q_UNUSED(params) + return QVariant(); } -QVariant QAccessibleInterfaceEx::virtual_hook(const QVariant &) +QVariant QAccessibleInterface::virtual_hook(const QVariant &) { return QVariant(); } @@ -1167,9 +1167,7 @@ QVariant QAccessibleInterfaceEx::virtual_hook(const QVariant &) /*! \internal */ QAccessible2Interface *QAccessibleInterface::cast_helper(QAccessible2::InterfaceType t) { - if (state(0) & HasInvokeExtension) - return static_cast(this)->interface_cast(t); - return 0; + return interface_cast(t); } QT_END_NAMESPACE diff --git a/src/widgets/accessible/qaccessible.h b/src/widgets/accessible/qaccessible.h index f03f86ce7a..cbfbca61c5 100644 --- a/src/widgets/accessible/qaccessible.h +++ b/src/widgets/accessible/qaccessible.h @@ -177,11 +177,8 @@ public: //AlertHigh = 0x10000000, /* reused for HasInvokeExtension */ Protected = 0x20000000, HasPopup = 0x40000000, - Modal = 0x80000000, + Modal = 0x80000000 - // #### Qt5 ManagesDescendants - // #### Qt5 remove HasInvokeExtension - HasInvokeExtension = 0x10000000 // internal }; Q_DECLARE_FLAGS(State, StateFlag) @@ -399,7 +396,7 @@ public: virtual QString actionText(int action, Text t, int child) const = 0; virtual bool doAction(int action, int child, const QVariantList ¶ms = QVariantList()) = 0; - QVariant invokeMethod(Method method, int child = 0, + virtual QVariant invokeMethod(Method method, int child = 0, const QVariantList ¶ms = QVariantList()); inline QSet supportedMethods() @@ -432,19 +429,14 @@ public: inline QAccessibleTable2Interface *table2Interface() { return reinterpret_cast(cast_helper(QAccessible2::Table2Interface)); } -private: - QAccessible2Interface *cast_helper(QAccessible2::InterfaceType); -}; - -class Q_WIDGETS_EXPORT QAccessibleInterfaceEx: public QAccessibleInterface -{ -public: - virtual QVariant invokeMethodEx(Method method, int child, const QVariantList ¶ms) = 0; + // FIXME virtual QVariant virtual_hook(const QVariant &data); virtual QAccessible2Interface *interface_cast(QAccessible2::InterfaceType) { return 0; } -}; +private: + QAccessible2Interface *cast_helper(QAccessible2::InterfaceType); +}; class Q_WIDGETS_EXPORT QAccessibleEvent : public QEvent { diff --git a/src/widgets/accessible/qaccessibleobject.cpp b/src/widgets/accessible/qaccessibleobject.cpp index 20f3a15bb4..3f3534baf9 100644 --- a/src/widgets/accessible/qaccessibleobject.cpp +++ b/src/widgets/accessible/qaccessibleobject.cpp @@ -380,29 +380,6 @@ QString QAccessibleApplication::actionText(int action, Text text, int child) con return QAccessibleObject::actionText(action, text, child); } -// ### Qt 5: remove me - binary compatibility hack -QAccessibleObjectEx::QAccessibleObjectEx(QObject *object) -{ - d = new QAccessibleObjectPrivate; - d->object = object; -} -bool QAccessibleObjectEx::isValid() const -{ return reinterpret_cast(this)->QAccessibleObject::isValid(); } -QObject *QAccessibleObjectEx::object() const -{ return reinterpret_cast(this)->QAccessibleObject::object(); } -QRect QAccessibleObjectEx::rect(int child) const -{ return reinterpret_cast(this)->QAccessibleObject::rect(child); } -void QAccessibleObjectEx::setText(Text t, int child, const QString &text) -{ reinterpret_cast(this)->QAccessibleObject::setText(t, child, text); } -int QAccessibleObjectEx::userActionCount(int child) const -{ return reinterpret_cast(this)->QAccessibleObject::userActionCount(child); } -bool QAccessibleObjectEx::doAction(int action, int child, const QVariantList ¶ms) -{ return reinterpret_cast(this)->QAccessibleObject::doAction(action, child, params); } -QString QAccessibleObjectEx::actionText(int action, Text t, int child) const -{ return reinterpret_cast(this)->QAccessibleObject::actionText(action, t, child); } -QAccessibleObjectEx::~QAccessibleObjectEx() -{ delete d; } - QT_END_NAMESPACE #endif //QT_NO_ACCESSIBILITY diff --git a/src/widgets/accessible/qaccessibleobject.h b/src/widgets/accessible/qaccessibleobject.h index f2ec2ba9c9..b26cfa743b 100644 --- a/src/widgets/accessible/qaccessibleobject.h +++ b/src/widgets/accessible/qaccessibleobject.h @@ -76,36 +76,10 @@ protected: virtual ~QAccessibleObject(); private: - friend class QAccessibleObjectEx; QAccessibleObjectPrivate *d; Q_DISABLE_COPY(QAccessibleObject) }; -class Q_WIDGETS_EXPORT QAccessibleObjectEx : public QAccessibleInterfaceEx -{ -public: - explicit QAccessibleObjectEx(QObject *object); - - bool isValid() const; - QObject *object() const; - - // properties - QRect rect(int child) const; - void setText(Text t, int child, const QString &text); - - // actions - int userActionCount(int child) const; - bool doAction(int action, int child, const QVariantList ¶ms); - QString actionText(int action, Text t, int child) const; - -protected: - virtual ~QAccessibleObjectEx(); - -private: - QAccessibleObjectPrivate *d; - Q_DISABLE_COPY(QAccessibleObjectEx) -}; - class Q_WIDGETS_EXPORT QAccessibleApplication : public QAccessibleObject { public: diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 05948dcc9c..76b6cf300a 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -953,63 +953,7 @@ QAccessible::State QAccessibleWidget::state(int child) const return state; } -// ### Qt 5: remove me - binary compatibility hack -QAccessibleWidgetEx::QAccessibleWidgetEx(QWidget *o, Role role, const QString& name) - : QAccessibleObjectEx(o) -{ - Q_ASSERT(widget()); - d = new QAccessibleWidgetPrivate(); - d->role = role; - d->name = name; - d->asking = 0; -} - -int QAccessibleWidgetEx::childCount() const -{ return reinterpret_cast(this)->QAccessibleWidget::childCount(); } -int QAccessibleWidgetEx::indexOfChild(const QAccessibleInterface *child) const -{ return reinterpret_cast(this)->QAccessibleWidget::indexOfChild(child); } -QAccessible::Relation QAccessibleWidgetEx::relationTo(int child, const QAccessibleInterface *other, int otherChild) const -{ return reinterpret_cast(this)->QAccessibleWidget::relationTo(child, other, otherChild); } - -int QAccessibleWidgetEx::childAt(int x, int y) const -{ return reinterpret_cast(this)->QAccessibleWidget::childAt(x, y); } -QRect QAccessibleWidgetEx::rect(int child) const -{ return reinterpret_cast(this)->QAccessibleWidget::rect(child); } -int QAccessibleWidgetEx::navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const -{ return reinterpret_cast(this)->QAccessibleWidget::navigate(rel, entry, target); } - -QString QAccessibleWidgetEx::text(Text t, int child) const -{ return reinterpret_cast(this)->QAccessibleWidget::text(t, child); } -QAccessible::Role QAccessibleWidgetEx::role(int child) const -{ return reinterpret_cast(this)->QAccessibleWidget::role(child); } -QAccessible::State QAccessibleWidgetEx::state(int child) const -{ return (reinterpret_cast(this)->QAccessibleWidget::state(child)) - | HasInvokeExtension; } - -QString QAccessibleWidgetEx::actionText(int action, Text t, int child) const -{ return reinterpret_cast(this)->QAccessibleWidget::actionText(action, t, child); } -bool QAccessibleWidgetEx::doAction(int action, int child, const QVariantList ¶ms) -{ return reinterpret_cast(this)->QAccessibleWidget::doAction(action, child, params); } - -QAccessibleWidgetEx::~QAccessibleWidgetEx() -{ delete d; } -QWidget *QAccessibleWidgetEx::widget() const -{ return reinterpret_cast(this)->QAccessibleWidget::widget(); } -QObject *QAccessibleWidgetEx::parentObject() const -{ return reinterpret_cast(this)->QAccessibleWidget::parentObject(); } - -void QAccessibleWidgetEx::addControllingSignal(const QString &signal) -{ reinterpret_cast(this)->QAccessibleWidget::addControllingSignal(signal); } -void QAccessibleWidgetEx::setValue(const QString &value) -{ reinterpret_cast(this)->QAccessibleWidget::setValue(value); } -void QAccessibleWidgetEx::setDescription(const QString &desc) -{ reinterpret_cast(this)->QAccessibleWidget::setDescription(desc); } -void QAccessibleWidgetEx::setHelp(const QString &help) -{ reinterpret_cast(this)->QAccessibleWidget::setHelp(help); } -void QAccessibleWidgetEx::setAccelerator(const QString &accel) -{ reinterpret_cast(this)->QAccessibleWidget::setAccelerator(accel); } - -QVariant QAccessibleWidgetEx::invokeMethodEx(Method method, int child, const QVariantList & /*params*/) +QVariant QAccessibleWidget::invokeMethod(Method method, int child, const QVariantList & /*params*/) { if (child) return QVariant(); diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index 3b68e30a63..52b4566d13 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -77,6 +77,8 @@ public: bool doAction(int action, int child, const QVariantList ¶ms); #endif + QVariant invokeMethod(Method method, int child, const QVariantList ¶ms); + protected: ~QAccessibleWidget(); QWidget *widget() const; @@ -89,48 +91,10 @@ protected: void setAccelerator(const QString &accel); private: - friend class QAccessibleWidgetEx; QAccessibleWidgetPrivate *d; Q_DISABLE_COPY(QAccessibleWidget) }; -class Q_WIDGETS_EXPORT QAccessibleWidgetEx : public QAccessibleObjectEx -{ -public: - explicit QAccessibleWidgetEx(QWidget *o, Role r = Client, const QString& name = QString()); - - int childCount() const; - int indexOfChild(const QAccessibleInterface *child) const; - Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const; - - int childAt(int x, int y) const; - QRect rect(int child) const; - int navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const; - - QString text(Text t, int child) const; - Role role(int child) const; - State state(int child) const; - - QString actionText(int action, Text t, int child) const; - bool doAction(int action, int child, const QVariantList ¶ms); - - QVariant invokeMethodEx(Method method, int child, const QVariantList ¶ms); - -protected: - ~QAccessibleWidgetEx(); - QWidget *widget() const; - QObject *parentObject() const; - - void addControllingSignal(const QString &signal); - void setValue(const QString &value); - void setDescription(const QString &desc); - void setHelp(const QString &help); - void setAccelerator(const QString &accel); - -private: - QAccessibleWidgetPrivate *d; - Q_DISABLE_COPY(QAccessibleWidgetEx) -}; #endif // QT_NO_ACCESSIBILITY -- cgit v1.2.3