qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Friedemann Kleint 2013-02-04 16:43:23 +01:00 committed by The Qt Project
parent 06fad3e877
commit c0ec84946d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qml/qml/qqmlrewrite.cpp
View File

@ -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)