From 4ac33a523e7feccff03032e8ff85206364d120a9 Mon Sep 17 00:00:00 2001 From: Jan-Arve Saether Date: Tue, 22 May 2012 09:04:59 +0200 Subject: Replace (un)checkAction with toggleAction (2/3) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed in order to finalize the replacement of {check,uncheck}Action with toggleAction. Change-Id: I7328275aa86cf4e8dc093f86597529b41fefd4a6 Reviewed-by: Morten Johan Sørvig --- src/plugins/accessible/shared/qqmlaccessible.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/plugins') 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; -- cgit v1.2.3