FCL/sf/mw/qt: comparison tools/linguist/lupdate/cpp.cpp

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 #include <QtCore/QFileInfo>
 #include <QtCore/QStack>
 #include <QtCore/QString>
 #include <QtCore/QTextCodec>
 #include <QtCore/QTextStream>
+#include <QtCore/QCoreApplication>
 #include <iostream>
 #include <ctype.h>              // for isXXX()
 QT_BEGIN_NAMESPACE
+class LU {
+Q_DECLARE_TR_FUNCTIONS(LUpdate)
+};
 /* qmake ignore Q_OBJECT */
 static QString MagicComment(QLatin1String("TRANSLATOR"));
 if (is.elseLine != -1) {
 if (yyBracketDepth != is.bracketDepth1st
 || yyBraceDepth != is.braceDepth1st
 || yyParenDepth != is.parenDepth1st)
 yyMsg(is.elseLine)
-<< "Parenthesis/bracket/brace mismatch between "
+<< qPrintable(LU::tr("Parenthesis/bracket/brace mismatch between "
-"#if and #else branches; using #if branch\n";
+"#if and #else branches; using #if branch\n"));
 } else {
 is.bracketDepth1st = yyBracketDepth;
 is.braceDepth1st = yyBraceDepth;
 is.parenDepth1st = yyParenDepth;
 saveState(&is.state);
 if (is.elseLine != -1) {
 if (yyBracketDepth != is.bracketDepth1st
 || yyBraceDepth != is.braceDepth1st
 || yyParenDepth != is.parenDepth1st)
 yyMsg(is.elseLine)
-<< "Parenthesis/brace mismatch between "
+<< qPrintable(LU::tr("Parenthesis/brace mismatch between "
-"#if and #else branches; using #if branch\n";
+"#if and #else branches; using #if branch\n"));
 yyBracketDepth = is.bracketDepth1st;
 yyBraceDepth = is.braceDepth1st;
 yyParenDepth = is.parenDepth1st;
 loadState(&is.state);
 }
 bool metAster = false;
 forever {
 yyCh = getChar();
 if (yyCh == EOF) {
-yyMsg() << "Unterminated C++ comment\n";
+yyMsg() << qPrintable(LU::tr("Unterminated C++ comment\n"));
 break;
 }
 if (yyCh == '*') {
 metAster = true;
 ushort *ptr = (ushort *)yyWord.unicode() + yyWord.length();
 forever {
 yyCh = getChar();
 if (yyCh == EOF) {
-yyMsg() << "Unterminated C++ comment\n";
+yyMsg() << qPrintable(LU::tr("Unterminated C++ comment\n"));
 break;
 }
 *ptr++ = yyCh;
 if (yyCh == '*')
 yyCh = getChar();
 }
 yyWord.resize(ptr - (ushort *)yyWord.unicode());
 if (yyCh != '"')
-yyMsg() << "Unterminated C++ string\n";
+yyMsg() << qPrintable(LU::tr("Unterminated C++ string\n"));
 else
 yyCh = getChar();
 return Tok_String;
 }
 case '-':
 return Tok_LeftBrace;
 case '}':
 if (yyBraceDepth == yyMinBraceDepth) {
 if (!inDefine)
 yyMsg(yyCurLineNo)
-<< "Excess closing brace in C++ code"
+<< qPrintable(LU::tr("Excess closing brace in C++ code"
-" (or abuse of the C++ preprocessor)\n";
+" (or abuse of the C++ preprocessor)\n"));
 // Avoid things getting messed up even more
 yyCh = getChar();
 return Tok_Semicolon;
 }
 yyBraceDepth--;
 yyCh = getChar();
 return Tok_LeftParen;
 case ')':
 if (yyParenDepth == 0)
 yyMsg(yyCurLineNo)
-<< "Excess closing parenthesis in C++ code"
+<< qPrintable(LU::tr("Excess closing parenthesis in C++ code"
-" (or abuse of the C++ preprocessor)\n";
+" (or abuse of the C++ preprocessor)\n"));
 else
 yyParenDepth--;
 yyCh = getChar();
 return Tok_RightParen;
 case '[':
 yyCh = getChar();
 return Tok_LeftBracket;
 case ']':
 if (yyBracketDepth == 0)
 yyMsg(yyCurLineNo)
-<< "Excess closing bracket in C++ code"
+<< qPrintable(LU::tr("Excess closing bracket in C++ code"
-" (or abuse of the C++ preprocessor)\n";
+" (or abuse of the C++ preprocessor)\n"));
 else
 yyBracketDepth--;
 yyCh = getChar();
 return Tok_RightBracket;
 case ',':
 QSet<QString> &inclusions)
 {
 QString cleanFile = QDir::cleanPath(file);
 if (inclusions.contains(cleanFile)) {
-yyMsg() << "circular inclusion of " << qPrintable(cleanFile) << std::endl;
+yyMsg() << qPrintable(LU::tr("circular inclusion of %1\n").arg(cleanFile));
 return;
 }
 // If the #include is in any kind of namespace, has been blacklisted previously,
 // or is not a header file (stdc++ extensionless or *.h*), then really include
 isIndirect = true;
 }
 QFile f(cleanFile);
 if (!f.open(QIODevice::ReadOnly)) {
-yyMsg()
+yyMsg() << qPrintable(LU::tr("Cannot open %1: %2\n").arg(cleanFile, f.errorString()));
-<< "Cannot open " << qPrintable(cleanFile) << ": "
-<< qPrintable(f.errorString()) << std::endl;
 return;
 }
 QTextStream ts(&f);
 ts.setCodec(yySourceCodec);
 case Tok_tr:
 case Tok_trUtf8:
 if (!tor)
 goto case_default;
 if (!sourcetext.isEmpty())
-yyMsg() << "//% cannot be used with tr() / QT_TR_NOOP(). Ignoring\n";
+yyMsg() << qPrintable(LU::tr("//% cannot be used with tr() / QT_TR_NOOP(). Ignoring\n"));
 utf8 = (yyTok == Tok_trUtf8);
 line = yyLineNo;
 yyTok = getToken();
 if (match(Tok_LeftParen) && matchString(&text) && !text.isEmpty()) {
 comment.clear();
 }
 if (!pendingContext.isEmpty() && !prefix.startsWith(strColons)) {
 QStringList unresolved;
 if (!fullyQualify(namespaces, pendingContext, true, &functionContext, &unresolved)) {
 functionContextUnresolved = unresolved.join(strColons);
-yyMsg() << "Qualifying with unknown namespace/class "
+yyMsg() << qPrintable(LU::tr("Qualifying with unknown namespace/class %1::%2\n")
-<< qPrintable(stringifyNamespace(functionContext)) << "::"
+.arg(stringifyNamespace(functionContext)).arg(unresolved.first()));
-<< qPrintable(unresolved.first()) << std::endl;
 }
 pendingContext.clear();
 }
 if (prefix.isEmpty()) {
 if (functionContextUnresolved.isEmpty()) {
 int idx = functionContext.length();
 if (idx < 2) {
-yyMsg() << "tr() cannot be called without context\n";
+yyMsg() << qPrintable(LU::tr("tr() cannot be called without context\n"));
 break;
 }
 Namespace *fctx;
 while (!(fctx = findNamespace(functionContext, idx)->classDef)->hasTrFunctions) {
 if (idx == 1) {
 context = stringifyNamespace(functionContext);
 fctx = findNamespace(functionContext)->classDef;
 if (!fctx->complained) {
-yyMsg() << "Class '" << qPrintable(context)
+yyMsg() << qPrintable(LU::tr("Class '%1' lacks Q_OBJECT macro\n")
-<< "' lacks Q_OBJECT macro\n";
+.arg(context));
 fctx->complained = true;
 }
 goto gotctx;
 }
 --idx;
 } else {
 #ifdef DIAGNOSE_RETRANSLATABILITY
 int last = prefix.lastIndexOf(strColons);
 QString className = prefix.mid(last == -1 ? 0 : last + 2);
 if (!className.isEmpty() && className == functionName) {
-yyMsg() << "It is not recommended to call tr() from within a constructor '"
+yyMsg() << qPrintable(LU::tr("It is not recommended to call tr() from within a constructor '%1::%2'\n")
-<< qPrintable(className) << "::" << qPrintable(functionName) << "'\n";
+.arg(className).arg(functionName));
 }
 #endif
 prefix.chop(2);
 NamespaceList nsl;
 QStringList unresolved;
 fctx->trQualification = context;
 } else {
 context = fctx->trQualification;
 }
 if (!fctx->hasTrFunctions && !fctx->complained) {
-yyMsg() << "Class '" << qPrintable(context) << "' lacks Q_OBJECT macro\n";
+yyMsg() << qPrintable(LU::tr("Class '%1' lacks Q_OBJECT macro\n").arg(context));
 fctx->complained = true;
 }
 } else {
 context = (stringListifyNamespace(nsl) + unresolved).join(strColons);
 }
 case Tok_translateUtf8:
 case Tok_translate:
 if (!tor)
 goto case_default;
 if (!sourcetext.isEmpty())
-yyMsg() << "//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring\n";
+yyMsg() << qPrintable(LU::tr("//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring\n"));
 utf8 = (yyTok == Tok_translateUtf8);
 line = yyLineNo;
 yyTok = getToken();
 if (match(Tok_LeftParen)
 && matchString(&context)
 break;
 case Tok_trid:
 if (!tor)
 goto case_default;
 if (!msgid.isEmpty())
-yyMsg() << "//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring\n";
+yyMsg() << qPrintable(LU::tr("//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring\n"));
 //utf8 = false; // Maybe use //%% or something like that
 line = yyLineNo;
 yyTok = getToken();
 if (match(Tok_LeftParen) && matchString(&msgid) && !msgid.isEmpty()) {
 bool plural = match(Tok_Comma);
 break;
 c = yyWord.unicode()[p++].unicode();
 if (isspace(c))
 continue;
 if (c != '"') {
-yyMsg() << "Unexpected character in meta string\n";
+yyMsg() << qPrintable(LU::tr("Unexpected character in meta string\n"));
 break;
 }
 forever {
 if (p >= yyWord.length()) {
 whoops:
-yyMsg() << "Unterminated meta string\n";
+yyMsg() << qPrintable(LU::tr("Unterminated meta string\n"));
 break;
 }
 c = yyWord.unicode()[p++].unicode();
 if (c == '"')
 break;
 break;
 }
 case Tok_Arrow:
 yyTok = getToken();
 if (yyTok == Tok_tr || yyTok == Tok_trUtf8)
-yyMsg() << "Cannot invoke tr() like this\n";
+yyMsg() << qPrintable(LU::tr("Cannot invoke tr() like this\n"));
 break;
 case Tok_ColonColon:
 if (yyBraceDepth == namespaceDepths.count() && yyParenDepth == 0 && !yyTokColonSeen)
 prospectiveContext = prefix;
 prefix += strColons;
 // fallthrough
 case Tok_Semicolon:
 prospectiveContext.clear();
 prefix.clear();
 if (!sourcetext.isEmpty() || !extracomment.isEmpty() || !msgid.isEmpty() || !extra.isEmpty()) {
-yyMsg() << "Discarding unconsumed meta data\n";
+yyMsg() << qPrintable(LU::tr("Discarding unconsumed meta data\n"));
 sourcetext.clear();
 extracomment.clear();
 msgid.clear();
 extra.clear();
 }
 }
 }
 if (yyBraceDepth != 0)
 yyMsg(yyBraceLineNo)
-<< "Unbalanced opening brace in C++ code"
+<< qPrintable(LU::tr("Unbalanced opening brace in C++ code"
-" (or abuse of the C++ preprocessor)\n";
+" (or abuse of the C++ preprocessor)\n"));
 else if (yyParenDepth != 0)
 yyMsg(yyParenLineNo)
-<< "Unbalanced opening parenthesis in C++ code"
+<< qPrintable(LU::tr("Unbalanced opening parenthesis in C++ code"
-" (or abuse of the C++ preprocessor)\n";
+" (or abuse of the C++ preprocessor)\n"));
 else if (yyBracketDepth != 0)
 yyMsg(yyBracketLineNo)
-<< "Unbalanced opening bracket in C++ code"
+<< qPrintable(LU::tr("Unbalanced opening bracket in C++ code"
-" (or abuse of the C++ preprocessor)\n";
+" (or abuse of the C++ preprocessor)\n"));
 }
 const ParseResults *CppParser::recordResults(bool isHeader)
 {
 if (tor) {
 if (CppFiles::getResults(filename) || CppFiles::isBlacklisted(filename))
 continue;
 QFile file(filename);
 if (!file.open(QIODevice::ReadOnly)) {
-cd.appendError(QString::fromLatin1("Cannot open %1: %2")
+cd.appendError(LU::tr("Cannot open %1: %2").arg(filename, file.errorString()));
-.arg(filename, file.errorString()));
 continue;
 }
 CppParser parser;
 QTextStream ts(&file);

changeset 37	758a864f9613
parent 33	3e2da88830cd