From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 4 Feb 2013 15:43:23 +0000 (+0100)
Subject: Fix lupdate-warning in qqmlrewrite.cpp.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=c0ec84946d13e4693160e859c947696e92ef615b;p=konrad%2Fqtdeclarative.git

Fix lupdate-warning in qqmlrewrite.cpp.

Class 'QQmlRewrite' lacks Q_OBJECT macro.

Replace global-static strings by message functions.

Change-Id: I67a6fbe67575533d3ce5750d72c9d7eff06e7efa
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
---

diff --git a/src/qml/qml/qqmlrewrite.cpp b/src/qml/qml/qqmlrewrite.cpp
index 0913a8c..0e28142 100644
--- a/src/qml/qml/qqmlrewrite.cpp
+++ b/src/qml/qml/qqmlrewrite.cpp
@@ -44,6 +44,7 @@
 #include <private/qqmlglobal_p.h>
 
 #include <QtCore/qdebug.h>
+#include <QtCore/qcoreapplication.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -513,8 +514,15 @@ bool RewriteSignalHandler::visit(AST::IdentifierExpression *e)
     return false;
 }
 
-static QString unnamed_error_string(QLatin1String(QT_TR_NOOP("Signal uses unnamed parameter followed by named parameter.")));
-static QString global_error_string(QLatin1String(QT_TR_NOOP("Signal parameter \"%1\" hides global variable.")));
+static inline QString msgUnnamedErrorString()
+{
+    return QCoreApplication::translate("QQmlRewrite", "Signal uses unnamed parameter followed by named parameter.");
+}
+
+static inline QString msgGlobalErrorString(const QString &p)
+{
+    return QCoreApplication::translate("QQmlRewrite", "Signal parameter \"%1\" hides global variable.").arg(p);
+}
 
 #define EXIT_ON_ERROR(error) \
 { \
@@ -543,9 +551,9 @@ QString RewriteSignalHandler::createParameterString(const QList<QHashedString> &
         if (param.isEmpty())
             unnamedParam = true;
         else if (unnamedParam)
-            EXIT_ON_ERROR(unnamed_error_string)
+            EXIT_ON_ERROR(msgUnnamedErrorString())
         else if (illegalNames.contains(param))
-            EXIT_ON_ERROR(global_error_string.arg(param))
+            EXIT_ON_ERROR(msgGlobalErrorString(param))
         ++_parameterCountForJS;
         parameters += param;
         if (i < parameterNameList.count()-1)