aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJan-Arve Saether <jan-arve.saether@nokia.com>2012-05-22 09:04:59 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-22 14:15:43 +0200
commit4ac33a523e7feccff03032e8ff85206364d120a9 (patch)
tree47e6feec59fcafb39268473cf5911bf668d96ce1 /src/plugins
parentf7323fcf1277268931bb336047e1186a20affcf6 (diff)
Replace (un)checkAction with toggleAction (2/3)
Needed in order to finalize the replacement of {check,uncheck}Action with toggleAction. Change-Id: I7328275aa86cf4e8dc093f86597529b41fefd4a6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/accessible/shared/qqmlaccessible.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/accessible/shared/qqmlaccessible.cpp b/src/plugins/accessible/shared/qqmlaccessible.cpp
index 54d0c06171..d4d405939b 100644
--- a/src/plugins/accessible/shared/qqmlaccessible.cpp
+++ b/src/plugins/accessible/shared/qqmlaccessible.cpp
@@ -138,9 +138,7 @@ QStringList QQmlAccessible::actionNames() const
break;
case QAccessible::RadioButton:
case QAccessible::CheckBox:
- actions << QAccessibleActionInterface::checkAction()
- << QAccessibleActionInterface::uncheckAction()
- << QAccessibleActionInterface::pressAction();
+ actions << QAccessibleActionInterface::toggleAction();
break;
case QAccessible::Slider:
case QAccessible::SpinBox:
@@ -174,12 +172,8 @@ void QQmlAccessible::doAction(const QString &actionName)
case QAccessible::CheckBox: {
QVariant checked = object()->property("checked");
if (checked.isValid()) {
- if (actionName == QAccessibleActionInterface::pressAction()) {
+ if (actionName == QAccessibleActionInterface::toggleAction()) {
object()->setProperty("checked", QVariant(!checked.toBool()));
- } else if (actionName == QAccessibleActionInterface::checkAction()) {
- object()->setProperty("checked", QVariant(true));
- } else if (actionName == QAccessibleActionInterface::uncheckAction()) {
- object()->setProperty("checked", QVariant(false));
}
}
break;