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

Utils: Replace Environment::find iterator use

Browse Source 
Task-number: QTCREATORBUG-28357
Change-Id: I2723ffd6b7842f88009701eccea9aacac8cbf516
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2023-03-02 13:26:26 +01:00
parent 21de068c14
commit 3e5d14b020
4 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/commandline.cpp
View File

@@ -362,12 +362,12 @@ static QStringList splitArgsUnix(const QString &args, bool abortOnMeta,
if (var == pwdName && pwd && !pwd->isEmpty()) {
cret += *pwd;
} else {
Environment::const_iterator vit = env->constFind(var);
if (vit == env->constEnd()) {
const Environment::FindResult res = env->find(var);
if (!res) {
if (abortOnMeta)
goto metaerr; // Assume this is a shell builtin
} else {
cret += env->expandedValueForKey(env->key(vit));
cret += env->expandedValueForKey(res->key);
}
}
if (!braced)
@@ -412,12 +412,12 @@ static QStringList splitArgsUnix(const QString &args, bool abortOnMeta,
if (var == pwdName && pwd && !pwd->isEmpty()) {
val = *pwd;
} else {
Environment::const_iterator vit = env->constFind(var);
if (vit == env->constEnd()) {
const Environment::FindResult res = env->find(var);
if (!res) {
if (abortOnMeta)
goto metaerr; // Assume this is a shell builtin
} else {
val = env->expandedValueForKey(env->key(vit));
val = env->expandedValueForKey(res->key);
}
}
for (int i = 0; i < val.length(); i++) {