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

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 #include <iostream>
 static QString m_defaultExtensions;
-static void printErr(const QString & out)
-{
-qWarning("%s", qPrintable(out));
-}
 static void printOut(const QString & out)
 {
 std::cerr << qPrintable(out);
 }
+class LU {
+Q_DECLARE_TR_FUNCTIONS(LUpdate)
+};
 static void recursiveFileInfoList(const QDir &dir,
 const QSet<QString> &nameFilters, QDir::Filters filter,
 QFileInfoList *fileinfolist)
 {
 ConversionData cd;
 Translator tor;
 cd.m_sortContexts = !(options & NoSort);
 if (QFile(fileName).exists()) {
 if (!tor.load(fileName, cd, QLatin1String("auto"))) {
-printErr(cd.error());
+printOut(cd.error());
 *fail = true;
 continue;
 }
 tor.resolveDuplicates();
 cd.clearErrors();
 if (setCodec && fetchedTor.codec() != tor.codec())
-qWarning("lupdate warning: Codec for tr() '%s' disagrees with "
+printOut(LU::tr("lupdate warning: Codec for tr() '%1' disagrees with"
-"existing file's codec '%s'. Expect trouble.",
+" existing file's codec '%2'. Expect trouble.\n")
-fetchedTor.codecName().constData(), tor.codecName().constData());
+.arg(QString::fromLatin1(fetchedTor.codecName()),
+QString::fromLatin1(tor.codecName())));
 if (!targetLanguage.isEmpty() && targetLanguage != tor.languageCode())
-qWarning("lupdate warning: Specified target language '%s' disagrees with "
+printOut(LU::tr("lupdate warning: Specified target language '%1' disagrees with"
-"existing file's language '%s'. Ignoring.",
+" existing file's language '%2'. Ignoring.\n")
-qPrintable(targetLanguage), qPrintable(tor.languageCode()));
+.arg(targetLanguage, tor.languageCode()));
 if (!sourceLanguage.isEmpty() && sourceLanguage != tor.sourceLanguageCode())
-qWarning("lupdate warning: Specified source language '%s' disagrees with "
+printOut(LU::tr("lupdate warning: Specified source language '%1' disagrees with"
-"existing file's language '%s'. Ignoring.",
+" existing file's language '%2'. Ignoring.\n")
-qPrintable(sourceLanguage), qPrintable(tor.sourceLanguageCode()));
+.arg(sourceLanguage, tor.sourceLanguageCode()));
 } else {
 if (setCodec)
 tor.setCodec(fetchedTor.codec());
 if (!targetLanguage.isEmpty())
 tor.setLanguageCode(targetLanguage);
 out.stripObsoleteMessages();
 out.stripEmptyContexts();
 out.normalizeTranslations(cd);
 if (!cd.errors().isEmpty()) {
-printErr(cd.error());
+printOut(cd.error());
 cd.clearErrors();
 }
 if (!out.save(fileName, cd, QLatin1String("auto"))) {
-printErr(cd.error());
+printOut(cd.error());
 *fail = true;
 }
 }
 }
 QByteArray codecForSource = _codecForSource;
 QStringList tmp = visitor.values(QLatin1String("CODECFORSRC"));
 if (!tmp.isEmpty()) {
 codecForSource = tmp.last().toLatin1();
 if (!QTextCodec::codecForName(codecForSource)) {
-qWarning("lupdate warning: Codec for source '%s' is invalid. "
+printOut(LU::tr("lupdate warning: Codec for source '%1' is invalid."
-"Falling back to codec for tr().", codecForSource.constData());
+" Falling back to codec for tr().\n")
+.arg(QString::fromLatin1(codecForSource)));
 codecForSource.clear();
 }
 }
 if (visitor.templateType() == ProFileEvaluator::TT_Subdirs) {
 QStringList subProFiles;
 options &= ~Verbose;
 continue;
 } else if (arg == QLatin1String("-target-language")) {
 ++i;
 if (i == argc) {
-qWarning("The option -target-language requires a parameter.");
+printOut(LU::tr("The option -target-language requires a parameter.\n"));
 return 1;
 }
 targetLanguage = args[i];
 continue;
 } else if (arg == QLatin1String("-source-language")) {
 ++i;
 if (i == argc) {
-qWarning("The option -source-language requires a parameter.");
+printOut(LU::tr("The option -source-language requires a parameter.\n"));
 return 1;
 }
 sourceLanguage = args[i];
 continue;
 } else if (arg == QLatin1String("-disable-heuristic")) {
 ++i;
 if (i == argc) {
-qWarning("The option -disable-heuristic requires a parameter.");
+printOut(LU::tr("The option -disable-heuristic requires a parameter.\n"));
 return 1;
 }
 arg = args[i];
 if (arg == QLatin1String("sametext")) {
 options &= ~HeuristicSameText;
 } else if (arg == QLatin1String("similartext")) {
 options &= ~HeuristicSimilarText;
 } else if (arg == QLatin1String("number")) {
 options &= ~HeuristicNumber;
 } else {
-qWarning("Invalid heuristic name passed to -disable-heuristic.");
+printOut(LU::tr("Invalid heuristic name passed to -disable-heuristic.\n"));
 return 1;
 }
 continue;
 } else if (arg == QLatin1String("-locations")) {
 ++i;
 if (i == argc) {
-qWarning("The option -locations requires a parameter.");
+printOut(LU::tr("The option -locations requires a parameter.\n"));
 return 1;
 }
 if (args[i] == QLatin1String("none")) {
 options |= NoLocations;
 } else if (args[i] == QLatin1String("relative")) {
 options |= RelativeLocations;
 } else if (args[i] == QLatin1String("absolute")) {
 options |= AbsoluteLocations;
 } else {
-qWarning("Invalid parameter passed to -locations.");
+printOut(LU::tr("Invalid parameter passed to -locations.\n"));
 return 1;
 }
 continue;
 } else if (arg == QLatin1String("-no-ui-lines")) {
 options |= NoUiLines;
 printOut(QObject::tr("lupdate version %1\n").arg(QLatin1String(QT_VERSION_STR)));
 return 0;
 } else if (arg == QLatin1String("-codecfortr")) {
 ++i;
 if (i == argc) {
-qWarning("The -codecfortr option should be followed by a codec name.");
+printOut(LU::tr("The -codecfortr option should be followed by a codec name.\n"));
 return 1;
 }
 codecForTr = args[i].toLatin1();
 continue;
 } else if (arg == QLatin1String("-ts")) {
 metTsFlag = true;
 continue;
 } else if (arg == QLatin1String("-extensions")) {
 ++i;
 if (i == argc) {
-qWarning("The -extensions option should be followed by an extension list.");
+printOut(LU::tr("The -extensions option should be followed by an extension list.\n"));
 return 1;
 }
 extensions = args[i];
 continue;
 } else if (arg == QLatin1String("-pro")) {
 ++i;
 if (i == argc) {
-qWarning("The -pro option should be followed by a filename of .pro file.");
+printOut(LU::tr("The -pro option should be followed by a filename of .pro file.\n"));
 return 1;
 }
 proFiles += args[i];
 numFiles++;
 continue;
 } else if (arg.startsWith(QLatin1String("-I"))) {
 if (arg.length() == 2) {
 ++i;
 if (i == argc) {
-qWarning("The -I option should be followed by a path.");
+printOut(LU::tr("The -I option should be followed by a path.\n"));
 return 1;
 }
 includePath += args[i];
 } else {
 includePath += args[i].mid(2);
 }
 continue;
 } else if (arg.startsWith(QLatin1String("-")) && arg != QLatin1String("-")) {
-qWarning("Unrecognized option '%s'", qPrintable(arg));
+printOut(LU::tr("Unrecognized option '%1'.\n").arg(arg));
 return 1;
 }
 QStringList files;
 if (arg.startsWith(QLatin1String("@"))) {
 QFile lstFile(arg.mid(1));
 if (!lstFile.open(QIODevice::ReadOnly)) {
-qWarning("lupdate error: List file '%s' is not readable",
+printOut(LU::tr("lupdate error: List file '%1' is not readable.\n")
-qPrintable(lstFile.fileName()));
+.arg(lstFile.fileName()));
 return 1;
 }
 while (!lstFile.atEnd())
 files << QString::fromLocal8Bit(lstFile.readLine().trimmed());
 } else {
 if (file.endsWith(QLatin1Char('.') + fmt.extension, Qt::CaseInsensitive)) {
 QFileInfo fi(file);
 if (!fi.exists() || fi.isWritable()) {
 tsFileNames.append(QFileInfo(file).absoluteFilePath());
 } else {
-qWarning("lupdate warning: For some reason, '%s' is not writable.\n",
+printOut(LU::tr("lupdate warning: For some reason, '%1' is not writable.\n")
-qPrintable(file));
+.arg(file));
 }
 found = true;
 break;
 }
 }
 if (!found) {
-qWarning("lupdate error: File '%s' has no recognized extension\n",
+printOut(LU::tr("lupdate error: File '%1' has no recognized extension.\n")
-qPrintable(file));
+.arg(file));
 return 1;
 }
 }
 numFiles++;
 } else {
 foreach (const QString &file, files) {
 QFileInfo fi(file);
 if (!fi.exists()) {
-qWarning("lupdate error: File '%s' does not exists\n", qPrintable(file));
+printOut(LU::tr("lupdate error: File '%1' does not exist.\n").arg(file));
 return 1;
 }
 if (file.endsWith(QLatin1String(".pro"), Qt::CaseInsensitive)
 || file.endsWith(QLatin1String(".pri"), Qt::CaseInsensitive)) {
 proFiles << file;
 } else if (fi.isDir()) {
 if (options & Verbose)
-printOut(QObject::tr("Scanning directory '%1'...").arg(file));
+printOut(QObject::tr("Scanning directory '%1'...\n").arg(file));
 QDir dir = QDir(fi.filePath());
 projectRoots.insert(dir.absolutePath() + QLatin1Char('/'));
 if (extensionsNameFilters.isEmpty()) {
 foreach (QString ext, extensions.split(QLatin1Char(','))) {
 ext = ext.trimmed();
 } while (++depth < 3 && offset > scanRootLen);
 }
 }
 } else {
 sourceFiles << QDir::cleanPath(fi.absoluteFilePath());;
+projectRoots.insert(fi.absolutePath() + QLatin1Char('/'));
 }
 }
 numFiles++;
 }
 } // for args
 printUsage();
 return 1;
 }
 if (!targetLanguage.isEmpty() && tsFileNames.count() != 1)
