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

remove unnecessary parameter from evaluateFileInto()

Browse Source 
all callers use the same value, so just inline it in the function.

Change-Id: Icc3f1301ec332cb18f5011b8abfb20703e94a491
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-08-24 16:09:11 +02:00
parent 0ad234b691
commit d0bc069e07
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -692,7 +692,7 @@ ProStringList QMakeEvaluator::evaluateExpandFunction(
ProValueMap vars; ProValueMap vars;
QString fn = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1))); QString fn = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1)));
fn.detach(); fn.detach();
if (evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &vars, LoadProOnly)) if (evaluateFileInto(fn, &vars, LoadProOnly))
ret = vars.value(map(args.at(1))); ret = vars.value(map(args.at(1)));
} }
break; break;
@@ -1134,7 +1134,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
ProValueMap vars; ProValueMap vars;
QString fn = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1))); QString fn = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1)));
fn.detach(); fn.detach();
if (!evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &vars, LoadProOnly)) if (!evaluateFileInto(fn, &vars, LoadProOnly))
return ReturnFalse; return ReturnFalse;
if (args.count() == 2) if (args.count() == 2)
return returnBool(vars.contains(map(args.at(1)))); return returnBool(vars.contains(map(args.at(1))));
@@ -1363,7 +1363,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
ok = evaluateFile(fn, QMakeHandler::EvalIncludeFile, LoadProOnly | flags); ok = evaluateFile(fn, QMakeHandler::EvalIncludeFile, LoadProOnly | flags);
} else { } else {
ProValueMap symbols; ProValueMap symbols;
if ((ok = evaluateFileInto(fn, QMakeHandler::EvalAuxFile, &symbols, LoadAll | flags))) { if ((ok = evaluateFileInto(fn, &symbols, LoadAll | flags))) {
ProValueMap newMap; ProValueMap newMap;
for (ProValueMap::ConstIterator for (ProValueMap::ConstIterator
it = m_valuemapStack.top().constBegin(), it = m_valuemapStack.top().constBegin(),

5
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -1768,14 +1768,13 @@ bool QMakeEvaluator::evaluateFeatureFile(const QString &fileName, bool silent)
return ok; return ok;
} }
bool QMakeEvaluator::evaluateFileInto(const QString &fileName, QMakeHandler::EvalFileType type, bool QMakeEvaluator::evaluateFileInto(const QString &fileName, ProValueMap *values, LoadFlags flags)
ProValueMap *values, LoadFlags flags)
{ {
QMakeEvaluator visitor(m_option, m_parser, m_handler); QMakeEvaluator visitor(m_option, m_parser, m_handler);
visitor.m_caller = this; visitor.m_caller = this;
visitor.m_outputDir = m_outputDir; visitor.m_outputDir = m_outputDir;
visitor.m_featureRoots = m_featureRoots; visitor.m_featureRoots = m_featureRoots;
if (!visitor.evaluateFile(fileName, type, flags)) if (!visitor.evaluateFile(fileName, QMakeHandler::EvalAuxFile, flags))
return false; return false;
*values = visitor.m_valuemapStack.top(); *values = visitor.m_valuemapStack.top();
#ifdef PROEVALUATOR_FULL #ifdef PROEVALUATOR_FULL

2
src/shared/proparser/qmakeevaluator.h
View File

@@ -151,7 +151,7 @@ public:
bool evaluateFile(const QString &fileName, QMakeHandler::EvalFileType type, bool evaluateFile(const QString &fileName, QMakeHandler::EvalFileType type,
LoadFlags flags); LoadFlags flags);
bool evaluateFeatureFile(const QString &fileName, bool silent = false); bool evaluateFeatureFile(const QString &fileName, bool silent = false);
bool evaluateFileInto(const QString &fileName, QMakeHandler::EvalFileType type, bool evaluateFileInto(const QString &fileName,
ProValueMap *values, // output-only ProValueMap *values, // output-only
LoadFlags flags); LoadFlags flags);
void message(int type, const QString &msg) const; void message(int type, const QString &msg) const;