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

Fix clazy-non-pod-global-static warning 

Doing it this way should not break unity build, unlike
the previous attempt.

Pick-to: 6.9
Change-Id: Ibe7f305ba9e41d1465bad7bbb7fb61860b225a98
Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 4b815129c6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tomi Korpipaa 2025-07-30 10:28:01 +03:00 committed by Qt Cherry-pick Bot
parent 35939f0732
commit 786c7b2c7f
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/global/qgraphsglobal_p.h
View File

@ -34,7 +34,7 @@ static const qreal gradientTextureHeight = 1.;
static const qreal gradientTextureWidth = 4096.;
// Tag to be used to hide a log axis label when edgeLabelsVisible is set to false
// or when an item selection label should not be shown
static const QString hiddenLabelTag = QStringLiteral("õ");
static constexpr auto hiddenLabelTag = u"õ";
QT_END_NAMESPACE

6
src/graphs3d/axis/qlogvalue3daxisformatter.cpp
View File

@ -350,7 +350,7 @@ void QLogValue3DAxisFormatterPrivate::recalculate()
if (m_edgeLabelsVisible)
m_labelStrings << q->stringForValue(qreal(m_min), labelFormat);
else
m_labelStrings << hiddenLabelTag;
m_labelStrings << QString(hiddenLabelTag);
index++;
}
for (int i = 0; i < segmentCount; i++) {
@ -361,14 +361,14 @@ void QLogValue3DAxisFormatterPrivate::recalculate()
m_labelStrings << q->stringForValue(qPow(m_base, minDiff + qreal(i) + logMin),
labelFormat);
} else {
m_labelStrings << hiddenLabelTag;
m_labelStrings << QString(hiddenLabelTag);
}
index++;
}
// Ensure max value doesn't suffer from any rounding errors
m_gridPositions[segmentCount] = 1.0f;
m_labelPositions[segmentCount] = 1.0f;
QString finalLabel = hiddenLabelTag;
QString finalLabel = QString(hiddenLabelTag);
if (m_edgeLabelsVisible || m_evenMaxSegment)
finalLabel = q->stringForValue(qreal(m_max), labelFormat);

2
src/graphs3d/data/qbar3dseries.cpp
View File

@ -730,7 +730,7 @@ void QBar3DSeriesPrivate::createItemLabel()
static const QString seriesNameTag(QStringLiteral("@seriesName"));
if (m_selectedBar == QBar3DSeries::invalidSelectionPosition()) {
m_itemLabel = hiddenLabelTag;
m_itemLabel = QString(hiddenLabelTag);
return;
}

2
src/graphs3d/data/qscatter3dseries.cpp
View File

@ -488,7 +488,7 @@ void QScatter3DSeriesPrivate::createItemLabel()
static const QString seriesNameTag(QStringLiteral("@seriesName"));
if (m_selectedItem == QScatter3DSeries::invalidSelectionIndex()) {
m_itemLabel = hiddenLabelTag;
m_itemLabel = QString(hiddenLabelTag);
return;
}

2
src/graphs3d/data/qsurface3dseries.cpp
View File

@ -667,7 +667,7 @@ void QSurface3DSeriesPrivate::createItemLabel()
static const QString seriesNameTag(QStringLiteral("@seriesName"));
if (m_selectedPoint == QSurface3DSeries::invalidSelectionPosition()) {
m_itemLabel = hiddenLabelTag;
m_itemLabel = QString(hiddenLabelTag);
return;
}

6
src/graphs3d/qml/qquickgraphsbars.cpp
View File

