diff options
author | David Skoland <david.skoland@qt.io> | 2020-10-06 18:11:26 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-17 11:56:30 +0200 |
commit | 4a7280598b99379425043a8773dd274e5bcb24d5 (patch) | |
tree | 58e431ba1a8d2a2c062de98fbfea6faf135387f3 /src/gui | |
parent | b61d67f897bcf4cb11f08b322ed97bf12988f741 (diff) |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/image/qpnghandler.cpp | 2 | ||||
-rw-r--r-- | src/gui/util/qshadergraphloader.cpp | 8 | ||||
-rw-r--r-- | src/gui/util/qshadernodesloader.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 897055f7ae..6c05e0a567 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -836,7 +836,7 @@ static void set_text(const QImage &image, png_structp png_ptr, png_infop info_pt #ifdef PNG_iTXt_SUPPORTED bool needsItxt = false; - for (const QChar c : it.value()) { + for (QChar c : it.value()) { uchar ch = c.cell(); if (c.row() || (ch < 0x20 && ch != '\n') || (ch > 0x7e && ch < 0xa0)) { needsItxt = true; diff --git a/src/gui/util/qshadergraphloader.cpp b/src/gui/util/qshadergraphloader.cpp index a938904651..defa88b9d3 100644 --- a/src/gui/util/qshadergraphloader.cpp +++ b/src/gui/util/qshadergraphloader.cpp @@ -145,7 +145,7 @@ void QShaderGraphLoader::load() } const QJsonArray nodes = nodesValue.toArray(); - for (const QJsonValue &nodeValue : nodes) { + for (const QJsonValue nodeValue : nodes) { if (!nodeValue.isObject()) { qWarning() << "Invalid node found"; hasError = true; @@ -171,7 +171,7 @@ void QShaderGraphLoader::load() const QJsonArray layersArray = nodeObject.value(QStringLiteral("layers")).toArray(); auto layers = QStringList(); - for (const QJsonValue &layerValue : layersArray) { + for (const QJsonValue layerValue : layersArray) { layers.append(layerValue.toString()); } @@ -214,7 +214,7 @@ void QShaderGraphLoader::load() } const QJsonArray edges = edgesValue.toArray(); - for (const QJsonValue &edgeValue : edges) { + for (const QJsonValue edgeValue : edges) { if (!edgeValue.isObject()) { qWarning() << "Invalid edge found"; hasError = true; @@ -245,7 +245,7 @@ void QShaderGraphLoader::load() const QJsonArray layersArray = edgeObject.value(QStringLiteral("layers")).toArray(); auto layers = QStringList(); - for (const QJsonValue &layerValue : layersArray) { + for (const QJsonValue layerValue : layersArray) { layers.append(layerValue.toString()); } diff --git a/src/gui/util/qshadernodesloader.cpp b/src/gui/util/qshadernodesloader.cpp index e6dcc8799b..db1755e33a 100644 --- a/src/gui/util/qshadernodesloader.cpp +++ b/src/gui/util/qshadernodesloader.cpp @@ -121,7 +121,7 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject) const QJsonValue inputsValue = nodeObject.value(QStringLiteral("inputs")); if (inputsValue.isArray()) { const QJsonArray inputsArray = inputsValue.toArray(); - for (const QJsonValue &inputValue : inputsArray) { + for (const QJsonValue inputValue : inputsArray) { if (!inputValue.isString()) { qWarning() << "Non-string value in inputs"; hasError = true; @@ -138,7 +138,7 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject) const QJsonValue outputsValue = nodeObject.value(QStringLiteral("outputs")); if (outputsValue.isArray()) { const QJsonArray outputsArray = outputsValue.toArray(); - for (const QJsonValue &outputValue : outputsArray) { + for (const QJsonValue outputValue : outputsArray) { if (!outputValue.isString()) { qWarning() << "Non-string value in outputs"; hasError = true; @@ -186,7 +186,7 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject) const QJsonValue rulesValue = nodeObject.value(QStringLiteral("rules")); if (rulesValue.isArray()) { const QJsonArray rulesArray = rulesValue.toArray(); - for (const QJsonValue &ruleValue : rulesArray) { + for (const QJsonValue ruleValue : rulesArray) { if (!ruleValue.isObject()) { qWarning() << "Rules should be objects"; hasError = true; |