diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 58f75baf064cef28d949b16de1140ee8b114bc19..4d2981f0f80207697a760a443a0fa7e8a3bef3ca 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/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 ®exp, 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); diff --git a/src/shared/proparser/proparserutils.h b/src/shared/proparser/proparserutils.h index 35124796d54818bac509d207c3936778cb717dfe..81d026b7beb7de88f6d6844e6be617a409f4649d 100644 --- a/src/shared/proparser/proparserutils.h +++ b/src/shared/proparser/proparserutils.h @@ -133,19 +133,14 @@ static void removeEach(QHash<QString, QStringList> *map, sl.removeAll(str); } -/* - See ProFileEvaluator::Private::visitProValue(...) - -static QStringList replaceInList(const QStringList &varList, const QRegExp ®exp, - const QString &replace, bool global) +static void replaceInList(QStringList *varlist, + const QRegExp ®exp, const QString &replace, bool global) { - QStringList resultList = varList; - - for (QStringList::Iterator varit = resultList.begin(); varit != resultList.end();) { - if (varit->contains(regexp)) { - *varit = varit->replace(regexp, replace); - if (varit->isEmpty()) - varit = resultList.erase(varit); + 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) @@ -154,9 +149,7 @@ static QStringList replaceInList(const QStringList &varList, const QRegExp ®e ++varit; } } - return resultList; } -*/ inline QString fixEnvVariables(const QString &x) {