diff options
Diffstat (limited to 'src/plugins/accessible/widgets')
-rw-r--r-- | src/plugins/accessible/widgets/qaccessiblewidgets.cpp | 23 | ||||
-rw-r--r-- | src/plugins/accessible/widgets/qaccessiblewidgets.h | 2 |
2 files changed, 9 insertions, 16 deletions
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp index 22644aad2b..676d140eb0 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp @@ -1267,21 +1267,14 @@ QAccessibleDockWidget::QAccessibleDockWidget(QWidget *widget) } -int QAccessibleDockWidget::navigate(RelationFlag relation, int entry, QAccessibleInterface **iface) const -{ - if (relation == Child) { - if (entry == 1) { - *iface = new QAccessibleTitleBar(dockWidget()); - return 0; - } else if (entry == 2) { - if (dockWidget()->widget()) - *iface = QAccessible::queryAccessibleInterface(dockWidget()->widget()); - return 0; - } - *iface = 0; - return -1; +QAccessibleInterface *QAccessibleDockWidget::child(int index) const +{ + if (index == 0) { + return new QAccessibleTitleBar(dockWidget()); + } else if (index == 1 && dockWidget()->widget()) { + return QAccessible::queryAccessibleInterface(dockWidget()->widget()); } - return QAccessibleWidget::navigate(relation, entry, iface); + return 0; } int QAccessibleDockWidget::childAt(int x, int y) const @@ -1332,7 +1325,7 @@ QAccessible::State QAccessibleDockWidget::state(int child) const return QAccessibleWidget::state(child); } -QRect QAccessibleDockWidget::rect (int child ) const +QRect QAccessibleDockWidget::rect(int child) const { QRect rect; bool mapToGlobal = true; diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.h b/src/plugins/accessible/widgets/qaccessiblewidgets.h index 8d0a13a04a..b82df2f234 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.h +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.h @@ -250,7 +250,7 @@ class QAccessibleDockWidget: public QAccessibleWidget { public: explicit QAccessibleDockWidget(QWidget *widget); - int navigate(RelationFlag relation, int entry, QAccessibleInterface **iface) const; + QAccessibleInterface *child(int index) const; int indexOfChild(const QAccessibleInterface *child) const; int childCount() const; QRect rect (int child ) const; |