From 60b86257b811c3667297ab42e8eef7e0162b98a3 Mon Sep 17 00:00:00 2001 From: Jan-Arve Saether Date: Fri, 21 Oct 2011 09:10:43 +0200 Subject: [PATCH] Expand QT_TR_NOOP("str") to "str", not ("str"). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This enables us to write code like : QStringLiteral(QT_TR_NOOP("Press")) or just: QT_UNICODE_LITERAL(QT_TR_NOOP("Press")) It also makes it consistent with the QT_TRANSLATE_NOOP3, QT_TRANSLATE_NOOP3_UTF8 and QT_TRID_NOOP macros, as they don't surround the string literals with parenthesis. Change-Id: I67c30bcd88609f897bd22afb44266affa4dcfc8f Reviewed-by: Jan-Arve Sæther --- src/corelib/global/qglobal.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index ee601859b7c..29025d0e56e 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2437,10 +2437,10 @@ template static inline typename Wrapper::pointer qGetPtrHelpe #define Q_D(Class) Class##Private * const d = d_func() #define Q_Q(Class) Class * const q = q_func() -#define QT_TR_NOOP(x) (x) -#define QT_TR_NOOP_UTF8(x) (x) -#define QT_TRANSLATE_NOOP(scope, x) (x) -#define QT_TRANSLATE_NOOP_UTF8(scope, x) (x) +#define QT_TR_NOOP(x) x +#define QT_TR_NOOP_UTF8(x) x +#define QT_TRANSLATE_NOOP(scope, x) x +#define QT_TRANSLATE_NOOP_UTF8(scope, x) x #define QT_TRANSLATE_NOOP3(scope, x, comment) {x, comment} #define QT_TRANSLATE_NOOP3_UTF8(scope, x, comment) {x, comment}