From 4a7280598b99379425043a8773dd274e5bcb24d5 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Tue, 6 Oct 2020 18:11:26 +0200 Subject: Fix Clang compiler warnings (-Wrange-loop-analysis) In a macOS environment, Clang throws a number of compiler warnings about loop variables when building qtbase. See task for more info about the environment. This changes a handful of loop variables, like QJsonValue references into QJsonValueRefs. Task-number: QTBUG-87216 Pick-to: 5.15 Change-Id: I26006efd7c75c2d56ebc7f7efb4c9bdcabe92e8b Reviewed-by: Thiago Macieira --- src/tools/androiddeployqt/main.cpp | 2 +- src/tools/cmake_automoc_parser/main.cpp | 6 +++--- src/tools/moc/generator.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/tools') diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index ea278a37a2..0e04f97a33 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -875,7 +875,7 @@ bool readInputFile(Options *options) { const auto extraPrefixDirs = jsonObject.value(QLatin1String("extraPrefixDirs")).toArray(); options->extraPrefixDirs.reserve(extraPrefixDirs.size()); - for (const auto &prefix : extraPrefixDirs) { + for (const QJsonValue prefix : extraPrefixDirs) { options->extraPrefixDirs.push_back(prefix.toString()); } } diff --git a/src/tools/cmake_automoc_parser/main.cpp b/src/tools/cmake_automoc_parser/main.cpp index 7ef57a1d6c..6d0214638e 100644 --- a/src/tools/cmake_automoc_parser/main.cpp +++ b/src/tools/cmake_automoc_parser/main.cpp @@ -89,7 +89,7 @@ static bool readAutogenInfoJson(AutoGenHeaderMap &headers, AutoGenSourcesList &s QJsonArray sourcesArray = sourcesValue.toArray(); QJsonArray headerExtArray = headerExtValue.toArray(); - for (const auto &value : headersArray) { + for (const QJsonValue value : headersArray) { QJsonArray entry_array = value.toArray(); if (entry_array.size() > 2) { // Array[0] : header path @@ -100,7 +100,7 @@ static bool readAutogenInfoJson(AutoGenHeaderMap &headers, AutoGenSourcesList &s } sources.reserve(sourcesArray.size()); - for (const auto &value : sourcesArray) { + for (const QJsonValue value : sourcesArray) { QJsonArray entry_array = value.toArray(); if (entry_array.size() > 1) { sources.push_back(entry_array[0].toString()); @@ -108,7 +108,7 @@ static bool readAutogenInfoJson(AutoGenHeaderMap &headers, AutoGenSourcesList &s } headerExts.reserve(headerExtArray.size()); - for (const auto &value : headerExtArray) { + for (const QJsonValue value : headerExtArray) { headerExts.push_back(value.toString()); } diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index c562d4acc1..c49419c530 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -1527,7 +1527,7 @@ static CborError jsonArrayToCbor(CborEncoder *parent, const QJsonArray &a) { CborEncoder array; cbor_encoder_create_array(parent, &array, a.size()); - for (const QJsonValue &v : a) + for (const QJsonValue v : a) jsonValueToCbor(&array, v); return cbor_encoder_close_container(parent, &array); } -- cgit v1.2.3