-std::cerr << "lupdate warning: -target-language usually only "
+printOut(LU::tr("lupdate warning: -target-language usually only"
-"makes sense with exactly one TS file.\n";
+" makes sense with exactly one TS file.\n"));
 if (!codecForTr.isEmpty() && tsFileNames.isEmpty())
-std::cerr << "lupdate warning: -codecfortr has no effect without -ts.\n";
+printOut(LU::tr("lupdate warning: -codecfortr has no effect without -ts.\n"));
 bool fail = false;
 if (proFiles.isEmpty()) {
 if (tsFileNames.isEmpty())
-std::cerr << "lupdate warning: no TS files specified. "
+printOut(LU::tr("lupdate warning:"
-"Only diagnostics will be produced.\n";
+" no TS files specified. Only diagnostics will be produced.\n"));
 Translator fetchedTor;
 ConversionData cd;
 cd.m_noUiLines = options & NoUiLines;
 cd.m_projectRoots = projectRoots;
 processSources(fetchedTor, sourceFiles, cd);
 updateTsFiles(fetchedTor, tsFileNames, !codecForTr.isEmpty(),
 sourceLanguage, targetLanguage, options, &fail);
 } else {
 if (!sourceFiles.isEmpty() || !includePath.isEmpty()) {
-qWarning("lupdate error: Both project and source files / include paths specified.\n");
+printOut(LU::tr("lupdate error:"
+" Both project and source files / include paths specified.\n"));
 return 1;
 }
 if (!tsFileNames.isEmpty()) {
 Translator fetchedTor;
 fetchedTor.setCodecName(codecForTr);

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613