Changeset 561 for trunk/tools/linguist/lrelease/main.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/linguist/lrelease/main.cpp (modified) (14 diffs)

trunk/tools/linguist/lrelease/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Linguist of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -41 +41 @@
 
 #include "translator.h"
-#include "translatortools.h"
-#include "profileevaluator.h"
-
+#include ".h"
+
+#ifndef QT_BOOTSTRAPPED
 #include <QtCore/QCoreApplication>
+
+
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
@@ -53 +55 @@
 #include <QtCore/QStringList>
 #include <QtCore/QTextStream>
-#include <QtCore/QTranslator>
+
+QT_USE_NAMESPACE
+
+#ifdef QT_BOOTSTRAPPED
+static void initBinaryDir(
+#ifndef Q_OS_WIN
+        const char *argv0
+#endif
+        );
+#endif
 
 static void printOut(const QString & out)
@@ -68 +79 @@
         "    lrelease [options] ts-files [-qm qm-file]\n\n"
         "lrelease is part of Qt's Linguist tool chain. It can be used as a\n"
-        "stand-alone tool to convert XML based translations files in the .ts\n"
-        "format into the 'compiled' .qm format used by QTranslator objects.\n\n"
+        "stand-alone tool to convert XML\n"
+        "format into the 'compiled'  format used by QTranslator objects.\n\n"
         "Options:\n"
         "    -help  Display this information and exit\n"
+
+
         "    -compress\n"
-        "           Compress the .qm files\n"
+        "           Compress the  files\n"
         "    -nounfinished\n"
         "           Do not include unfinished translations\n"
@@ -79 +92 @@
         "           If the translated text is the same as\n"
         "           the source text, do not include the message\n"
+
+
+
         "    -silent\n"
-        "           Don't explain what is being done\n"
+        "           Dot explain what is being done\n"
         "    -version\n"
         "           Display the version of lrelease and exit\n"
@@ -100 +116 @@
 
 static bool releaseTranslator(Translator &tor, const QString &qmFileName,
-    bool verbose, bool ignoreUnfinished,
-    bool removeIdentical, TranslatorSaveMode mode)
-{
-    Translator::reportDuplicates(tor.resolveDuplicates(), qmFileName, verbose);
-
-    if (verbose)
+    ConversionData &cd, bool removeIdentical)
+{
+    tor.reportDuplicates(tor.resolveDuplicates(), qmFileName, cd.isVerbose());
+
+    if (cd.isVerbose())
         printOut(QCoreApplication::tr( "Updating '%1'...\n").arg(qmFileName));
     if (removeIdentical) {
-        if ( verbose )
+        if ()
             printOut(QCoreApplication::tr( "Removing translations equal to source text in '%1'...\n").arg(qmFileName));
         tor.stripIdenticalSourceTranslations();
@@ -120 +135 @@
     }
 
-    ConversionData cd;
-    cd.m_verbose = verbose;
-    cd.m_ignoreUnfinished = ignoreUnfinished;
-    cd.m_saveMode = mode;
+    tor.normalizeTranslations(cd);
     bool ok = tor.release(&file, cd);
     file.close();
@@ -137 +149 @@
 }
 
