diff options
| author | ninerider <qt-info@nokia.com> | 2009-11-23 12:28:19 (GMT) |
|---|---|---|
| committer | ninerider <qt-info@nokia.com> | 2009-11-23 12:28:19 (GMT) |
| commit | 4cfc3a884835667fe8c3a6aa745dc4ace34794e4 (patch) | |
| tree | 553a33b8112750d1d2dd7dc503c9c70391538b07 /tools/linguist/shared/translator.h | |
| parent | cda63c368dbb5acd040e2190db8f25de69462d8e (diff) | |
| parent | 4112771f56e827d1d8fbde0995ebf5b0242c01a8 (diff) | |
| download | Qt-4cfc3a884835667fe8c3a6aa745dc4ace34794e4.zip Qt-4cfc3a884835667fe8c3a6aa745dc4ace34794e4.tar.gz Qt-4cfc3a884835667fe8c3a6aa745dc4ace34794e4.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.6-ce
Diffstat (limited to 'tools/linguist/shared/translator.h')
| -rw-r--r-- | tools/linguist/shared/translator.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index f29317b..353cf9d 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -97,7 +97,7 @@ public: public: QString m_defaultContext; QByteArray m_codecForSource; // CPP, PO & QM specific - QByteArray m_outputCodec; // PO specific + QByteArray m_outputCodec; // CPP & PO specific QString m_unTrPrefix; // QM specific QString m_sourceFileName; QString m_targetFileName; @@ -151,7 +151,8 @@ public: 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; } @@ -211,7 +212,7 @@ private: typedef QList<TranslatorMessage> TMM; // int stores the sequence position. TMM m_messages; - QByteArray m_codecName; + QTextCodec *m_codec; LocationsType m_locationsType; // A string beginning with a 2 or 3 letter language code (ISO 639-1 |