From ee46f585d92aecc803c0c7b34b2326a0e0446216 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Wed, 30 Jul 2025 10:17:39 +0300 Subject: [PATCH] Revert "Fix clazy-non-pod-global-static warning" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This broke unity build, so it has to be reverted in this form. This reverts commit 6ba5d8f00c0164bc605e19c352482f0452d9143c. Pick-to: 6.9 6.10 Change-Id: I58719cd79c53af764e973b47e115e0f4f02af917 Reviewed-by: Kwanghyo Park Reviewed-by: Tomi Korpipää --- src/common/global/qgraphsglobal_p.h | 4 +++- src/graphs3d/axis/qlogvalue3daxisformatter.cpp | 10 +++------- src/graphs3d/data/qbar3dseries.cpp | 6 +----- src/graphs3d/data/qscatter3dseries.cpp | 6 +----- src/graphs3d/data/qsurface3dseries.cpp | 6 +----- src/graphs3d/qml/qquickgraphsbars.cpp | 13 +++---------- src/graphs3d/qml/qquickgraphsitem.cpp | 15 ++++++--------- src/graphs3d/qml/qquickgraphsscatter.cpp | 7 ++----- src/graphs3d/qml/qquickgraphssurface.cpp | 8 ++------ 9 files changed, 22 insertions(+), 53 deletions(-) diff --git a/src/common/global/qgraphsglobal_p.h b/src/common/global/qgraphsglobal_p.h index d0f3969a..0315fd14 100644 --- a/src/common/global/qgraphsglobal_p.h +++ b/src/common/global/qgraphsglobal_p.h @@ -14,7 +14,6 @@ #ifndef QGRAPHSGLOBAL_P_H #define QGRAPHSGLOBAL_P_H -#include #include #include #include @@ -33,6 +32,9 @@ static const float itemAlpha = 0.0f; static const qreal gradientTextureHeight = 1.; // Default to 4096 just in case we don't get real max from rhi 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("õ"); QT_END_NAMESPACE diff --git a/src/graphs3d/axis/qlogvalue3daxisformatter.cpp b/src/graphs3d/axis/qlogvalue3daxisformatter.cpp index a575f467..093796ee 100644 --- a/src/graphs3d/axis/qlogvalue3daxisformatter.cpp +++ b/src/graphs3d/axis/qlogvalue3daxisformatter.cpp @@ -8,10 +8,6 @@ QT_BEGIN_NAMESPACE -// 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 -Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ")); - /*! * \class QLogValue3DAxisFormatter * \inmodule QtGraphs @@ -354,7 +350,7 @@ void QLogValue3DAxisFormatterPrivate::recalculate() if (m_edgeLabelsVisible) m_labelStrings << q->stringForValue(qreal(m_min), labelFormat); else - m_labelStrings << *hiddenLabelTag; + m_labelStrings << hiddenLabelTag; index++; } for (int i = 0; i < segmentCount; i++) { @@ -365,14 +361,14 @@ void QLogValue3DAxisFormatterPrivate::recalculate() m_labelStrings << q->stringForValue(qPow(m_base, minDiff + qreal(i) + logMin), labelFormat); } else { - m_labelStrings << *hiddenLabelTag; + m_labelStrings << 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 = hiddenLabelTag; if (m_edgeLabelsVisible || m_evenMaxSegment) finalLabel = q->stringForValue(qreal(m_max), labelFormat); diff --git a/src/graphs3d/data/qbar3dseries.cpp b/src/graphs3d/data/qbar3dseries.cpp index 3742e837..d3ad615e 100644 --- a/src/graphs3d/data/qbar3dseries.cpp +++ b/src/graphs3d/data/qbar3dseries.cpp @@ -13,10 +13,6 @@ QT_BEGIN_NAMESPACE -// 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 -Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ")); - /*! * \class QBar3DSeries * \inmodule QtGraphs @@ -734,7 +730,7 @@ void QBar3DSeriesPrivate::createItemLabel() static const QString seriesNameTag(QStringLiteral("@seriesName")); if (m_selectedBar == QBar3DSeries::invalidSelectionPosition()) { - m_itemLabel = *hiddenLabelTag; + m_itemLabel = hiddenLabelTag; return; } diff --git a/src/graphs3d/data/qscatter3dseries.cpp b/src/graphs3d/data/qscatter3dseries.cpp index 05ee92e2..b37df9f1 100644 --- a/src/graphs3d/data/qscatter3dseries.cpp +++ b/src/graphs3d/data/qscatter3dseries.cpp @@ -9,10 +9,6 @@ QT_BEGIN_NAMESPACE -// 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 -Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ")); - /*! * \class QScatter3DSeries * \inmodule QtGraphs @@ -492,7 +488,7 @@ void QScatter3DSeriesPrivate::createItemLabel() static const QString seriesNameTag(QStringLiteral("@seriesName")); if (m_selectedItem == QScatter3DSeries::invalidSelectionIndex()) { - m_itemLabel = *hiddenLabelTag; + m_itemLabel = hiddenLabelTag; return; } diff --git a/src/graphs3d/data/qsurface3dseries.cpp b/src/graphs3d/data/qsurface3dseries.cpp index 03cc7cad..7b0d291d 100644 --- a/src/graphs3d/data/qsurface3dseries.cpp +++ b/src/graphs3d/data/qsurface3dseries.cpp @@ -9,10 +9,6 @@ QT_BEGIN_NAMESPACE -// 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 -Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ")); - /*! * \class QSurface3DSeries * \inmodule QtGraphs @@ -671,7 +667,7 @@ void QSurface3DSeriesPrivate::createItemLabel() static const QString seriesNameTag(QStringLiteral("@seriesName")); if (m_selectedPoint == QSurface3DSeries::invalidSelectionPosition()) { - m_itemLabel = *hiddenLabelTag; + m_itemLabel = hiddenLabelTag; return; } diff --git a/src/graphs3d/qml/qquickgraphsbars.cpp b/src/graphs3d/qml/qquickgraphsbars.cpp index 92ebfad1..09bec603 100644 --- a/src/graphs3d/qml/qquickgraphsbars.cpp +++ b/src/graphs3d/qml/qquickgraphsbars.cpp @@ -21,12 +21,6 @@ #include -QT_BEGIN_NAMESPACE - -// 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 -Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ")); - /*! * \qmltype Bars3D * \inherits GraphsItem3D @@ -2508,7 +2502,7 @@ void QQuickGraphsBars::updateSelectedBar() updateItemLabel(m_selectedBarPos); itemLabel()->setVisible(theme()->labelsVisible()); itemLabel()->setProperty("labelText", label); - if (!label.compare(*hiddenLabelTag)) + if (!label.compare(hiddenLabelTag)) itemLabel()->setVisible(false); if (isSliceEnabled()) updateSliceItemLabel(label, m_selectedBarPos); @@ -2580,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(hiddenLabelTag)) sliceItemLabel()->setVisible(false); sliceItemLabel()->setEulerRotation(QVector3D(0.0f, 0.0f, 90.0f)); sliceItemLabel()->setVisible(theme()->labelsVisible()); @@ -2872,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(hiddenLabelTag)) itemLabel()->setVisible(false); if (isSliceEnabled()) updateSliceItemLabel(label, m_selectedBarPos); @@ -3002,4 +2996,3 @@ void QQuickGraphsBars::updateBarSeriesMargin(QSizeF margin) calculateSceneScalingFactors(); setSeriesVisualsDirty(true); } -QT_END_NAMESPACE diff --git a/src/graphs3d/qml/qquickgraphsitem.cpp b/src/graphs3d/qml/qquickgraphsitem.cpp index 1d249633..afe219e9 100644 --- a/src/graphs3d/qml/qquickgraphsitem.cpp +++ b/src/graphs3d/qml/qquickgraphsitem.cpp @@ -45,9 +45,6 @@ QT_BEGIN_NAMESPACE constexpr float doublePi = static_cast(M_PI) * 2.0f; constexpr float polarRoundness = 64.0f; -// 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 -Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ")); /*! * \qmltype GraphsItem3D @@ -3901,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(hiddenLabelTag)) obj->setVisible(false); } } else if (axisX()->type() == QAbstract3DAxis::AxisType::Category) { @@ -4003,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(hiddenLabelTag)) obj->setVisible(false); } @@ -4147,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(hiddenLabelTag)) obj->setVisible(false); } } else if (axisZ()->type() == QAbstract3DAxis::AxisType::Category) { @@ -4215,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(hiddenLabelTag)) obj->setVisible(false); } @@ -6907,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(hiddenLabelTag)) obj->setVisible(false); } } else if (horizontalAxis->type() == QAbstract3DAxis::AxisType::Category) { @@ -6963,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(hiddenLabelTag)) obj->setVisible(false); } } else if (verticalAxis->type() == QAbstract3DAxis::AxisType::Category) { diff --git a/src/graphs3d/qml/qquickgraphsscatter.cpp b/src/graphs3d/qml/qquickgraphsscatter.cpp index 59a9e49f..53af30e2 100644 --- a/src/graphs3d/qml/qquickgraphsscatter.cpp +++ b/src/graphs3d/qml/qquickgraphsscatter.cpp @@ -25,9 +25,6 @@ QT_BEGIN_NAMESPACE static const int insertRemoveRecordReserveSize = 31; -// 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 -Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ")); /*! * \qmltype Scatter3D @@ -1965,7 +1962,7 @@ void QQuickGraphsScatter::updateGraph() updateItemLabel(selectionPosition); QString label = m_selectedItemSeries->itemLabel(); itemLabel()->setProperty("labelText", label); - if (!label.compare(*hiddenLabelTag)) + if (!label.compare(hiddenLabelTag)) itemLabel()->setVisible(false); } } @@ -2001,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(hiddenLabelTag)) itemLabel()->setVisible(false); } setSelectedItemChanged(false); diff --git a/src/graphs3d/qml/qquickgraphssurface.cpp b/src/graphs3d/qml/qquickgraphssurface.cpp index d9aa604f..725252f2 100644 --- a/src/graphs3d/qml/qquickgraphssurface.cpp +++ b/src/graphs3d/qml/qquickgraphssurface.cpp @@ -24,10 +24,6 @@ QT_BEGIN_NAMESPACE -// 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 -Q_GLOBAL_STATIC(QString, hiddenLabelTag, QStringLiteral("õ")); - /*! * \qmltype Surface3D * \inherits GraphsItem3D @@ -2619,7 +2615,7 @@ void QQuickGraphsSurface::updateSelectedPoint() updateItemLabel(labelPosition); itemLabel()->setProperty("labelText", label); - if (!label.compare(*hiddenLabelTag)) + if (!label.compare(hiddenLabelTag)) itemLabel()->setVisible(false); labelVisible = model->series->isItemLabelVisible(); if (sliceView() && sliceView()->isVisible()) @@ -3040,7 +3036,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(hiddenLabelTag)) sliceItemLabel()->setVisible(false); }