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>

6 files changed, 101 insertions, 52 deletions

diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp
index b3ad00cbce..f8d06da160 100644
--- a/src/gui/accessible/qaccessible2.cpp
+++ b/src/gui/accessible/qaccessible2.cpp
@@ -198,13 +198,27 @@ QT_BEGIN_NAMESPACE
     \sa actionNames()
 */
 
-const QString QAccessibleActionInterface::PressAction = QStringLiteral(QT_TR_NOOP("Press"));
-const QString QAccessibleActionInterface::IncreaseAction = QStringLiteral(QT_TR_NOOP("Increase"));
-const QString QAccessibleActionInterface::DecreaseAction = QStringLiteral(QT_TR_NOOP("Decrease"));
-const QString QAccessibleActionInterface::ShowMenuAction = QStringLiteral(QT_TR_NOOP("ShowMenu"));
-const QString QAccessibleActionInterface::SetFocusAction = QStringLiteral(QT_TR_NOOP("SetFocus"));
-const QString QAccessibleActionInterface::CheckAction = QStringLiteral(QT_TR_NOOP("Check"));
-const QString QAccessibleActionInterface::UncheckAction = QStringLiteral(QT_TR_NOOP("Uncheck"));
+struct QAccessibleActionStrings
+{
+    QAccessibleActionStrings() :
+        pressAction(QStringLiteral(QT_TRANSLATE_NOOP("QAccessibleActionInterface", "Press"))),
+        increaseAction(QStringLiteral(QT_TRANSLATE_NOOP("QAccessibleActionInterface", "Increase"))),
+        decreaseAction(QStringLiteral(QT_TRANSLATE_NOOP("QAccessibleActionInterface", "Decrease"))),
+        showMenuAction(QStringLiteral(QT_TRANSLATE_NOOP("QAccessibleActionInterface", "ShowMenu"))),
+        setFocusAction(QStringLiteral(QT_TRANSLATE_NOOP("QAccessibleActionInterface", "SetFocus"))),
+        checkAction(QStringLiteral(QT_TRANSLATE_NOOP("QAccessibleActionInterface", "Check"))),
+        uncheckAction(QStringLiteral(QT_TRANSLATE_NOOP("QAccessibleActionInterface", "Uncheck"))) {}
+
+    const QString pressAction;
+    const QString increaseAction;
+    const QString decreaseAction;
+    const QString showMenuAction;
+    const QString setFocusAction;
+    const QString checkAction;
+    const QString uncheckAction;
+};
+
+Q_GLOBAL_STATIC(QAccessibleActionStrings, accessibleActionStrings)
 
 QString QAccessibleActionInterface::localizedActionName(const QString &actionName) const
 {
@@ -213,24 +227,59 @@ QString QAccessibleActionInterface::localizedActionName(const QString &actionNam
 
 QString QAccessibleActionInterface::localizedActionDescription(const QString &actionName) const
 {
-    if (actionName == PressAction)
-        return QCoreApplication::translate("QAccessibleActionInterface", "Triggers the action");
-    else if (actionName == IncreaseAction)
-        return QCoreApplication::translate("QAccessibleActionInterface", "Increase the value");
-    else if (actionName == DecreaseAction)
-        return QCoreApplication::translate("QAccessibleActionInterface", "Decrease the value");
-    else if (actionName == ShowMenuAction)
-        return QCoreApplication::translate("QAccessibleActionInterface", "Shows the menu");
-    else if (actionName == SetFocusAction)
-        return QCoreApplication::translate("QAccessibleActionInterface", "Sets the focus");
-    else if (actionName == CheckAction)
-        return QCoreApplication::translate("QAccessibleActionInterface", "Checks the checkbox");
-    else if (actionName == UncheckAction)
-        return QCoreApplication::translate("QAccessibleActionInterface", "Unchecks the checkbox");
+    const QAccessibleActionStrings *strings = accessibleActionStrings();
+    if (actionName == strings->pressAction)
+        return tr("Triggers the action");
+    else if (actionName == strings->increaseAction)
+        return tr("Increase the value");
+    else if (actionName == strings->decreaseAction)
+        return tr("Decrease the value");
+    else if (actionName == strings->showMenuAction)
+        return tr("Shows the menu");
+    else if (actionName == strings->setFocusAction)
+        return tr("Sets the focus");
+    else if (actionName == strings->checkAction)
+        return tr("Checks the checkbox");
+    else if (actionName == strings->uncheckAction)
+        return tr("Unchecks the checkbox");
 
     return QString();
 }
 
+const QString &QAccessibleActionInterface::pressAction()
+{
+    return accessibleActionStrings()->pressAction;
+}
+
+const QString &QAccessibleActionInterface::increaseAction()
+{
+    return accessibleActionStrings()->increaseAction;
+}
+
+const QString &QAccessibleActionInterface::decreaseAction()
+{
+    return accessibleActionStrings()->decreaseAction;
+}
+
+const QString &QAccessibleActionInterface::showMenuAction()
+{
+    return accessibleActionStrings()->showMenuAction;
+}
+
+const QString &QAccessibleActionInterface::setFocusAction()
+{
+    return accessibleActionStrings()->setFocusAction;
+}
+
+const QString &QAccessibleActionInterface::checkAction()
+{
+    return accessibleActionStrings()->checkAction;
+}
+
+const QString &QAccessibleActionInterface::uncheckAction()
+{
+    return accessibleActionStrings()->uncheckAction;
+}
 
 /*!
   \internal
diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h
index d3777d6561..52dde4850a 100644
--- a/src/gui/accessible/qaccessible2.h
+++ b/src/gui/accessible/qaccessible2.h
@@ -339,13 +339,13 @@ public:
     virtual void doAction(const QString &actionName) = 0;
     virtual QStringList keyBindingsForAction(const QString &actionName) const = 0;
 
-    static const QString PressAction;
-    static const QString IncreaseAction;
-    static const QString DecreaseAction;
-    static const QString ShowMenuAction;
-    static const QString SetFocusAction;
-    static const QString CheckAction;
-    static const QString UncheckAction;
+    static const QString &pressAction();
+    static const QString &increaseAction();
+    static const QString &decreaseAction();
+    static const QString &showMenuAction();
+    static const QString &setFocusAction();
+    static const QString &checkAction();
+    static const QString &uncheckAction();
 };
 
 class Q_GUI_EXPORT QAccessibleImageInterface : public QAccessible2Interface
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp
index a94163c117..f26637bd17 100644
--- a/src/plugins/accessible/widgets/complexwidgets.cpp
+++ b/src/plugins/accessible/widgets/complexwidgets.cpp
@@ -1508,12 +1508,12 @@ public:
 
     QStringList actionNames() const
     {
-        return QStringList() << PressAction;
+        return QStringList(pressAction());
     }
 
     void doAction(const QString &actionName)
     {
-        if (actionName == PressAction)
+        if (actionName == pressAction())
             m_parent->setCurrentIndex(m_index);
     }
 
@@ -1726,19 +1726,19 @@ QString QAccessibleComboBox::text(Text t, int) const
 
 QStringList QAccessibleComboBox::actionNames() const
 {
-    return QStringList() << ShowMenuAction;
+    return QStringList(showMenuAction());
 }
 
 QString QAccessibleComboBox::localizedActionDescription(const QString &actionName) const
 {
-    if (actionName == ShowMenuAction)
+    if (actionName == showMenuAction())
         return QComboBox::tr("Open the combo box selection popup");
     return QString();
 }
 
 void QAccessibleComboBox::doAction(const QString &actionName)
 {
-    if (actionName == ShowMenuAction) {
+    if (actionName == showMenuAction()) {
         if (comboBox()->view()->isVisible()) {
             comboBox()->hidePopup();
         } else {
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();
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index d2c5256b19..f518fa9241 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -166,23 +166,23 @@ QStringList QAccessibleButton::actionNames() const
     if (widget()->isEnabled()) {
         switch (role()) {
         case ButtonMenu:
-            names << ShowMenuAction;
+            names << showMenuAction();
             break;
         case RadioButton:
-            names << CheckAction;
+            names << checkAction();
             break;
         default:
             if (button()->isCheckable()) {
                 if (state() & Checked) {
-                    names <<  UncheckAction;
+                    names <<  uncheckAction();
                 } else {
                     // FIXME
     //                QCheckBox *cb = qobject_cast<QCheckBox*>(object());
     //                if (!cb || !cb->isTristate() || cb->checkState() == Qt::PartiallyChecked)
-                    names <<  CheckAction;
+                    names <<  checkAction();
                 }
             } else {
-                names << PressAction;
+                names << pressAction();
             }
             break;
         }
@@ -195,8 +195,8 @@ void QAccessibleButton::doAction(const QString &actionName)
 {
     if (!widget()->isEnabled())
         return;
-    if (actionName == PressAction ||
-        actionName == ShowMenuAction) {
+    if (actionName == pressAction() ||
+        actionName == showMenuAction()) {
 #ifndef QT_NO_MENU
         QPushButton *pb = qobject_cast<QPushButton*>(object());
         if (pb && pb->menu())
@@ -204,9 +204,9 @@ void QAccessibleButton::doAction(const QString &actionName)
         else
 #endif
             button()->animateClick();
-    } else if (actionName == CheckAction) {
+    } else if (actionName == checkAction()) {
         button()->setChecked(true);
-    } else if (actionName == UncheckAction) {
+    } else if (actionName == uncheckAction()) {
         button()->setChecked(false);
     } else {
         QAccessibleWidget::doAction(actionName);
@@ -215,7 +215,7 @@ void QAccessibleButton::doAction(const QString &actionName)
 
 QStringList QAccessibleButton::keyBindingsForAction(const QString &actionName) const
 {
-    if (actionName == PressAction) {
+    if (actionName == pressAction()) {
 #ifndef QT_NO_SHORTCUT
         return QStringList() << button()->shortcut().toString();
 #endif
@@ -333,7 +333,7 @@ QStringList QAccessibleToolButton::actionNames() const
     QStringList names;
     if (widget()->isEnabled()) {
         if (toolButton()->menu())
-            names << ShowMenuAction;
+            names << showMenuAction();
         if (toolButton()->popupMode() != QToolButton::InstantPopup)
             names << QAccessibleButton::actionNames();
     }
@@ -345,9 +345,9 @@ void QAccessibleToolButton::doAction(const QString &actionName)
     if (!widget()->isEnabled())
         return;
 
-    if (actionName == PressAction) {
+    if (actionName == pressAction()) {
         button()->click();
-    } else if (actionName == ShowMenuAction) {
+    } else if (actionName == showMenuAction()) {
         if (toolButton()->popupMode() != QToolButton::InstantPopup) {
             toolButton()->setDown(true);
 #ifndef QT_NO_MENU
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index b4613a6eb8..76f96d68ba 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -824,7 +824,7 @@ QStringList QAccessibleWidget::actionNames() const
     QStringList names;
     if (widget()->isEnabled()) {
         if (widget()->focusPolicy() != Qt::NoFocus)
-            names << SetFocusAction;
+            names << setFocusAction();
     }
     return names;
 }
@@ -834,7 +834,7 @@ void QAccessibleWidget::doAction(const QString &actionName)
     if (!widget()->isEnabled())
         return;
 
-    if (actionName == SetFocusAction) {
+    if (actionName == setFocusAction()) {
         if (widget()->isWindow())
             widget()->activateWindow();
         widget()->setFocus();