From 7d7b2d4218e048bb599e16b11a3a0625222c6dd9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 1 Nov 2011 14:36:20 +0100 Subject: QtGui: Fix compilation with gcc 4.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 Change-Id: Iabbee8ef61a5d7bfd35978a3f1cce1866329d065 Reviewed-by: Jan-Arve Sæther --- src/gui/accessible/qaccessible2.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/accessible/qaccessible2.h') 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 -- cgit v1.2.3