From f3056e49c3b2443c5dd9abf78c46381fdbbbd731 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Tue, 19 Feb 2019 23:13:54 +0100 Subject: Fix calls to non-const begin()/end() in range-for loops This fixes -Wclazy-range-loop Change-Id: I08a435b700017cdbe27fbfdbda6e26840d9a3568 Reviewed-by: Christian Kandeler Reviewed-by: Denis Shienkov --- tests/auto/api/tst_api.cpp | 3 ++- tests/auto/blackbox/tst_blackbox.cpp | 4 ++-- tests/auto/blackbox/tst_blackboxapple.cpp | 3 ++- tests/auto/blackbox/tst_clangdb.cpp | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 58150150a..59089937a 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -2847,7 +2847,8 @@ void TestApi::toolInModule() const QList products = projectData.products(); QCOMPARE(products.size(), 1); const qbs::ProductData product = products.front(); - for (const qbs::GroupData &group : product.groups()) + const auto groups = product.groups(); + for (const qbs::GroupData &group : groups) QVERIFY(group.name() != "thetool binary"); const std::unique_ptr buildJob(setupJob->project() .buildAllProducts(qbs::BuildOptions())); diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 8dd79528b..9e2e320c7 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -6093,14 +6093,14 @@ static bool haveInnoSetup(const Profile &profile) QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH") .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); - for (const QString &key : regKeys) { + for (const QString &key : qAsConst(regKeys)) { QSettings settings(key, QSettings::NativeFormat); QString str = settings.value(QStringLiteral("InstallLocation")).toString(); if (!str.isEmpty()) paths.prepend(str); } - for (const QString &path : paths) { + for (const QString &path : qAsConst(paths)) { if (regularFileExists(QDir::fromNativeSeparators(path) + HostOsInfo::appendExecutableSuffix(QStringLiteral("/ISCC")))) return true; diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index 7cbc07b95..d9cabe270 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -749,7 +749,8 @@ void TestBlackboxApple::xcode() QVERIFY2(xcodebuildShowSdks.waitForStarted(), qPrintable(xcodebuildShowSdks.errorString())); QVERIFY2(xcodebuildShowSdks.waitForFinished(), qPrintable(xcodebuildShowSdks.errorString())); QVERIFY2(xcodebuildShowSdks.exitCode() == 0, qPrintable(xcodebuildShowSdks.readAllStandardError().constData())); - for (const QString &line : QString::fromLocal8Bit(xcodebuildShowSdks.readAllStandardOutput().trimmed()).split('\n', QString::SkipEmptyParts)) { + const auto lines = QString::fromLocal8Bit(xcodebuildShowSdks.readAllStandardOutput().trimmed()).split('\n', QString::SkipEmptyParts); + for (const QString &line : lines) { static const std::regex regexp("^.+\\s+\\-sdk\\s+([a-z]+)([0-9]+\\.[0-9]+)$"); const auto ln = line.toStdString(); std::smatch match; diff --git a/tests/auto/blackbox/tst_clangdb.cpp b/tests/auto/blackbox/tst_clangdb.cpp index 6a4072dd8..3a6dd2d92 100644 --- a/tests/auto/blackbox/tst_clangdb.cpp +++ b/tests/auto/blackbox/tst_clangdb.cpp @@ -111,7 +111,8 @@ void TestClangDb::ensureBuildTreeCreated() if (m_qbsStdout.contains("is msvc") || m_qbsStdout.contains("is mingw")) { sanitizeOutput(&m_qbsStdout); - for (const auto &line : m_qbsStdout.split('\n')) { + const auto lines = m_qbsStdout.split('\n'); + for (const auto &line : lines) { static const QByteArray includeEnv = "INCLUDE="; static const QByteArray libEnv = "LIB="; static const QByteArray pathEnv = "PATH="; -- cgit v1.2.3