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

dispose of valuesDirect()

Browse Source 
it has become a trivial wrapper around values()

Change-Id: Ia3165ec4cf968588f6ad3f5a2e8abe61dcae2f59
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-12 21:55:26 +02:00
parent 9a33d2dfb2
commit 8a4053d14b
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -639,9 +639,9 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProLoop(
it_list = ProString(statics.strforever);
} else {
variable = map(_variable);
oldVarVal = valuesDirect(variable);
oldVarVal = values(variable);
}
ProStringList list = valuesDirect(it_list);
ProStringList list = values(it_list);
if (list.isEmpty()) {
if (it_list == statics.strforever) {
infinite = true;
@@ -1083,7 +1083,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
QSet<QString> processed;
forever {
bool finished = true;
ProStringList configs = valuesDirect(statics.strCONFIG);
ProStringList configs = values(statics.strCONFIG);
for (int i = configs.size() - 1; i >= 0; --i) {
QString config = configs.at(i).toQString(m_tmp1).toLower();
if (!processed.contains(config)) {
@@ -1505,7 +1505,7 @@ bool QMakeEvaluator::isActiveConfig(const QString &config, bool regex)
// CONFIG variable
int t = 0;
foreach (const ProString &configValue, valuesDirect(statics.strCONFIG)) {
foreach (const ProString &configValue, values(statics.strCONFIG)) {
if (re.exactMatch(configValue.toQString(m_tmp[t])))
return true;
t ^= 1;
@@ -1516,7 +1516,7 @@ bool QMakeEvaluator::isActiveConfig(const QString &config, bool regex)
return true;
// CONFIG variable
if (valuesDirect(statics.strCONFIG).contains(ProString(config, NoHash)))
if (values(statics.strCONFIG).contains(ProString(config, NoHash)))
return true;
}
@@ -1719,7 +1719,7 @@ ProStringList &QMakeEvaluator::valuesRef(const ProString &variableName)
return m_valuemapStack.top()[variableName];
}
ProStringList QMakeEvaluator::valuesDirect(const ProString &variableName) const
ProStringList QMakeEvaluator::values(const ProString &variableName) const
{
for (int i = m_valuemapStack.size(); --i >= 0; ) {
ProValueMap::ConstIterator it = m_valuemapStack.at(i).constFind(variableName);
@@ -1732,12 +1732,6 @@ ProStringList QMakeEvaluator::valuesDirect(const ProString &variableName) const
return ProStringList();
}
ProStringList QMakeEvaluator::values(const ProString &variableName) const
{
ProStringList result = valuesDirect(variableName);
return result;
}
ProString QMakeEvaluator::first(const ProString &variableName) const
{
const ProStringList &vals = values(variableName);