From a2dc1a065d9fcaedc47e358a9389fda85c9af9e8 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Wed, 9 Jul 2025 12:10:01 +0300 Subject: [PATCH] Get rid of some clazy warnings in qquickgraphsitem.cpp Fix "c++11 range-loop might detach Qt container" warnings. Change-Id: I43541eaa76bd8150acf41ce7236ecfe3176ee873 Reviewed-by: Kwanghyo Park Reviewed-by: Niko Korkala (cherry picked from commit 8b99b8ae064bc623525e50025e0b0808723a274d) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 8354c2f11e35b0bba644addea8424890dea7ccde) --- src/graphs3d/qml/qquickgraphsitem.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/graphs3d/qml/qquickgraphsitem.cpp b/src/graphs3d/qml/qquickgraphsitem.cpp index e6c77e72..0e849960 100644 --- a/src/graphs3d/qml/qquickgraphsitem.cpp +++ b/src/graphs3d/qml/qquickgraphsitem.cpp @@ -1418,7 +1418,7 @@ void QQuickGraphsItem::emitNeedRender() void QQuickGraphsItem::handleThemeColorStyleChanged(QGraphsTheme::ColorStyle style) { // Set value for series that have not explicitly set this value - for (QAbstract3DSeries *series : m_seriesList) { + for (QAbstract3DSeries *series : std::as_const(m_seriesList)) { if (!series->d_func()->m_themeTracker.colorStyleOverride) { series->setColorStyle(style); series->d_func()->m_themeTracker.colorStyleOverride = false; @@ -1435,7 +1435,7 @@ void QQuickGraphsItem::handleThemeBaseColorsChanged(const QList &colors) if (!colors.size()) return; - for (QAbstract3DSeries *series : m_seriesList) { + for (QAbstract3DSeries *series : std::as_const(m_seriesList)) { if (!series->d_func()->m_themeTracker.baseColorOverride) { series->setBaseColor(colors.at(colorIdx)); series->d_func()->m_themeTracker.baseColorOverride = false; @@ -1452,7 +1452,7 @@ void QQuickGraphsItem::handleThemeBaseGradientsChanged(const QListd_func()->m_themeTracker.baseGradientOverride) { series->setBaseGradient(gradients.at(gradientIdx)); series->d_func()->m_themeTracker.baseGradientOverride = false; @@ -1467,7 +1467,7 @@ void QQuickGraphsItem::handleThemeBaseGradientsChanged(const QListd_func()->m_themeTracker.singleHighlightColorOverride) { series->setSingleHighlightColor(color); series->d_func()->m_themeTracker.singleHighlightColorOverride = false; @@ -1479,7 +1479,7 @@ void QQuickGraphsItem::handleThemeSingleHighlightColorChanged(QColor color) void QQuickGraphsItem::handleThemeSingleHighlightGradientChanged(const QLinearGradient &gradient) { // Set value for series that have not explicitly set this value - for (QAbstract3DSeries *series : m_seriesList) { + for (QAbstract3DSeries *series : std::as_const(m_seriesList)) { if (!series->d_func()->m_themeTracker.singleHighlightGradientOverride) { series->setSingleHighlightGradient(gradient); series->d_func()->m_themeTracker.singleHighlightGradientOverride = false; @@ -1491,7 +1491,7 @@ void QQuickGraphsItem::handleThemeSingleHighlightGradientChanged(const QLinearGr void QQuickGraphsItem::handleThemeMultiHighlightColorChanged(QColor color) { // Set value for series that have not explicitly set this value - for (QAbstract3DSeries *series : m_seriesList) { + for (QAbstract3DSeries *series : std::as_const(m_seriesList)) { if (!series->d_func()->m_themeTracker.multiHighlightColorOverride) { series->setMultiHighlightColor(color); series->d_func()->m_themeTracker.multiHighlightColorOverride = false; @@ -1503,7 +1503,7 @@ void QQuickGraphsItem::handleThemeMultiHighlightColorChanged(QColor color) void QQuickGraphsItem::handleThemeMultiHighlightGradientChanged(const QLinearGradient &gradient) { // Set value for series that have not explicitly set this value - for (QAbstract3DSeries *series : m_seriesList) { + for (QAbstract3DSeries *series : std::as_const(m_seriesList)) { if (!series->d_func()->m_themeTracker.multiHighlightGradientOverride) { series->setMultiHighlightGradient(gradient); series->d_func()->m_themeTracker.multiHighlightGradientOverride = false; @@ -2122,7 +2122,7 @@ qsizetype QQuickGraphsItem::addCustomItem(QCustom3DItem *item) void QQuickGraphsItem::deleteCustomItems() { - for (QCustom3DItem *item : m_customItems) + for (QCustom3DItem *item : std::as_const(m_customItems)) delete item; m_customItems.clear(); m_isCustomDataDirty = true; @@ -2144,7 +2144,7 @@ void QQuickGraphsItem::deleteCustomItem(QCustom3DItem *item) void QQuickGraphsItem::deleteCustomItem(QVector3D position) { // Get the item for the position - for (QCustom3DItem *item : m_customItems) { + for (QCustom3DItem *item : std::as_const(m_customItems)) { if (item->position() == position) deleteCustomItem(item); } @@ -5772,7 +5772,7 @@ bool QQuickGraphsItem::doPicking(QPointF point) QList results = pickAll(point.x(), point.y()); if (!m_customItemList.isEmpty()) { // Try to pick custom item only - for (const auto &result : results) { + for (const auto &result : std::as_const(results)) { QCustom3DItem *customItem = m_customItemList.key(result.objectHit(), nullptr); if (customItem) { @@ -5785,7 +5785,7 @@ bool QQuickGraphsItem::doPicking(QPointF point) } } - for (const auto &result : results) { + for (const auto &result : std::as_const(results)) { if (!result.objectHit()) continue; QString objName = result.objectHit()->objectName(); @@ -5822,7 +5822,7 @@ bool QQuickGraphsItem::doRayPicking(QVector3D origin, QVector3D direction) QList results = rayPickAll(origin, direction); if (!m_customItemList.isEmpty()) { // Try to pick custom item only - for (const auto &result : results) { + for (const auto &result : std::as_const(results)) { QCustom3DItem *customItem = m_customItemList.key(result.objectHit(), nullptr); if (customItem) { @@ -5835,7 +5835,7 @@ bool QQuickGraphsItem::doRayPicking(QVector3D origin, QVector3D direction) } } - for (const auto &result : results) { + for (const auto &result : std::as_const(results)) { if (!result.objectHit()) continue; QString objName = result.objectHit()->objectName();