From 8a4053d14b063fc071107d695980ddbff2600e81 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 12 Jun 2012 21:55:26 +0200
Subject: [PATCH] dispose of valuesDirect()

it has become a trivial wrapper around values()

Change-Id: Ia3165ec4cf968588f6ad3f5a2e8abe61dcae2f59
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
 src/shared/proparser/qmakebuiltins.cpp  |  6 +++---
 src/shared/proparser/qmakeevaluator.cpp | 18 ++++++------------
 src/shared/proparser/qmakeevaluator.h   |  1 -
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index da5f0cf16c0..64793431d7e 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -198,7 +198,7 @@ void QMakeEvaluator::populateDeps(
     foreach (const ProString &item, deps)
         if (!dependencies.contains(item)) {
             QSet<ProString> &dset = dependencies[item]; // Always create entry
-            ProStringList depends = valuesDirect(ProString(prefix + item + QString::fromLatin1(".depends")));
+            ProStringList depends = values(ProString(prefix + item + QString::fromLatin1(".depends")));
             if (depends.isEmpty()) {
                 rootSet << item;
             } else {
@@ -609,7 +609,7 @@ ProStringList QMakeEvaluator::evaluateExpandFunction(
             QHash<ProString, QSet<ProString> > dependencies;
             ProValueMap dependees;
             ProStringList rootSet;
-            ProStringList orgList = valuesDirect(args.at(0));
+            ProStringList orgList = values(args.at(0));
             populateDeps(orgList, (args.count() < 2 ? ProString() : args.at(1)),
                          dependencies, dependees, rootSet);
             for (int i = 0; i < rootSet.size(); ++i) {
@@ -827,7 +827,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
         if (args.count() == 1)
             return returnBool(isActiveConfig(args.at(0).toQString(m_tmp2)));
         const QStringList &mutuals = args.at(1).toQString(m_tmp2).split(QLatin1Char('|'));
-        const ProStringList &configs = valuesDirect(statics.strCONFIG);
+        const ProStringList &configs = values(statics.strCONFIG);
 
         for (int i = configs.size() - 1; i >= 0; i--) {
             for (int mut = 0; mut < mutuals.count(); mut++) {
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index b2de00daf48..b16236cc867 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -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);
diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h
index b611aacd693..f19482bab9f 100644
--- a/src/shared/proparser/qmakeevaluator.h
+++ b/src/shared/proparser/qmakeevaluator.h
@@ -122,7 +122,6 @@ public:
 
     static const ProString &map(const ProString &var);
     ProValueMap *findValues(const ProString &variableName, ProValueMap::Iterator *it);
-    ProStringList valuesDirect(const ProString &variableName) const;
 
     void setTemplate();