Changeset 561 for trunk/tools/linguist/shared/translator.h

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/shared/translator.h (modified) (14 diffs)

trunk/tools/linguist/shared/translator.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -48 +48 @@
 #include <QList>
 #include <QLocale>
+#include <QMultiHash>
 #include <QString>
+#include <QSet>
 
 
 QT_BEGIN_NAMESPACE
+
+#ifdef QT_BOOTSTRAPPED
+class QObject {
+public:
+    static QString tr(const char *sourceText, const char * = 0, int n = -1);
+};
+class QCoreApplication : public QObject {
+public:
+    enum Encoding { CodecForTr };
+    static QString translate(const char *, const char *sourceText, const char * = 0,
+                             Encoding = CodecForTr, int n = -1)
+        { return tr(sourceText, 0, n); }
+};
+#endif
 
 class QIODevice;
@@ -64 +80 @@
         m_sortContexts(false),
         m_noUiLines(false),
+        m_idBased(false),
         m_saveMode(SaveEverything)
     {}
@@ -82 +99 @@
 public:
     QString m_defaultContext;
-    QByteArray m_codecForSource; // CPP specific
+    QByteArray m_codecForSource; // CPP, PO & QM specific
+    QByteArray m_outputCodec; // CPP & PO specific
+    QString m_unTrPrefix; // QM specific
     QString m_sourceFileName;
     QString m_targetFileName;
     QDir m_sourceDir;
-    QDir m_targetDir; // FIXME: TS spefic
+    QDir m_targetDir; // FIXME: TS specific
+    QSet<QString> m_projectRoots;
+    QMultiHash<QString, QString> m_allCSources;
+    QStringList m_includePath;
     QStringList m_dropTags;  // tags to be dropped
     QStringList m_errors;
@@ -93 +115 @@
     bool m_sortContexts;
     bool m_noUiLines;
+    bool m_idBased;
     TranslatorSaveMode m_saveMode;
 };
@@ -105 +128 @@
     bool release(QFile *iod, ConversionData &cd) const;
 
-    bool contains(const QString &context, const QString &sourceText,
-        const QString &comment) const;
-    TranslatorMessage find(const QString &context,
-        const QString &sourceText, const QString &comment) const;
-
+    int find(const TranslatorMessage &msg) const;
     TranslatorMessage find(const QString &context,
         const QString &comment, const TranslatorMessage::References &refs) const;
@@ -116 +135 @@
     TranslatorMessage find(const QString &context) const;
 
-    void replace(const TranslatorMessage &msg);
     void replaceSorted(const TranslatorMessage &msg);
     void extend(const TranslatorMessage &msg); // Only for single-location messages
@@ -128 +146 @@
     void stripIdenticalSourceTranslations();
     void dropTranslations();
+    void dropUiLines();
     void makeFileNamesAbsolute(const QDir &originalPath);
-    QSet<TranslatorMessagePtr> resolveDuplicates();
-    static void reportDuplicates(const QSet<TranslatorMessagePtr> &dupes,
-                                 const QString &fileName, bool verbose);
+
+    struct Duplicates { QSet<int> byId, byContents; };
+    Duplicates resolveDuplicates();
+    void reportDuplicates(const Duplicates &dupes, const QString &fileName, bool verbose);
 
     void setCodecName(const QByteArray &name);
-    QByteArray codecName() const { return m_codecName; }
+    QByteArray codecName() const;
+    QTextCodec *codec() const { return m_codec; }
 
     QString languageCode() const { return m_language; }
     QString sourceLanguageCode() const { return m_sourceLanguage; }
 
-    enum LocationsType { NoLocations, RelativeLocations, AbsoluteLocations };
+    enum LocationsType { DefaultLocations, NoLocations, RelativeLocations, AbsoluteLocations };
     void setLocationsType(LocationsType lt) { m_locationsType = lt; }
     LocationsType locationsType() const { return m_locationsType; }
@@ -151 +172 @@
     QList<TranslatorMessage> messages() const;
     QList<TranslatorMessage> translatedMessages() const;
-    static QStringList normalizedTranslations(const TranslatorMessage &m,
-        QLocale::Language lang, QLocale::Country country);
+    static QStringList normalizedTranslations(const TranslatorMessage &m, int numPlurals);
+    void normalizeTranslations(ConversionData &cd);
     QStringList normalizedTranslations(const TranslatorMessage &m, ConversionData &cd, bool *ok) const;
 
@@ -179 +200 @@
         LoadFunction loader;
         SaveFunction saver;
-        enum FileType { SourceCode, TranslationSource, TranslationBinary } fileType;
+        enum FileType { TranslationSource, TranslationBinary } fileType;
         int priority; // 0 = highest, -1 = invisible
     };
@@ -185 +206 @@
     static QList<FileFormat> &registeredFileFormats();
 
-    enum VariantSeparators {
-        DefaultVariantSeparator = 0x2762, // some weird character nobody ever heard of :-D
-        InternalVariantSeparator = 0x9c // unicode "STRING TERMINATOR"
+    enum {
+        TextVariantSeparator = 0x2762, // some weird character nobody ever heard of :-D
+        BinaryVariantSeparator = 0x9c // unicode "STRING TERMINATOR"
     };
 
@@ -194 +215 @@
 
     TMM m_messages;
-    QByteArray m_codecName;
+    QTextCodec *m_codec;
     LocationsType m_locationsType;