qiurui
/
qtgraphs
mirror of https://github.com/qt/qtgraphs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of some clazy warnings in graphs2d/qsgrenderer folder 

Fix "c++11 range-loop might detach Qt container" warnings.

Pick-to: 6.9
Change-Id: I6cfcff806ce6f2f27b4e2037106f72065bafbfcd
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
(cherry picked from commit 6b6f6581e2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tomi Korpipaa 2025-07-09 12:38:14 +03:00 committed by Qt Cherry-pick Bot
parent 8e26af51f0
commit 6b879d4250
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphs2d/qsgrenderer/axisrenderer.cpp
View File

@ -1198,7 +1198,8 @@ void AxisRenderer::updateBarXAxisLabels(AxisProperties &ax, const QRectF rect)
updateAxisLabelItems(ax.textItems, 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 = ax.textItems[textIndex];
if (axis->isVisible() && axis->labelsVisible()) {
float posX = rect.x() + ((float)textIndex / categoriesCount) * rect.width() + ax.x;
@ -1239,7 +1240,8 @@ void AxisRenderer::updateBarYAxisLabels(AxisProperties &ax, const QRectF rect)
updateAxisLabelItems(ax.textItems, 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 = ax.textItems[textIndex];
if (axis->isVisible() && axis->labelsVisible()) {
float posX = rect.x() + ax.x;

15
src/graphs2d/qsgrenderer/barsrenderer.cpp
View File

@ -256,10 +256,11 @@ void BarsRenderer::updateValueLabels(QBarSeries *series)
void calculateCategoryTotalValues(QBarSeries *series, QList<float> &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++;
@ -305,7 +306,8 @@ void BarsRenderer::updateVerticalBars(QBarSeries *series, qsizetype setCount, qs
int barIndexInSet = 0;
int barSeriesIndex = 0;
QList<QLegendData> 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)
@ -336,7 +338,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 - axisY.minValue) * series->valuesMultiplier();
if (percent) {
@ -417,7 +419,8 @@ void BarsRenderer::updateHorizontalBars(QBarSeries *series, qsizetype setCount,
int barIndexInSet = 0;
int barSerieIndex = 0;
QList<QLegendData> 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)
@ -447,7 +450,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 - axisX.minValue) * series->valuesMultiplier();
if (percent) {

17
src/graphs2d/qsgrenderer/pierenderer.cpp
View File

@ -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;
@ -102,7 +103,8 @@ void PieRenderer::handlePolish(QPieSeries *series)
qreal sliceAngle = series->startAngle();
int sliceIndex = 0;
QList<QLegendData> 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();
@ -227,7 +229,8 @@ void PieRenderer::afterPolish(QList<QAbstractSeries *> &cleanupSeries)
for (auto series : cleanupSeries) {
auto pieSeries = qobject_cast<QPieSeries *>(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();
@ -318,7 +321,7 @@ bool PieRenderer::handleHoverMove(QHoverEvent *event)
bool hovering = false;
QList<QPieSlice *> list = m_activeSlices.keys();
for (const auto &slice : list) {
for (const auto &slice : std::as_const(list)) {
if (!slice->series()->isHoverable())
continue;
@ -360,7 +363,7 @@ void PieRenderer::onSingleTapped(QEventPoint eventPoint, Qt::MouseButton button)
Q_UNUSED(button)
QList<QPieSlice *> list = m_activeSlices.keys();
for (const auto &pieSlice : list) {
for (const auto &pieSlice : std::as_const(list)) {
if (!pieSlice->series()->isSelectable())
continue;
@ -376,7 +379,7 @@ void PieRenderer::onDoubleTapped(QEventPoint eventPoint, Qt::MouseButton button)
Q_UNUSED(button)
QList<QPieSlice *> list = m_activeSlices.keys();
for (const auto &pieSlice : list) {
for (const auto &pieSlice : std::as_const(list)) {
if (!pieSlice->series()->isSelectable())
continue;
@ -390,7 +393,7 @@ void PieRenderer::onDoubleTapped(QEventPoint eventPoint, Qt::MouseButton button)
void PieRenderer::onPressedChanged()
{
QList<QPieSlice *> list = m_activeSlices.keys();
for (const auto &pieSlice : list) {
for (const auto &pieSlice : std::as_const(list)) {
if (!pieSlice->series()->isSelectable())
continue;

4
src/graphs2d/qsgrenderer/pointrenderer.cpp
View File

@ -485,7 +485,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();
@ -650,7 +650,7 @@ void PointRenderer::afterPolish(QList<QAbstractSeries *> &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) {