diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-02 18:52:24 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-04 16:32:57 +0000 |
commit | 030c3a6197da663e5d2df48b9130ef71ee22e86c (patch) | |
tree | 6954272748e70b39a3c754e5e51dba0daa246d71 /qmake/project.cpp | |
parent | 924659b22f04a538f8b37838ad3bf5024fb931a6 (diff) |
remove pointless return value from QMakeParser::read()
it always returned true nowadays.
an obvious followup effect is that the return value of parsedProBlock()
doesn't need to be null-checked any more as well.
Change-Id: I782785cab9b721a78a342a010921a73e642ebe7f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r-- | qmake/project.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 45773db784..41bdab728c 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -124,17 +124,16 @@ QStringList QMakeProject::expand(const ProKey &func, const QList<ProStringList> ProString QMakeProject::expand(const QString &expr, const QString &where, int line) { ProString ret; - if (ProFile *pro = m_parser->parsedProBlock(expr, where, line, QMakeParser::ValueGrammar)) { - if (pro->isOk()) { - m_current.pro = pro; - m_current.line = 0; - const ushort *tokPtr = pro->tokPtr(); - ProStringList result = expandVariableReferences(tokPtr, 1, true); - if (!result.isEmpty()) - ret = result.at(0); - } - pro->deref(); + ProFile *pro = m_parser->parsedProBlock(expr, where, line, QMakeParser::ValueGrammar); + if (pro->isOk()) { + m_current.pro = pro; + m_current.line = 0; + const ushort *tokPtr = pro->tokPtr(); + ProStringList result = expandVariableReferences(tokPtr, 1, true); + if (!result.isEmpty()) + ret = result.at(0); } + pro->deref(); return ret; } |