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

More cleanup

Browse Source
This commit is contained in:
Roberto Raggi
2009-03-02 18:15:58 +01:00
parent 2553e25049
commit ed69c39906
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -202,7 +202,7 @@ protected:
private:
QPointer<CppModelManager> m_modelManager;
Environment env;
Preprocessor m_proc;
Preprocessor preprocess;
QStringList m_includePaths;
QStringList m_systemIncludePaths;
QMap<QString, QByteArray> m_workingCopy;
@@ -220,7 +220,7 @@ private:
CppPreprocessor::CppPreprocessor(QPointer<CppModelManager> modelManager)
: snapshot(modelManager->snapshot()),
m_modelManager(modelManager),
m_proc(this, env)
preprocess(this, env)
{ }
void CppPreprocessor::setWorkingCopy(const QMap<QString, QByteArray> &workingCopy)
@@ -506,8 +506,7 @@ void CppPreprocessor::sourceNeeded(QString &fileName, IncludeType type,
Document::Ptr previousDoc = switchDocument(doc);
QByteArray preprocessedCode;
m_proc(fileName.toUtf8(), contents, &preprocessedCode);
const QByteArray preprocessedCode = preprocess(fileName.toUtf8(), contents);
doc->setSource(preprocessedCode);
doc->tokenize();