summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qprocess_win.cpp
diff options
context:
space:
mode:
authorThomas Sondergaard <thomas.sondergaard@karoshealth.com>2017-06-11 18:09:21 +0200
committerThomas Sondergaard <thomas@sondergaard.cc>2017-06-13 06:09:36 +0000
commitb4381100280adbfa4cb6c4d8c84eed8f1dc126b9 (patch)
tree77083147945dd1374fcd60aaf37174228b23a106 /src/corelib/io/qprocess_win.cpp
parent1a5fa66269eb7c7e1e2f9372cb2b87738b5cac72 (diff)
Rename QProcessEnvironmentPrivate::hash to vars
Also use auto for iterators to vars. This is a small refactoring in preparation for changing type of vars to QMap. Task-number: QTBUG-61315 Change-Id: I5731d7916b6f54a0da5be2da378c09a7688bd870 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qprocess_win.cpp')
-rw-r--r--src/corelib/io/qprocess_win.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index 329d1842f0..9adb5138b7 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -75,7 +75,7 @@ QProcessEnvironment QProcessEnvironment::systemEnvironment()
int nameLen = equal - entry;
QString name = QString::fromWCharArray(entry, nameLen);
QString value = QString::fromWCharArray(equal + 1, entryLen - nameLen - 1);
- env.d->hash.insert(QProcessEnvironmentPrivate::Key(name), value);
+ env.d->vars.insert(QProcessEnvironmentPrivate::Key(name), value);
}
entry += entryLen + 1;
}
@@ -413,8 +413,8 @@ static QByteArray qt_create_environment(const QProcessEnvironmentPrivate::Hash &
}
int pos = 0;
- QProcessEnvironmentPrivate::Hash::ConstIterator it = copy.constBegin(),
- end = copy.constEnd();
+ auto it = copy.constBegin();
+ const auto end = copy.constEnd();
static const wchar_t equal = L'=';
static const wchar_t nul = L'\0';
@@ -475,7 +475,7 @@ void QProcessPrivate::startProcess()
QString args = qt_create_commandline(program, arguments);
QByteArray envlist;
if (environment.d.constData())
- envlist = qt_create_environment(environment.d.constData()->hash);
+ envlist = qt_create_environment(environment.d.constData()->vars);
if (!nativeArguments.isEmpty()) {
if (!args.isEmpty())
args += QLatin1Char(' ');