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 | |
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')
-rw-r--r-- | src/plugins/accessible/widgets/complexwidgets.cpp | 10 | ||||
-rw-r--r-- | src/plugins/accessible/widgets/qaccessiblemenu.cpp | 8 | ||||
-rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.cpp | 26 |
3 files changed, 22 insertions, 22 deletions
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 |