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

preprocessor: rename operator() into run.

Browse Source 
Easier to follow.

Change-Id: I6da1ca862ddb7048a6d16bf5e6ea18d6b2cfc7f8
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-04-19 10:35:49 +02:00
committed by hjk
parent 6d837b627a
commit 6d393252c4
6 changed files with 61 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/cplusplus/FastPreprocessor.cpp
View File

@@ -55,7 +55,7 @@ QByteArray FastPreprocessor::run(QString fileName, const QString &source)
mergeEnvironment(i.fileName());
}
const QByteArray preprocessed = _preproc(fileName, source);
const QByteArray preprocessed = _preproc.run(fileName, source);
// qDebug("FastPreprocessor::run for %s produced [[%s]]", fileName.toUtf8().constData(), preprocessed.constData());
return preprocessed;
}

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

@@ -210,5 +210,5 @@ QByteArray TypeOfExpression::preprocessedExpression(const QByteArray &utf8code)
}
Preprocessor preproc(0, m_environment.data());
return preproc("<expression>", utf8code);
return preproc.run("<expression>", utf8code);
}

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

@@ -583,17 +583,15 @@ Preprocessor::Preprocessor(Client *client, Environment *env)
{
}
QByteArray Preprocessor::operator()(const QString &fileName, const QString &source)
QByteArray Preprocessor::run(const QString &fileName, const QString &source)
{
const QByteArray bytes = source.toLatin1();
const QByteArray preprocessedCode = operator()(fileName, bytes);
return preprocessedCode;
return run(fileName, source.toLatin1());
}
QByteArray Preprocessor::operator()(const QString &fileName,
const QByteArray &source,
bool noLines,
bool markGeneratedTokens)
QByteArray Preprocessor::run(const QString &fileName,
const QByteArray &source,
bool noLines,
bool markGeneratedTokens)
{
QByteArray preprocessed;
// qDebug()<<"running" << fileName<<"with"<<source.count('\n')<<"lines...";

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

@@ -79,8 +79,8 @@ class CPLUSPLUS_EXPORT Preprocessor
public:
Preprocessor(Client *client, Environment *env);
QByteArray operator()(const QString &filename, const QString &source);
QByteArray operator()(const QString &filename, const QByteArray &source, bool noLines = false, bool markGeneratedTokens = true);
QByteArray run(const QString &filename, const QString &source);
QByteArray run(const QString &filename, const QByteArray &source, bool noLines = false, bool markGeneratedTokens = true);
bool expandMacros() const;
void setExpandMacros(bool expandMacros);