diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-01 14:36:20 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-03 20:07:04 +0100 |
| commit | 7d7b2d4218e048bb599e16b11a3a0625222c6dd9 (patch) | |
| tree | e60800025ce546b6fb7700d211e784b3ed67e24a /src/plugins/accessible/widgets/complexwidgets.cpp | |
| parent | d2f1c6cd750e0977f5773dd784438a428ce42f33 (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/complexwidgets.cpp')
| -rw-r--r-- | src/plugins/accessible/widgets/complexwidgets.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp index a94163c1176..f26637bd17e 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 { |