move actual replaceInList imlementation back to proparserutils.h

src/shared/proparser/profileevaluator.cpp

@@ -790,24 +790,6 @@ ProItem::ProItemReturn ProFileEvaluator::Private::visitEndProFile(ProFile * pro)
     return ProItem::ReturnTrue;
 }
 
-static void replaceInList(QStringList *varlist,
-        const QRegExp &regexp, const QString &replace, bool global)
-{
-    for (QStringList::Iterator varit = varlist->begin(); varit != varlist->end(); ) {
-        if ((*varit).contains(regexp)) {
-            (*varit).replace(regexp, replace);
-            if ((*varit).isEmpty())
-                varit = varlist->erase(varit);
-            else
-                ++varit;
-            if(!global)
-                break;
-        } else {
-            ++varit;
-        }
-    }
-}
-
 void ProFileEvaluator::Private::visitProValue(ProValue *value)
 {
     PRE(value);

src/shared/proparser/proparserutils.h

@@ -133,19 +133,14 @@ static void removeEach(QHash<QString, QStringList> *map,
         sl.removeAll(str);
 }
 
-/*
+static void replaceInList(QStringList *varlist,
-  See ProFileEvaluator::Private::visitProValue(...)
+        const QRegExp &regexp, const QString &replace, bool global)
-
-static QStringList replaceInList(const QStringList &varList, const QRegExp &regexp,
-                           const QString &replace, bool global)
 {
-    QStringList resultList = varList;
+    for (QStringList::Iterator varit = varlist->begin(); varit != varlist->end(); ) {
-
+        if ((*varit).contains(regexp)) {
-    for (QStringList::Iterator varit = resultList.begin(); varit != resultList.end();) {
+            (*varit).replace(regexp, replace);
-        if (varit->contains(regexp)) {
+            if ((*varit).isEmpty())
-            *varit = varit->replace(regexp, replace);
+                varit = varlist->erase(varit);
-            if (varit->isEmpty())
-                varit = resultList.erase(varit);
             else
                 ++varit;
             if (!global)
@@ -154,9 +149,7 @@ static QStringList replaceInList(const QStringList &varList, const QRegExp &rege
             ++varit;
         }
     }
-    return resultList;
 }
-*/
 
 inline QString fixEnvVariables(const QString &x)
 {