diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 16:56:04 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 16:56:04 (GMT) |
| commit | 87d9469e428296a2fb8d0f266900cdfe816eaf0a (patch) | |
| tree | f8219cadd57c0013f619030b44068adc009e2058 /tools/linguist/shared/translator.h | |
| parent | ceb253c234f840f7aeec10fa4450e840c6b242f4 (diff) | |
| parent | 7c09fda559760b8488d3130a5932fee04b2f6979 (diff) | |
| download | Qt-87d9469e428296a2fb8d0f266900cdfe816eaf0a.zip Qt-87d9469e428296a2fb8d0f266900cdfe816eaf0a.tar.gz Qt-87d9469e428296a2fb8d0f266900cdfe816eaf0a.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tools/linguist/shared/profileevaluator.cpp
Diffstat (limited to 'tools/linguist/shared/translator.h')
| -rw-r--r-- | tools/linguist/shared/translator.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index 0f83c1d..4e97000 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -132,9 +132,10 @@ public: void stripNonPluralForms(); void stripIdenticalSourceTranslations(); void dropTranslations(); - QList<TranslatorMessage> findDuplicates() const; - void resolveDualEncoded(); void makeFileNamesAbsolute(const QDir &originalPath); + QSet<TranslatorMessagePtr> resolveDuplicates(); + static void reportDuplicates(const QSet<TranslatorMessagePtr> &dupes, + const QString &fileName, bool verbose); void setCodecName(const QByteArray &name); QByteArray codecName() const { return m_codecName; } |