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

Environment: Use range-based for loop

Browse Source 
Change-Id: I80bd9c5fee00e8df47735e4c71694d7ac279e3b1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-04-19 14:50:38 +02:00
parent d8533815de
commit 1050c8605c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/environment.cpp
View File

@@ -65,7 +65,7 @@ void EnvironmentItem::sort(QList<EnvironmentItem> *list)
QList<EnvironmentItem> EnvironmentItem::fromStringList(const QStringList &list) QList<EnvironmentItem> EnvironmentItem::fromStringList(const QStringList &list)
{ {
QList<EnvironmentItem> result; QList<EnvironmentItem> result;
foreach (const QString &string, list) { for (const QString &string : list) {
int pos = string.indexOf('=', 1); int pos = string.indexOf('=', 1);
if (pos == -1) { if (pos == -1) {
EnvironmentItem item(string, QString()); EnvironmentItem item(string, QString());
@@ -82,7 +82,7 @@ QList<EnvironmentItem> EnvironmentItem::fromStringList(const QStringList &list)
QStringList EnvironmentItem::toStringList(const QList<EnvironmentItem> &list) QStringList EnvironmentItem::toStringList(const QList<EnvironmentItem> &list)
{ {
QStringList result; QStringList result;
foreach (const EnvironmentItem &item, list) { for (const EnvironmentItem &item : list) {
if (item.unset) if (item.unset)
result << QString(item.name); result << QString(item.name);
else else
@@ -93,7 +93,7 @@ QStringList EnvironmentItem::toStringList(const QList<EnvironmentItem> &list)
Environment::Environment(const QStringList &env, OsType osType) : m_osType(osType) 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); int i = s.indexOf('=', 1);
if (i >= 0) { if (i >= 0) {
if (m_osType == OsTypeWindows) if (m_osType == OsTypeWindows)
@@ -255,15 +255,15 @@ FileName Environment::searchInDirectory(const QStringList &execs, QString direct
QStringList Environment::appendExeExtensions(const QString &executable) const QStringList Environment::appendExeExtensions(const QString &executable) const
{ {
QFileInfo fi(executable);
QStringList execs(executable); QStringList execs(executable);
const QFileInfo fi(executable);
if (m_osType == OsTypeWindows) { if (m_osType == OsTypeWindows) {
// Check all the executable extensions on windows: // Check all the executable extensions on windows:
// PATHEXT is only used if the executable has no extension // PATHEXT is only used if the executable has no extension
if (fi.suffix().isEmpty()) { 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(); execs << executable + ext.toLower();
} }
} }
@@ -370,7 +370,7 @@ int Environment::size() const
void Environment::modify(const QList<EnvironmentItem> & list) void Environment::modify(const QList<EnvironmentItem> & list)
{ {
Environment resultEnvironment = *this; Environment resultEnvironment = *this;
foreach (const EnvironmentItem &item, list) { for (const EnvironmentItem &item : list) {
if (item.unset) { if (item.unset) {
resultEnvironment.unset(item.name); resultEnvironment.unset(item.name);
} else { } else {