From b61933e6dfadd70655d1fad5344ba77da34587fc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 25 Mar 2009 20:19:57 +0100 Subject: whitespace --- tools/linguist/shared/translator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/linguist/shared/translator.h') diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index f4279da436..bbe765443e 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -88,7 +88,7 @@ public: QString m_targetFileName; QDir m_sourceDir; QDir m_targetDir; // FIXME: TS spefic - QStringList m_dropTags; // tags to be dropped + QStringList m_dropTags; // tags to be dropped QStringList m_errors; bool m_verbose; bool m_ignoreUnfinished; -- cgit v1.2.3 From d3be9fa7c981430c48de0a65938f3a2bd636bfcc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 26 Mar 2009 23:13:30 +0100 Subject: properly deal with messages which appear in multiple encodings in ts 1.1 and qm files, messages appear in their native encoding. that means that a message can appear multiple times - once in utf8 and once in the codecForTr. however, in ts 2.0 files, everything is utf8 and messages can have a utf8 flag for the later transformation into qm. unfortunately, there was no flag to mark that the message is needed in *both* encodings, and the respective case was completely ignored when reading ts 1.1 and qm files (causing error messages). Task-number: 249022 AutoTest: 322690 --- tools/linguist/shared/translator.h | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/linguist/shared/translator.h') diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index bbe765443e..ba719ec56c 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -130,6 +130,7 @@ public: void stripIdenticalSourceTranslations(); void dropTranslations(); QList findDuplicates() const; + void resolveDualEncoded(); void makeFileNamesAbsolute(const QDir &originalPath); void setCodecName(const QByteArray &name); -- cgit v1.2.3 From f3ec88cb128ee912457e273c420839d4bd295572 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 26 Mar 2009 19:02:25 +0100 Subject: declare type info next to the type, not "somewhere" --- tools/linguist/shared/translator.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'tools/linguist/shared/translator.h') diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index ba719ec56c..8908305780 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -52,8 +52,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 -- cgit v1.2.3