From 1892cf3737a6c6aa94b1ad37262e9f27eef6730e Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 20 Nov 2013 19:24:17 +0200
Subject: cplusplus-update-frontend: Fix compilation

Change-Id: I75ee86775cdab78a477c7303acd38374c5db9d51
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
---
 .../cplusplus-update-frontend.cpp                  | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp')

diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
index 495b9c7e1c..48890d16db 100644
--- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
+++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
@@ -43,13 +43,13 @@
     typedef QCoreApplication MyQApplication;
 #endif
 
-#include <Control.h>
-#include <Parser.h>
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <Symbols.h>
-#include <CoreTypes.h>
-#include <Literals.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/Parser.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Literals.h>
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/Names.h>
@@ -1078,11 +1078,11 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir)
         return;
     }
 
-    const QString source = QTextStream(&file).readAll();
+    const QByteArray source = file.readAll();
     file.close();
 
     QTextDocument cpp_document;
-    cpp_document.setPlainText(source);
+    cpp_document.setPlainText(QString::fromUtf8(source));
 
     Document::Ptr AST_cpp_document = snapshot.preprocessedDocument(source, fileName);
     AST_cpp_document->check();
@@ -1386,11 +1386,11 @@ QStringList generateAST_H(const Snapshot &snapshot, const QDir &cplusplusDir, co
     if (! file.open(QFile::ReadOnly))
         return astDerivedClasses;
 
-    const QString source = QTextStream(&file).readAll();
+    const QByteArray source = file.readAll();
     file.close();
 
     QTextDocument document;
-    document.setPlainText(source);
+    document.setPlainText(QString::fromUtf8(source));
 
     AST_h_document  = snapshot.preprocessedDocument(source, fileName);
     AST_h_document->check();
@@ -1537,11 +1537,11 @@ void generateASTFwd_h(const Snapshot &snapshot, const QDir &cplusplusDir, const
     if (! file.open(QFile::ReadOnly))
         return;
 
-    const QString source = QTextStream(&file).readAll();
+    const QByteArray source = file.readAll();
     file.close();
 
     QTextDocument document;
-    document.setPlainText(source);
+    document.setPlainText(QString::fromUtf8(source));
     Document::Ptr doc = snapshot.preprocessedDocument(source, fileName);
     doc->check();
 
-- 
cgit v1.2.1