@ -2502,7 +2502,7 @@ void QQuickGraphsBars::updateSelectedBar()
updateItemLabel(m_selectedBarPos);
itemLabel()->setVisible(theme()->labelsVisible());
itemLabel()->setProperty("labelText", label);
if (!label.compare(hiddenLabelTag))
if (!label.compare(QString(hiddenLabelTag)))
itemLabel()->setVisible(false);
if (isSliceEnabled())
updateSliceItemLabel(label, m_selectedBarPos);
@ -2574,7 +2574,7 @@ void QQuickGraphsBars::updateSliceItemLabel(const QString &label, QVector3D posi
slicePos.setZ(.1f);
sliceItemLabel()->setPosition(slicePos);
sliceItemLabel()->setProperty("labelText", label);
if (!label.compare(hiddenLabelTag))
if (!label.compare(QString(hiddenLabelTag)))
sliceItemLabel()->setVisible(false);
sliceItemLabel()->setEulerRotation(QVector3D(0.0f, 0.0f, 90.0f));
sliceItemLabel()->setVisible(theme()->labelsVisible());
@ -2866,7 +2866,7 @@ void QQuickGraphsBars::createBarItemHolders(QBar3DSeries *series,
updateItemLabel(m_selectedBarPos);
itemLabel()->setVisible(theme()->labelsVisible());
itemLabel()->setProperty("labelText", label);
if (!label.compare(hiddenLabelTag))
if (!label.compare(QString(hiddenLabelTag)))
itemLabel()->setVisible(false);
if (isSliceEnabled())
updateSliceItemLabel(label, m_selectedBarPos);

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

@ -3898,7 +3898,7 @@ void QQuickGraphsItem::updateLabels()
obj->setProperty("labelText", labels[labelIndex]);
obj->setProperty("labelWidth", labelsMaxWidth);
obj->setProperty("labelHeight", labelHeight);
if (!labels[i].compare(hiddenLabelTag))
if (!labels[i].compare(QString(hiddenLabelTag)))
obj->setVisible(false);
}
} else if (axisX()->type() == QAbstract3DAxis::AxisType::Category) {
@ -4000,7 +4000,7 @@ void QQuickGraphsItem::updateLabels()
obj->setProperty("labelText", labels[labelIndex]);
obj->setProperty("labelWidth", labelsMaxWidth);
obj->setProperty("labelHeight", labelHeight);
if (!labels[i].compare(hiddenLabelTag))
if (!labels[i].compare(QString(hiddenLabelTag)))
obj->setVisible(false);
}
@ -4144,7 +4144,7 @@ void QQuickGraphsItem::updateLabels()
obj->setProperty("labelText", labels[labelIndex]);
obj->setProperty("labelWidth", labelsMaxWidth);
obj->setProperty("labelHeight", labelHeight);
if (!labels[i].compare(hiddenLabelTag))
if (!labels[i].compare(QString(hiddenLabelTag)))
obj->setVisible(false);
}
} else if (axisZ()->type() == QAbstract3DAxis::AxisType::Category) {
@ -4212,7 +4212,7 @@ void QQuickGraphsItem::updateLabels()
obj->setProperty("labelText", labels[labelIndex]);
obj->setProperty("labelWidth", labelsMaxWidth);
obj->setProperty("labelHeight", labelHeight);
if (!labels[i].compare(hiddenLabelTag))
if (!labels[i].compare(QString(hiddenLabelTag)))
obj->setVisible(false);
}
@ -6904,7 +6904,7 @@ void QQuickGraphsItem::updateSliceLabels(QQuick3DRepeater *horizontalLabel,
obj->setProperty("backgroundVisible", backgroundVisible);
obj->setProperty("backgroundColor", backgroundColor);
obj->setEulerRotation(QVector3D(.0f, .0f, -45.0f));
if (!labels[i].compare(hiddenLabelTag))
if (!labels[i].compare(QString(hiddenLabelTag)))
obj->setVisible(false);
}
} else if (horizontalAxis->type() == QAbstract3DAxis::AxisType::Category) {
@ -6960,7 +6960,7 @@ void QQuickGraphsItem::updateSliceLabels(QQuick3DRepeater *horizontalLabel,
obj->setProperty("labelTextColor", verticalLabelTextColor);
obj->setProperty("backgroundVisible", backgroundVisible);
obj->setProperty("backgroundColor", backgroundColor);
if (!labels[i].compare(hiddenLabelTag))
if (!labels[i].compare(QString(hiddenLabelTag)))
obj->setVisible(false);
}
} else if (verticalAxis->type() == QAbstract3DAxis::AxisType::Category) {

4
src/graphs3d/qml/qquickgraphsscatter.cpp
View File

@ -1962,7 +1962,7 @@ void QQuickGraphsScatter::updateGraph()
updateItemLabel(selectionPosition);
QString label = m_selectedItemSeries->itemLabel();
itemLabel()->setProperty("labelText", label);
if (!label.compare(hiddenLabelTag))
if (!label.compare(QString(hiddenLabelTag)))
itemLabel()->setVisible(false);
}
}
@ -1998,7 +1998,7 @@ void QQuickGraphsScatter::synchData()
if (m_selectedItem != invalidSelectionIndex()) {
QString itemLabelText = m_selectedItemSeries->itemLabel();
itemLabel()->setProperty("labelText", itemLabelText);
if (!itemLabelText.compare(hiddenLabelTag))
if (!itemLabelText.compare(QString(hiddenLabelTag)))
itemLabel()->setVisible(false);
}
setSelectedItemChanged(false);

4
src/graphs3d/qml/qquickgraphssurface.cpp
View File

@ -2611,7 +2611,7 @@ void QQuickGraphsSurface::updateSelectedPoint()
updateItemLabel(labelPosition);
itemLabel()->setProperty("labelText", label);
if (!label.compare(hiddenLabelTag))
if (!label.compare(QString(hiddenLabelTag)))
itemLabel()->setVisible(false);
labelVisible = model->series->isItemLabelVisible();
if (sliceView() && sliceView()->isVisible())
@ -3032,7 +3032,7 @@ void QQuickGraphsSurface::updateSliceItemLabel(const QString &label, QVector3D p
labelPosition.setY(position.y() + .05f);
sliceItemLabel()->setPosition(labelPosition);
sliceItemLabel()->setProperty("labelText", label);
if (!label.compare(hiddenLabelTag))
if (!label.compare(QString(hiddenLabelTag)))
sliceItemLabel()->setVisible(false);
}