diff options
author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-10-06 14:54:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 19:25:42 +0200 |
commit | 4dc25c1f2995a5e02da47f0f6f3522af9eb6f78c (patch) | |
tree | 86391ff6c57ed46295df684a4c87ba9db0b73263 /src/widgets/accessible/qaccessiblewidget.cpp | |
parent | 663cd1771883e1e7ac9c1a0dc8b797601b59ba17 (diff) |
Refactor QAccessibleActionInterface.
Some refinements done by Jan-Arve Sæther.
Change-Id: I99195b3c7273316cfa9c46e451924bbcfddd11a9
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/widgets/accessible/qaccessiblewidget.cpp')
-rw-r--r-- | src/widgets/accessible/qaccessiblewidget.cpp | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 65a067e8d0..a4a1da7242 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -819,67 +819,6 @@ QString QAccessibleWidget::text(Text t, int child) const return str; } -#ifndef QT_NO_ACTION - -/*! \reimp */ -int QAccessibleWidget::userActionCount(int child) const -{ - if (child) - return 0; - return widget()->actions().count(); -} - -/*! \reimp */ -QString QAccessibleWidget::actionText(int action, Text t, int child) const -{ - if (action == DefaultAction) - action = SetFocus; - - if (action > 0 && !child) { - QAction *act = widget()->actions().value(action - 1); - if (act) { - switch (t) { - case Name: - return act->text(); - case Description: - return act->toolTip(); -#ifndef QT_NO_SHORTCUT - case Accelerator: - return act->shortcut().toString(); -#endif - default: - break; - } - } - } - - return QAccessibleObject::actionText(action, t, child); -} - -/*! \reimp */ -bool QAccessibleWidget::doAction(int action, int child, const QVariantList ¶ms) -{ - if (action == SetFocus || action == DefaultAction) { - if (child || !widget()->isEnabled()) - return false; - if (widget()->focusPolicy() != Qt::NoFocus) - widget()->setFocus(); - else if (widget()->isWindow()) - widget()->activateWindow(); - else - return false; - return true; - } else if (action > 0) { - if (QAction *act = widget()->actions().value(action - 1)) { - act->trigger(); - return true; - } - } - return QAccessibleObject::doAction(action, child, params); -} - -#endif // QT_NO_ACTION - /*! \reimp */ QAccessible::Role QAccessibleWidget::role(int child) const { |