-static bool releaseTsFile(const QString& tsFileName, bool verbose,
-    bool ignoreUnfinished, bool removeIdentical, TranslatorSaveMode mode)
+static bool releaseTsFile(const QString& tsFileName,
+    )
 {
     Translator tor;
-    if (!loadTsFile(tor, tsFileName, verbose))
+    if (!loadTsFile(tor, tsFileName, ))
         return false;
 
@@ -153 +165 @@
     qmFileName += QLatin1String(".qm");
 
-    return releaseTranslator(tor, qmFileName, verbose, ignoreUnfinished, removeIdentical, mode);
+    return releaseTranslator(tor, qmFileName, );
 }
 
 int main(int argc, char **argv)
 {
+
+
+
+
+
+
+
     QCoreApplication app(argc, argv);
-    QStringList args = app.arguments();
     QTranslator translator;
     if (translator.load(QLatin1String("lrelease_") + QLocale::system().name()))
         app.installTranslator(&translator);
-
-    bool verbose = true; // the default is true starting with Qt 4.2
-    bool ignoreUnfinished = false;
-    // the default mode is SaveEverything starting with Qt 4.2
-    TranslatorSaveMode mode = SaveEverything;
+#endif
+
+    ConversionData cd;
+    cd.m_verbose = true; // the default is true starting with Qt 4.2
     bool removeIdentical = false;
     Translator tor;
+
     QString outputFile;
-    int numFiles = 0;
 
     for (int i = 1; i < argc; ++i) {
-        if (args[i] == QLatin1String("-compress")) {
-            mode = SaveStripped;
-            continue;
-        } else if (args[i] == QLatin1String("-nocompress")) {
-            mode = SaveEverything;
-            continue;
-        } else if (args[i] == QLatin1String("-removeidentical")) {
+        if (!strcmp(argv[i], "-compress")) {
+            cd.m_saveMode = SaveStripped;
+            continue;
+        } else if (!strcmp(argv[i], "-idbased")) {
+            cd.m_idBased = true;
+            continue;
+        } else if (!strcmp(argv[i], "-nocompress")) {
+            cd.m_saveMode = SaveEverything;
+            continue;
+        } else if (!strcmp(argv[i], "-removeidentical")) {
             removeIdentical = true;
             continue;
-        } else if (args[i] == QLatin1String("-nounfinished")) {
-            ignoreUnfinished = true;
-            continue;
-        } else if (args[i] == QLatin1String("-silent")) {
-            verbose = false;
-            continue;
-        } else if (args[i] == QLatin1String("-verbose")) {
-            verbose = true;
-            continue;
-        } else if (args[i] == QLatin1String("-version")) {
-            printOut(QCoreApplication::tr( "lrelease version %1\n").arg(QLatin1String(QT_VERSION_STR)) );
-            return 0;
-        } else if (args[i] == QLatin1String("-qm")) {
+        } else if (!strcmp(argv[i], "-nounfinished")) {
+            cd.m_ignoreUnfinished = true;
+            continue;
+        } else if (!strcmp(argv[i], "-markuntranslated")) {
             if (i == argc - 1) {
                 printUsage();
                 return 1;
             }
-            i++;
-            outputFile = args[i];
-        } else if (args[i] == QLatin1String("-help")) {
+            cd.m_unTrPrefix = QString::fromLocal8Bit(argv[++i]);
+        } else if (!strcmp(argv[i], "-silent")) {
+            cd.m_verbose = false;
+            continue;
+        } else if (!strcmp(argv[i], "-verbose")) {
+            cd.m_verbose = true;
+            continue;
+        } else if (!strcmp(argv[i], "-version")) {
+            printOut(QCoreApplication::tr( "lrelease version %1\n").arg(QLatin1String(QT_VERSION_STR)) );
+            return 0;
+        } else if (!strcmp(argv[i], "-qm")) {
+            if (i == argc - 1) {
+                printUsage();
+                return 1;
+            }
+            outputFile = QString::fromLocal8Bit(argv[++i]);
+        } else if (!strcmp(argv[i], "-help")) {
             printUsage();
             return 0;
-        } else if (args[i][0] == QLatin1Char('-')) {
+        } else if (arg) {
             printUsage();
             return 1;
         } else {
-            numFiles++;
+            ;
         }
     }
 
-    if (numFiles == 0) {
+    if () {
         printUsage();
         return 1;
     }
 
-    for (int i = 1; i < argc; ++i) {
-        if (args[i][0] == QLatin1Char('-') || args[i] == outputFile)
-            continue;
-
-        if (args[i].endsWith(QLatin1String(".pro"), Qt::CaseInsensitive)
-            || args[i].endsWith(QLatin1String(".pri"), Qt::CaseInsensitive)) {
+    foreach (const QString &inputFile, inputFiles) {
+        if (inputFile.endsWith(QLatin1String(".pro"), Qt::CaseInsensitive)
+            || inputFile.endsWith(QLatin1String(".pri"), Qt::CaseInsensitive)) {
             QHash<QByteArray, QStringList> varMap;
-            bool ok = evaluateProFile(args[i], verbose, &varMap );
+            bool ok = evaluateProFile();
             if (ok) {
                 QStringList translations = varMap.value("TRANSLATIONS");
@@ -231 +253 @@
                     qWarning("lrelease warning: Met no 'TRANSLATIONS' entry in"
                              " project file '%s'\n",
-                             qPrintable(args[i]));
+                             qPrintable());
                 } else {
                     foreach (const QString &trans, translations)
-                        if (!releaseTsFile(trans, verbose, ignoreUnfinished, removeIdentical, mode))
+                        if (!releaseTsFile(trans, ))
                             return 1;
                 }
             } else {
                 qWarning("error: lrelease encountered project file functionality that is currently not supported.\n"
-                    "You might want to consider using .ts files as input instead of a project file.\n"
+                    "You might want to consider using  files as input instead of a project file.\n"
                     "Try the following syntax:\n"
                     "    lrelease [options] ts-files [-qm qm-file]\n");
@@ -245 +267 @@
         } else {
             if (outputFile.isEmpty()) {
-                if (!releaseTsFile(args[i], verbose, ignoreUnfinished, removeIdentical, mode))
+                if (!releaseTsFile())
                     return 1;
             } else {
-                if (!loadTsFile(tor, args[i], verbose))
+                if (!loadTsFile(tor, ))
                     return 1;
             }
@@ -255 +277 @@
 
     if (!outputFile.isEmpty())
-        return releaseTranslator(tor, outputFile, verbose, ignoreUnfinished,
-                                 removeIdentical, mode) ? 0 : 1;
+        return releaseTranslator(tor, outputFile, cd, removeIdentical) ? 0 : 1;
 
     return 0;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+