summaryrefslogtreecommitdiffstats
path: root/src/plugins/accessible
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>2012-01-05 18:03:04 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-16 08:55:37 +0100
commitba888bb8c8e6fce76efc855ef81250f2c9426b40 (patch)
tree6ce3941c3203b7e6cdc50ed9d9c5aaeea76b8de1 /src/plugins/accessible
parent169b9cac648a4c15ae825b815a18236d95d62c6f (diff)
Clean up and extend QAccessible::State.
The state should contain useful and clear information. Some of the old enum/bitfield members were not really clear. Make them follow Qt terminology and shift the burden of interpreting them to the bridge. Apart from the previous commit changing from enum to bitfield, these flags have changed names: unavailable -> disabled mixed -> checkStateMixed protected -> passwordEdit (in the last commit) floating is completely removed, even MSAA documentation states it is unsupported. Some new states have been added. Documentation added. Change-Id: I152256e77a061f28ee5780f527524c80a2c7e333 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/plugins/accessible')
-rw-r--r--src/plugins/accessible/widgets/qaccessiblemenu.cpp2
-rw-r--r--src/plugins/accessible/widgets/qaccessiblewidgets.cpp4
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
index 77157d1b62..fcd118e745 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
@@ -273,7 +273,7 @@ QAccessible::State QAccessibleMenuItem::state() const
if (own->style()->styleHint(QStyle::SH_Menu_MouseTracking))
s.hotTracked = true;
if (m_action->isSeparator() || !m_action->isEnabled())
- s.unavailable = true;
+ s.disabled = true;
if (m_action->isChecked())
s.checked = true;
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
index bb744232f4..ffd87dd834 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
@@ -714,7 +714,7 @@ QAccessible::State QAccessibleMdiSubWindow::state() const
if (!mdiSubWindow()->parentWidget()->contentsRect().contains(mdiSubWindow()->geometry()))
state.offscreen = true;
if (!mdiSubWindow()->isEnabled())
- state.unavailable = true;
+ state.disabled = true;
return state;
}
@@ -1035,7 +1035,7 @@ QAccessible::State QAccessibleTitleBar::state() const
if (w->hasFocus())
state.focused = true;
if (!w->isEnabled())
- state.unavailable = true;
+ state.disabled = true;
return state;
}
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index 74e9645693..d645ad2d22 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -142,7 +142,7 @@ QAccessible::State QAccessibleButton::state() const
if (b->isChecked())
state.checked = true;
else if (cb && cb->checkState() == Qt::PartiallyChecked)
- state.mixed = true;
+ state.checkStateMixed = true;
if (b->isDown())
state.pressed = true;
QPushButton *pb = qobject_cast<QPushButton*>(b);