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 qquickgraphsitem.cpp 

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

Pick-to: 6.9
Change-Id: I43541eaa76bd8150acf41ce7236ecfe3176ee873
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Niko Korkala <niko.korkala@qt.io>
(cherry picked from commit 8b99b8ae06)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tomi Korpipaa 2025-07-09 12:10:01 +03:00 committed by Qt Cherry-pick Bot
parent 7ad277b1e3
commit 8354c2f11e
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/graphs3d/qml/qquickgraphsitem.cpp
View File

@ -1423,7 +1423,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;
@ -1440,7 +1440,7 @@ void QQuickGraphsItem::handleThemeBaseColorsChanged(const QList<QColor> &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;
@ -1457,7 +1457,7 @@ void QQuickGraphsItem::handleThemeBaseGradientsChanged(const QList<QLinearGradie
{
int gradientIdx = 0;
// 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.baseGradientOverride) {
series->setBaseGradient(gradients.at(gradientIdx));
series->d_func()->m_themeTracker.baseGradientOverride = false;
@ -1472,7 +1472,7 @@ void QQuickGraphsItem::handleThemeBaseGradientsChanged(const QList<QLinearGradie
void QQuickGraphsItem::handleThemeSingleHighlightColorChanged(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.singleHighlightColorOverride) {
series->setSingleHighlightColor(color);
series->d_func()->m_themeTracker.singleHighlightColorOverride = false;
@ -1484,7 +1484,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;
@ -1496,7 +1496,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;
@ -1508,7 +1508,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;
@ -2173,7 +2173,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;
@ -2195,7 +2195,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);
}
@ -5913,7 +5913,7 @@ bool QQuickGraphsItem::doPicking(QPointF point)
QList<QQuick3DPickResult> 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) {
@ -5926,7 +5926,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();
@ -5963,7 +5963,7 @@ bool QQuickGraphsItem::doRayPicking(QVector3D origin, QVector3D direction)
QList<QQuick3DPickResult> 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) {
@ -5976,7 +5976,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();