From 39a052c66479c6d7bd13c4f583fecf6a895b2948 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Date: Thu, 5 Jan 2012 13:57:33 +0100
Subject: Accessiblity State as bit field.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We would like to add more flags that will be over the 32 bit boundary.
On Windows enums don't seem to digest values >32 bit.
This patch changes the state flags to be a bit field instead.

The windows part of the patch was written by Jan-Arve Sæther.

Change-Id: I2d1d87807f920ce4d4a5c7bfea8b1122ed44eb08
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
---
 src/plugins/accessible/widgets/simplewidgets.cpp | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/plugins/accessible/widgets/simplewidgets.cpp')

diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index b05b917c21..74e9645693 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -140,18 +140,18 @@ QAccessible::State QAccessibleButton::state() const
     QAbstractButton *b = button();
     QCheckBox *cb = qobject_cast<QCheckBox *>(b);
     if (b->isChecked())
-        state |= QAccessible::Checked;
+        state.checked = true;
     else if (cb && cb->checkState() == Qt::PartiallyChecked)
-        state |= QAccessible::Mixed;
+        state.mixed = true;
     if (b->isDown())
-        state |= QAccessible::Pressed;
+        state.pressed = true;
     QPushButton *pb = qobject_cast<QPushButton*>(b);
     if (pb) {
         if (pb->isDefault())
-            state |= QAccessible::DefaultButton;
+            state.defaultButton = true;
 #ifndef QT_NO_MENU
         if (pb->menu())
-            state |= QAccessible::HasPopup;
+            state.hasPopup = true;
 #endif
     }
 
@@ -171,7 +171,7 @@ QStringList QAccessibleButton::actionNames() const
             break;
         default:
             if (button()->isCheckable()) {
-                if (state() & QAccessible::Checked) {
+                if (state().checked) {
                     names <<  uncheckAction();
                 } else {
                     // FIXME
@@ -263,10 +263,10 @@ QAccessible::State QAccessibleToolButton::state() const
 {
     QAccessible::State st = QAccessibleButton::state();
     if (toolButton()->autoRaise())
-        st |= QAccessible::HotTracked;
+        st.hotTracked = true;
 #ifndef QT_NO_MENU
     if (toolButton()->menu())
-        st |= QAccessible::HasPopup;
+        st.hasPopup = true;
 #endif
     return st;
 }
@@ -588,16 +588,16 @@ QAccessible::State QAccessibleLineEdit::state() const
 
     QLineEdit *l = lineEdit();
     if (l->isReadOnly())
-        state |= QAccessible::ReadOnly;
+        state.readOnly = true;
     if (l->echoMode() != QLineEdit::Normal)
-        state |= QAccessible::Protected;
-    state |= QAccessible::Selectable;
+        state.passwordEdit = true;
+    state.selectable = true;
     if (l->hasSelectedText())
-        state |= QAccessible::Selected;
+        state.selected = true;
 
     if (l->contextMenuPolicy() != Qt::NoContextMenu
         && l->contextMenuPolicy() != Qt::PreventContextMenu)
-        state |= QAccessible::HasPopup;
+        state.hasPopup = true;
 
     return state;
 }
-- 
cgit v1.2.3