diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 22:26:54 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 22:26:54 +0100 |
| commit | 9748269cb58266fdfdac2c8820dad8c473dcf512 (patch) | |
| tree | 81cdd7830afb6507429594e133e18ca9f420dd8c /tools/linguist/shared/translator.h | |
| parent | 9a33a0027883ab77c10d8a9d9d9df5b4c2c5d50b (diff) | |
| parent | ba25c4a832516124bcd97758de9eede32797c5a0 (diff) | |
Merge branch '4.5'
Conflicts:
tools/linguist/lupdate/qscript.cpp
tools/linguist/lupdate/qscript.g
tools/linguist/lupdate/ui.cpp
tools/linguist/shared/cpp.cpp
tools/linguist/shared/qph.cpp
tools/linguist/shared/translator.h
Diffstat (limited to 'tools/linguist/shared/translator.h')
| -rw-r--r-- | tools/linguist/shared/translator.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index de98e9d9f5..0f83c1d742 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -54,8 +54,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_TYPEINFO(TranslatorMessage, Q_MOVABLE_TYPE); - class QIODevice; // A struct of "interesting" data passed to and from the load and save routines @@ -93,7 +91,7 @@ public: QSet<QString> m_projectRoots; QMultiHash<QString, QString> m_allCSources; QStringList m_includePath; - QStringList m_dropTags; // tags to be dropped + QStringList m_dropTags; // tags to be dropped QStringList m_errors; bool m_verbose; bool m_ignoreUnfinished; @@ -135,6 +133,7 @@ public: void stripIdenticalSourceTranslations(); void dropTranslations(); QList<TranslatorMessage> findDuplicates() const; + void resolveDualEncoded(); void makeFileNamesAbsolute(const QDir &originalPath); void setCodecName(const QByteArray &name); |