diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-11-14 10:59:46 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-11-18 13:03:08 +0100 |
| commit | c1225ea3f4bd534f8edc982e77d300c6e93219c7 (patch) | |
| tree | 8526f1129b2e7d9e7ecd654a2f16aa664ef8adea /src/libs/utils/textfileformat.h | |
| parent | 2f040fc6adea6606a0d8324be09da89f35ed0c62 (diff) | |
| download | qt-creator-c1225ea3f4bd534f8edc982e77d300c6e93219c7.tar.gz | |
CppTools: Use editor manager's codec as fallback
...for reading not already opened files.
This partly reverts commit f7c68f6. In case TextFileFormat::detect()
fails, the user configurable editor manager's codec is used instead of
QTextCodec::codecForLocale().
Adds also a qWarning() to easier detect encoding errors.
Task-number: QTCREATORBUG-10378
Change-Id: I0fa4e6b898ed090d85414ce2a001f11b115a42d3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/libs/utils/textfileformat.h')
| -rw-r--r-- | src/libs/utils/textfileformat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/utils/textfileformat.h b/src/libs/utils/textfileformat.h index 91121c9a9d..9ca55042e1 100644 --- a/src/libs/utils/textfileformat.h +++ b/src/libs/utils/textfileformat.h @@ -77,7 +77,9 @@ public: QString *plainText, TextFileFormat *format, QString *errorString, QByteArray *decodingErrorSample = 0); static ReadResult readFileUTF8(const QString &fileName, QByteArray *plainText, - QString *errorString); + QString *errorString); // TODO: Remove this version. + static ReadResult readFileUTF8(const QString &fileName, const QTextCodec *defaultCodec, + QByteArray *plainText, QString *errorString); bool writeFile(const QString &fileName, QString plainText, QString *errorString) const; |