From 018cb899d482967eb7d8ebdc48cadf1743abe680 Mon Sep 17 00:00:00 2001
From: Jan-Arve Saether <jan-arve.saether@nokia.com>
Date: Tue, 22 May 2012 09:15:38 +0200
Subject: Replace (un)checkAction with toggleAction (3/3)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove all references to (un)checkAction.
This commit finalizes the intended change.

Change-Id: I79d3b30b5c3d9fbe276c2c94fed5971bb21d6c02
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 src/plugins/accessible/widgets/simplewidgets.cpp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'src/plugins/accessible')

diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index af0c211cca..0fa6dc9990 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -168,18 +168,11 @@ QStringList QAccessibleButton::actionNames() const
             names << showMenuAction();
             break;
         case QAccessible::RadioButton:
-            names << checkAction();
+            names << toggleAction();
             break;
         default:
             if (button()->isCheckable()) {
-                if (state().checked) {
-                    names <<  uncheckAction();
-                } else {
-                    // FIXME
-    //                QCheckBox *cb = qobject_cast<QCheckBox*>(object());
-    //                if (!cb || !cb->isTristate() || cb->checkState() == Qt::PartiallyChecked)
-                    names <<  checkAction();
-                }
+                names <<  toggleAction();
             } else {
                 names << pressAction();
             }
@@ -203,10 +196,8 @@ void QAccessibleButton::doAction(const QString &actionName)
         else
 #endif
             button()->animateClick();
-    } else if (actionName == checkAction()) {
-        button()->setChecked(true);
-    } else if (actionName == uncheckAction()) {
-        button()->setChecked(false);
+    } else if (actionName == toggleAction()) {
+        button()->toggle();
     } else {
         QAccessibleWidget::doAction(actionName);
     }
@@ -552,14 +543,14 @@ QStringList QAccessibleGroupBox::actionNames() const
     QStringList actions = QAccessibleWidget::actionNames();
 
     if (groupBox()->isCheckable()) {
-        actions.prepend(QAccessibleActionInterface::checkAction());
+        actions.prepend(QAccessibleActionInterface::toggleAction());
     }
     return actions;
 }
 
 void QAccessibleGroupBox::doAction(const QString &actionName)
 {
-    if (actionName == QAccessibleActionInterface::checkAction())
+    if (actionName == QAccessibleActionInterface::toggleAction())
         groupBox()->setChecked(!groupBox()->isChecked());
 }
 
-- 
cgit v1.2.3