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

make use of ProFileEvaluator::value()

Browse Source 
no need to duplicate the code

Change-Id: Icc27e028dbb97faf9e48aba11dd5749526ee1e9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-08-01 17:48:53 +02:00
parent 2545468f10
commit 60e96cbff5
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/manual/proparser/main.cpp
+2 -11
View File
@@ -67,15 +67,6 @@ public:
static EvalHandler evalHandler;
static QString value(ProFileEvaluator &reader, const QString &variable)
{
QStringList vals = reader.values(variable);
if (!vals.isEmpty())
return vals.first();
return QString();
}
static int evaluate(const QString &fileName, const QString &in_pwd, const QString &out_pwd,
bool cumulative, QMakeGlobals *option, QMakeParser *parser, int level)
{
@@ -106,9 +97,9 @@ static int evaluate(const QString &fileName, const QString &in_pwd, const QStrin
const QString subDirKey = subDirVar + QLatin1String(".subdir");
const QString subDirFileKey = subDirVar + QLatin1String(".file");
if (visitor.contains(subDirKey))
realDir = QFileInfo(value(visitor, subDirKey)).filePath();
realDir = QFileInfo(visitor.value(subDirKey)).filePath();
else if (visitor.contains(subDirFileKey))
realDir = QFileInfo(value(visitor, subDirFileKey)).filePath();
realDir = QFileInfo(visitor.value(subDirFileKey)).filePath();
else
realDir = subDirVar;
QFileInfo info(realDir);