From e4c3e04ebd41fd2d9e42d30165d912a0fd253549 Mon Sep 17 00:00:00 2001
From: Nikita Baryshnikov <nib952051@gmail.com>
Date: Tue, 19 Sep 2017 00:01:00 +0300
Subject: [PATCH] Environment: make usage of Environment.iterators more
 consistent

Change-Id: I114ddb2238ad19ac0681b8405925f283f2460f21
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/libs/utils/qtcprocess.cpp                  | 4 ++--
 src/plugins/qnx/qnxdeviceprocess.cpp           | 2 +-
 src/plugins/remotelinux/linuxdeviceprocess.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 2dd4f727093..eb9cf9f6472 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -394,7 +394,7 @@ static QStringList splitArgsUnix(const QString &args, bool abortOnMeta,
                                 if (abortOnMeta)
                                     goto metaerr; // Assume this is a shell builtin
                             } else {
-                                cret += *vit;
+                                cret += env->value(vit);
                             }
                         }
                         if (!braced)
@@ -444,7 +444,7 @@ static QStringList splitArgsUnix(const QString &args, bool abortOnMeta,
                         if (abortOnMeta)
                             goto metaerr; // Assume this is a shell builtin
                     } else {
-                        val = *vit;
+                        val = env->value(vit);
                     }
                 }
                 for (int i = 0; i < val.length(); i++) {
diff --git a/src/plugins/qnx/qnxdeviceprocess.cpp b/src/plugins/qnx/qnxdeviceprocess.cpp
index 82e195dc9cd..086e556e5d7 100644
--- a/src/plugins/qnx/qnxdeviceprocess.cpp
+++ b/src/plugins/qnx/qnxdeviceprocess.cpp
@@ -59,7 +59,7 @@ QString QnxDeviceProcess::fullCommandLine(const StandardRunnable &runnable) cons
 
     const Environment env = runnable.environment;
     for (auto it = env.constBegin(); it != env.constEnd(); ++it)
-        fullCommandLine += QString::fromLatin1("%1='%2' ").arg(it.key()).arg(it.value());
+        fullCommandLine += QString::fromLatin1("%1='%2' ").arg(env.key(it)).arg(env.value(it));
 
     fullCommandLine += QString::fromLatin1("%1 & echo $! > %2").arg(cmd).arg(m_pidFile);
 
diff --git a/src/plugins/remotelinux/linuxdeviceprocess.cpp b/src/plugins/remotelinux/linuxdeviceprocess.cpp
index 64ae87ebfda..c3d56cad2b7 100644
--- a/src/plugins/remotelinux/linuxdeviceprocess.cpp
+++ b/src/plugins/remotelinux/linuxdeviceprocess.cpp
@@ -88,7 +88,7 @@ QString LinuxDeviceProcess::fullCommandLine(const StandardRunnable &runnable) co
     for (auto it = env.constBegin(); it != env.constEnd(); ++it) {
         if (!envString.isEmpty())
             envString += QLatin1Char(' ');
-        envString.append(it.key()).append(QLatin1String("='")).append(it.value())
+        envString.append(env.key(it)).append(QLatin1String("='")).append(env.value(it))
                 .append(QLatin1Char('\''));
     }
     fullCommandLine.append("echo $$ && ");