C++/CppTools: Pass UTF-8 encoded source to Lexer

The Lexer can handle it now.

Task-number: QTCREATORBUG-7356
Change-Id: I8c4b03a247656e013d44c3cedca4835e133d4036
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

1 files changed, 1 insertions, 15 deletions

diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp
index c663375a8b..5c52764cf5 100644
--- a/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/src/libs/cplusplus/FastPreprocessor.cpp
@@ -41,18 +41,6 @@ FastPreprocessor::FastPreprocessor(const Snapshot &snapshot)
     , _preproc(this, &_env)
 { }
 
-// This is a temporary fix to handle non-ascii characters. This can be removed when the lexer can
-// handle multi-byte characters.
-static QByteArray convertToLatin1(const QByteArray &contents)
-{
-    const char *p = contents.constData();
-    while (char ch = *p++)
-        if (ch & 0x80)
-            return QString::fromUtf8(contents).toLatin1();
-
-    return contents;
-}
-
 QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QByteArray &source)
 {
     std::swap(newDoc, _currentDoc);
@@ -72,9 +60,7 @@ QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QByteArray &source)
             mergeEnvironment(i.resolvedFileName());
     }
 
-    QByteArray src = convertToLatin1(source);
-
-    const QByteArray preprocessed = _preproc.run(fileName, src);
+    const QByteArray preprocessed = _preproc.run(fileName, source);
 //    qDebug("FastPreprocessor::run for %s produced [[%s]]", fileName.toUtf8().constData(), preprocessed.constData());
     std::swap(newDoc, _currentDoc);
     return preprocessed;