diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-08-19 15:47:51 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-09-11 09:43:14 +0200 |
| commit | f7c68f6baf104729e8d2fb3a0693b3c59928f8d3 (patch) | |
| tree | fc0b7227fb28425b65f194d1f6d58bb4d5f53299 /src/plugins/cpptools/cpppreprocessor.h | |
| parent | eebb1dfcf4d0d4a391a77ab9e095188f63b616e4 (diff) | |
| download | qt-creator-f7c68f6baf104729e8d2fb3a0693b3c59928f8d3.tar.gz | |
C++: change working-copy to work on UTF-8 encoded QByteArrays.
These not only take less space than UTF-16 encoded QStrings, but due to
the caching in the CppEditorSupport also take less time to build.
This patch also fixes a number of possible encoding issues, where files
and constant strings were (falsely) assumed to be UTF-8.
Change-Id: Ib6f91c9a94ebed5b5dfbd4eb2998825c62c72784
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor.h')
| -rw-r--r-- | src/plugins/cpptools/cpppreprocessor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpppreprocessor.h b/src/plugins/cpptools/cpppreprocessor.h index c54bbefb30..e1e3f228d1 100644 --- a/src/plugins/cpptools/cpppreprocessor.h +++ b/src/plugins/cpptools/cpppreprocessor.h @@ -44,7 +44,7 @@ public: protected: CPlusPlus::Document::Ptr switchDocument(CPlusPlus::Document::Ptr doc); - void getFileContents(const QString &absoluteFilePath, QString *contents, unsigned *revision) const; + void getFileContents(const QString &absoluteFilePath, QByteArray *contents, unsigned *revision) const; bool checkFile(const QString &absoluteFilePath) const; QString resolveFile(const QString &fileName, IncludeType type); QString resolveFile_helper(const QString &fileName, IncludeType type); |