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

3
src/libs/cplusplus/TypeOfExpression.cpp
View File

@@ -139,7 +139,6 @@ QString TypeOfExpression::preprocessedExpression(const QString &expression,
&env, &processed);
const QByteArray code = expression.toUtf8();
Preprocessor preproc(0, env);
QByteArray preprocessedCode;
preproc("<expression>", code, &preprocessedCode);
const QByteArray preprocessedCode = preproc("<expression>", code);
return QString::fromUtf8(preprocessedCode.constData(), preprocessedCode.size());
}

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

@@ -485,25 +485,25 @@ QByteArray Preprocessor::operator()(const QByteArray &filename,
const QByteArray &source)
{
QByteArray preprocessed;
operator()(filename, source, &preprocessed);
preprocess(filename, source, &preprocessed);
return preprocessed;
}
QByteArray Preprocessor::operator()(const QByteArray &source)
{
QByteArray preprocessed;
operator()(source, &preprocessed);
preprocess(source, &preprocessed);
return preprocessed;
}
void Preprocessor::operator () (const QByteArray &filename,
const QByteArray &source,
QByteArray *result)
void Preprocessor::preprocess(const QByteArray &filename,
const QByteArray &source,
QByteArray *result)
{
const QByteArray previousFile = env.currentFile;
env.currentFile = filename;
operator () (source, result);
preprocess(source, result);
env.currentFile = previousFile;
}
@@ -523,7 +523,7 @@ Preprocessor::State Preprocessor::createStateFromSource(const QByteArray &source
return state;
}
void Preprocessor::operator()(const QByteArray &source, QByteArray *result)
void Preprocessor::preprocess(const QByteArray &source, QByteArray *result)
{
pushState(createStateFromSource(source));

6
src/libs/cplusplus/pp-engine.h
View File

@@ -186,14 +186,14 @@ namespace CPlusPlus {
QByteArray operator()(const QByteArray &source);
void operator()(const QByteArray &filename,
private:
void preprocess(const QByteArray &filename,
const QByteArray &source,
QByteArray *result);
void operator()(const QByteArray &source,
void preprocess(const QByteArray &source,
QByteArray *result);
private:
void resetIfLevel();
bool testIfLevel();
int skipping() const;