summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2017-04-19 14:50:38 +0200
committerTobias Hunger <tobias.hunger@qt.io>2017-04-20 09:45:54 +0000
commit1050c8605c754b7dce45dbda545d36d1184c5552 (patch)
treec76714311c03ae4850ded1d9348d4cf248cd0b1b /src
parentd8533815de8b3467521e33666f4bb29f4af46445 (diff)
downloadqt-creator-1050c8605c754b7dce45dbda545d36d1184c5552.tar.gz
Environment: Use range-based for loop
Change-Id: I80bd9c5fee00e8df47735e4c71694d7ac279e3b1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/libs/utils/environment.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index d7ea393564..c423a6adf1 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -65,7 +65,7 @@ void EnvironmentItem::sort(QList<EnvironmentItem> *list)
QList<EnvironmentItem> EnvironmentItem::fromStringList(const QStringList &list)
{
QList<EnvironmentItem> result;
- foreach (const QString &string, list) {
+ for (const QString &string : list) {
int pos = string.indexOf('=', 1);
if (pos == -1) {
EnvironmentItem item(string, QString());
@@ -82,7 +82,7 @@ QList<EnvironmentItem> EnvironmentItem::fromStringList(const QStringList &list)
QStringList EnvironmentItem::toStringList(const QList<EnvironmentItem> &list)
{
QStringList result;
- foreach (const EnvironmentItem &item, list) {
+ for (const EnvironmentItem &item : list) {
if (item.unset)
result << QString(item.name);
else
@@ -93,7 +93,7 @@ QStringList EnvironmentItem::toStringList(const QList<EnvironmentItem> &list)
Environment::Environment(const QStringList &env, OsType osType) : m_osType(osType)
{
- foreach (const QString &s, env) {
+ for (const QString &s : env) {
int i = s.indexOf('=', 1);
if (i >= 0) {
if (m_osType == OsTypeWindows)
@@ -255,15 +255,15 @@ FileName Environment::searchInDirectory(const QStringList &execs, QString direct
QStringList Environment::appendExeExtensions(const QString &executable) const
{
- QFileInfo fi(executable);
QStringList execs(executable);
+ const QFileInfo fi(executable);
if (m_osType == OsTypeWindows) {
// Check all the executable extensions on windows:
// PATHEXT is only used if the executable has no extension
if (fi.suffix().isEmpty()) {
- QStringList extensions = value("PATHEXT").split(';');
+ const QStringList extensions = value("PATHEXT").split(';');
- foreach (const QString &ext, extensions)
+ for (const QString &ext : extensions)
execs << executable + ext.toLower();
}
}
@@ -370,7 +370,7 @@ int Environment::size() const
void Environment::modify(const QList<EnvironmentItem> & list)
{
Environment resultEnvironment = *this;
- foreach (const EnvironmentItem &item, list) {
+ for (const EnvironmentItem &item : list) {
if (item.unset) {
resultEnvironment.unset(item.name);
} else {