summaryrefslogtreecommitdiffstats
path: root/src/plugins/accessible/widgets/qaccessiblemenu.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-11-01 14:36:20 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-03 20:07:04 +0100
commit7d7b2d4218e048bb599e16b11a3a0625222c6dd9 (patch)
treee60800025ce546b6fb7700d211e784b3ed67e24a /src/plugins/accessible/widgets/qaccessiblemenu.cpp
parentd2f1c6cd750e0977f5773dd784438a428ce42f33 (diff)
QtGui: Fix compilation with gcc 4.4
- Do not mix QStringLiteral and Q_TR_NOOP. - Replace static QString member variables by - static member functions to return the strings. - Use tr() since QAccessibleActionInterface declares it. Acked-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Change-Id: Iabbee8ef61a5d7bfd35978a3f1cce1866329d065 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/plugins/accessible/widgets/qaccessiblemenu.cpp')
-rw-r--r--src/plugins/accessible/widgets/qaccessiblemenu.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
index 5eaf5bc2c9..f2978267b8 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
@@ -444,9 +444,9 @@ QStringList QAccessibleMenuItem::actionNames() const
return actions;
if (m_action->menu()) {
- actions << ShowMenuAction;
+ actions << showMenuAction();
} else {
- actions << PressAction;
+ actions << pressAction();
}
return actions;
}
@@ -456,9 +456,9 @@ void QAccessibleMenuItem::doAction(const QString &actionName)
if (!m_action->isEnabled())
return;
- if (actionName == PressAction) {
+ if (actionName == pressAction()) {
m_action->trigger();
- } else if (actionName == ShowMenuAction) {
+ } else if (actionName == showMenuAction()) {
if (QMenuBar *bar = qobject_cast<QMenuBar*>(owner())) {
if (m_action->menu() && m_action->menu()->isVisible()) {
m_action->menu()->hide();