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

move actual replaceInList imlementation back to proparserutils.h

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-07-14 20:40:01 +02:00
parent 96276c85d8
commit 3237a07996
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

21
src/shared/proparser/proparserutils.h
View File

@@ -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 &regexp,
const QString &replace, bool global)
static void replaceInList(QStringList *varlist,
const QRegExp &regexp, 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 &rege
++varit;
}
}
return resultList;
}
*/
inline QString fixEnvVariables(const QString &x)
{