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

Obsoleted code.

Browse Source
This commit is contained in:
Roberto Raggi
2009-03-03 09:58:43 +01:00
parent ba200c7834
commit 2a8327e57f
2 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libs/cplusplus/pp-engine.cpp
View File

@@ -492,24 +492,6 @@ QByteArray Preprocessor::operator()(const QByteArray &filename,
return preprocessed;
}
QByteArray Preprocessor::operator()(const QByteArray &source)
{
QByteArray preprocessed;
preprocess(source, &preprocessed);
return preprocessed;
}
void Preprocessor::preprocess(const QByteArray &filename,
const QByteArray &source,
QByteArray *result)
{
const QByteArray previousFile = env.currentFile;
env.currentFile = filename;
preprocess(source, result);
env.currentFile = previousFile;
}
void Preprocessor::expand(const QByteArray &source, QByteArray *result)
{
_expand(source, result);
@@ -536,13 +518,17 @@ Preprocessor::State Preprocessor::createStateFromSource(const QByteArray &source
return state;
}
void Preprocessor::preprocess(const QByteArray &source, QByteArray *result)
void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &source,
QByteArray *result)
{
QByteArray *previousResult = _result;
_result = result;
pushState(createStateFromSource(source));
const QByteArray previousFileName = env.currentFile;
env.currentFile = fileName;
const unsigned previousCurrentLine = env.currentLine;
env.currentLine = 0;
@@ -716,6 +702,8 @@ void Preprocessor::preprocess(const QByteArray &source, QByteArray *result)
}
popState();
env.currentFile = previousFileName;
env.currentLine = previousCurrentLine;
_result = previousResult;
}