feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

cplusplus-update-frontend: Fix compilation

Browse Source 
Change-Id: I75ee86775cdab78a477c7303acd38374c5db9d51
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Orgad Shaneh
2013-11-20 19:24:17 +02:00
committed by Orgad Shaneh
parent 30d0eb6325
commit 1892cf3737
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
View File

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