From c9dda868e4ab70fe8363f7658d8d91ea5afffdf5 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Wed, 9 Jul 2025 12:38:14 +0300 Subject: [PATCH] Get rid of some clazy warnings in graphs2d/qsgrenderer folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix "c++11 range-loop might detach Qt container" warnings. Change-Id: I6cfcff806ce6f2f27b4e2037106f72065bafbfcd Reviewed-by: Jere Tuliniemi (cherry picked from commit 6b6f6581e25d1f2ea2dd541d92f294b1981445bb) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 6b879d4250c77a8ac010cd639a742e2a5e68566a) Reviewed-by: Tomi Korpipää --- src/graphs2d/qsgrenderer/axisrenderer.cpp | 6 ++++-- src/graphs2d/qsgrenderer/barsrenderer.cpp | 15 +++++++++------ src/graphs2d/qsgrenderer/pierenderer.cpp | 17 ++++++++++------- src/graphs2d/qsgrenderer/pointrenderer.cpp | 4 ++-- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/graphs2d/qsgrenderer/axisrenderer.cpp b/src/graphs2d/qsgrenderer/axisrenderer.cpp index 5e0cc741..aeefb1ba 100644 --- a/src/graphs2d/qsgrenderer/axisrenderer.cpp +++ b/src/graphs2d/qsgrenderer/axisrenderer.cpp @@ -871,7 +871,8 @@ void AxisRenderer::updateBarXAxisLabels(QBarCategoryAxis *axis, const QRectF rec updateAxisLabelItems(m_xAxisTextItems, categoriesCount, axis->labelDelegate()); int textIndex = 0; - for (auto category : axis->categories()) { + auto categories = axis->categories(); + for (const auto &category : std::as_const(categories)) { auto &textItem = m_xAxisTextItems[textIndex]; if (axis->isVisible() && axis->labelsVisible()) { float posX = rect.x() + ((float)textIndex / categoriesCount) * rect.width(); @@ -906,7 +907,8 @@ void AxisRenderer::updateBarYAxisLabels(QBarCategoryAxis *axis, const QRectF rec updateAxisLabelItems(m_yAxisTextItems, categoriesCount, axis->labelDelegate()); int textIndex = 0; - for (auto category : axis->categories()) { + auto categories = axis->categories(); + for (const auto &category : std::as_const(categories)) { auto &textItem = m_yAxisTextItems[textIndex]; if (axis->isVisible() && axis->labelsVisible()) { float posX = rect.x(); diff --git a/src/graphs2d/qsgrenderer/barsrenderer.cpp b/src/graphs2d/qsgrenderer/barsrenderer.cpp index c76e3ff8..e5d23e8f 100644 --- a/src/graphs2d/qsgrenderer/barsrenderer.cpp +++ b/src/graphs2d/qsgrenderer/barsrenderer.cpp @@ -254,10 +254,11 @@ void BarsRenderer::updateValueLabels(QBarSeries *series) void calculateCategoryTotalValues(QBarSeries *series, QList &totalValues, qsizetype valuesPerSet) { totalValues.fill(0, valuesPerSet); - for (auto s : series->barSets()) { + auto barsets = series->barSets(); + for (auto s : std::as_const(barsets)) { QVariantList v = s->values(); int setIndex = 0; - for (auto variantValue : std::as_const(v)) { + for (const auto &variantValue : std::as_const(v)) { if (setIndex < totalValues.size()) totalValues[setIndex] += variantValue.toReal(); setIndex++; @@ -303,7 +304,8 @@ void BarsRenderer::updateVerticalBars(QBarSeries *series, qsizetype setCount, qs int barIndexInSet = 0; int barSeriesIndex = 0; QList legendDataList; - for (auto s : series->barSets()) { + auto barsets = series->barSets(); + for (auto s : std::as_const(barsets)) { QVariantList v = s->values(); qsizetype valuesCount = v.size(); if (valuesCount == 0) @@ -332,7 +334,7 @@ void BarsRenderer::updateVerticalBars(QBarSeries *series, qsizetype setCount, qs color.setAlpha(color.alpha() * series->opacity()); borderColor.setAlpha(borderColor.alpha() * series->opacity()); const auto selectedBars = s->selectedBars(); - for (auto variantValue : std::as_const(v)) { + for (const auto &variantValue : std::as_const(v)) { const float realValue = variantValue.toReal(); float value = (realValue - m_graph->m_axisRenderer->m_axisVerticalMinValue) * series->valuesMultiplier(); if (percent) { @@ -413,7 +415,8 @@ void BarsRenderer::updateHorizontalBars(QBarSeries *series, qsizetype setCount, int barIndexInSet = 0; int barSerieIndex = 0; QList legendDataList; - for (auto s : series->barSets()) { + auto barsets = series->barSets(); + for (auto s : std::as_const(barsets)) { QVariantList v = s->values(); qsizetype valuesCount = v.size(); if (valuesCount == 0) @@ -441,7 +444,7 @@ void BarsRenderer::updateHorizontalBars(QBarSeries *series, qsizetype setCount, color.setAlpha(color.alpha() * series->opacity()); borderColor.setAlpha(borderColor.alpha() * series->opacity()); const auto selectedBars = s->selectedBars(); - for (auto variantValue : std::as_const(v)) { + for (const auto &variantValue : std::as_const(v)) { const float realValue = variantValue.toReal(); float value = (realValue - m_graph->m_axisRenderer->m_axisHorizontalMinValue) * series->valuesMultiplier(); if (percent) { diff --git a/src/graphs2d/qsgrenderer/pierenderer.cpp b/src/graphs2d/qsgrenderer/pierenderer.cpp index fa3a3dc3..59194905 100644 --- a/src/graphs2d/qsgrenderer/pierenderer.cpp +++ b/src/graphs2d/qsgrenderer/pierenderer.cpp @@ -40,7 +40,8 @@ void PieRenderer::setSize(QSizeF size) void PieRenderer::handlePolish(QPieSeries *series) { - for (QPieSlice *slice : series->slices()) { + auto slices = series->slices(); + for (QPieSlice *slice : std::as_const(slices)) { QPieSlicePrivate *d = slice->d_func(); QQuickShapePath *shapePath = d->m_shapePath; QQuickShapePath *labelPath = d->m_labelPath; @@ -100,7 +101,8 @@ void PieRenderer::handlePolish(QPieSeries *series) qreal sliceAngle = series->startAngle(); int sliceIndex = 0; QList legendDataList; - for (QPieSlice *slice : series->slices()) { + auto slicelist = series->slices(); + for (QPieSlice *slice : std::as_const(slicelist)) { m_painterPath.clear(); QPieSlicePrivate *d = slice->d_func(); @@ -225,7 +227,8 @@ void PieRenderer::afterPolish(QList &cleanupSeries) for (auto series : cleanupSeries) { auto pieSeries = qobject_cast(series); if (pieSeries) { - for (QPieSlice *slice : pieSeries->slices()) { + auto slices = pieSeries->slices(); + for (QPieSlice *slice : std::as_const(slices)) { QPieSlicePrivate *d = slice->d_func(); auto labelElements = d->m_labelPath->pathElements(); auto shapeElements = d->m_shapePath->pathElements(); @@ -316,7 +319,7 @@ bool PieRenderer::handleHoverMove(QHoverEvent *event) bool hovering = false; QList list = m_activeSlices.keys(); - for (const auto &slice : list) { + for (const auto &slice : std::as_const(list)) { if (!slice->series()->isHoverable()) continue; @@ -355,7 +358,7 @@ void PieRenderer::onSingleTapped(QEventPoint eventPoint, Qt::MouseButton button) Q_UNUSED(button) QList list = m_activeSlices.keys(); - for (const auto &pieSlice : list) { + for (const auto &pieSlice : std::as_const(list)) { if (!pieSlice->series()->isSelectable()) continue; @@ -371,7 +374,7 @@ void PieRenderer::onDoubleTapped(QEventPoint eventPoint, Qt::MouseButton button) Q_UNUSED(button) QList list = m_activeSlices.keys(); - for (const auto &pieSlice : list) { + for (const auto &pieSlice : std::as_const(list)) { if (!pieSlice->series()->isSelectable()) continue; @@ -385,7 +388,7 @@ void PieRenderer::onDoubleTapped(QEventPoint eventPoint, Qt::MouseButton button) void PieRenderer::onPressedChanged() { QList list = m_activeSlices.keys(); - for (const auto &pieSlice : list) { + for (const auto &pieSlice : std::as_const(list)) { if (!pieSlice->series()->isSelectable()) continue; diff --git a/src/graphs2d/qsgrenderer/pointrenderer.cpp b/src/graphs2d/qsgrenderer/pointrenderer.cpp index 75f34edc..f07872ee 100644 --- a/src/graphs2d/qsgrenderer/pointrenderer.cpp +++ b/src/graphs2d/qsgrenderer/pointrenderer.cpp @@ -450,7 +450,7 @@ void PointRenderer::handlePolish(QXYSeries *series) group->shapePath->setPath(painterPath); } - for (auto m : group->markers) + for (auto m : std::as_const(group->markers)) m->deleteLater(); group->markers.clear(); @@ -614,7 +614,7 @@ void PointRenderer::afterPolish(QList &cleanupSeries) if (xySeries && m_groups.contains(xySeries)) { auto group = m_groups.value(xySeries); - for (auto marker : group->markers) + for (auto marker : std::as_const(group->markers)) marker->deleteLater(); if (group->shapePath) {