Fix clazy-non-pod-global-static warning

Pick-to: 6.9 6.10
Change-Id: Iac3ba82a158acd495e76b841bce5bca3ba96c5d5
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>

src/common/global/qgraphsglobal_p.h

@@ -14,6 +14,7 @@
 #ifndef QGRAPHSGLOBAL_P_H
 #define QGRAPHSGLOBAL_P_H
 
+#include <QtCore/qglobalstatic.h>
 #include <QtCore/qstringliteral.h>
 #include <QtGraphs/qgraphsglobal.h>
 #include <QtGraphs/qtgraphsexports.h>
@@ -32,9 +33,6 @@ 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
 

src/graphs3d/axis/qlogvalue3daxisformatter.cpp

@@ -8,6 +8,10 @@
 
 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
@@ -350,7 +354,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++) {
@@ -361,14 +365,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);
 

src/graphs3d/data/qbar3dseries.cpp

@@ -13,6 +13,10 @@
 
 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
@@ -730,7 +734,7 @@ void QBar3DSeriesPrivate::createItemLabel()
     static const QString seriesNameTag(QStringLiteral("@seriesName"));
 
     if (m_selectedBar == QBar3DSeries::invalidSelectionPosition()) {
-        m_itemLabel = hiddenLabelTag;
+        m_itemLabel = *hiddenLabelTag;
         return;
     }
 

src/graphs3d/data/qscatter3dseries.cpp

@@ -9,6 +9,10 @@
 
 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
@@ -437,7 +441,7 @@ void QScatter3DSeriesPrivate::createItemLabel()
     static const QString seriesNameTag(QStringLiteral("@seriesName"));
 
     if (m_selectedItem == QScatter3DSeries::invalidSelectionIndex()) {
-        m_itemLabel = hiddenLabelTag;
+        m_itemLabel = *hiddenLabelTag;
         return;
     }
 

src/graphs3d/data/qsurface3dseries.cpp

@@ -9,6 +9,10 @@
 
 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
@@ -667,7 +671,7 @@ void QSurface3DSeriesPrivate::createItemLabel()
     static const QString seriesNameTag(QStringLiteral("@seriesName"));
 
     if (m_selectedPoint == QSurface3DSeries::invalidSelectionPosition()) {
-        m_itemLabel = hiddenLabelTag;
+        m_itemLabel = *hiddenLabelTag;
         return;
     }
 

src/graphs3d/qml/qquickgraphsbars.cpp

@@ -21,6 +21,12 @@
 
 #include <QtGui/qquaternion.h>
 
+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
@@ -2496,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);
@@ -2568,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());
@@ -2860,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);
@@ -2990,3 +2996,4 @@ void QQuickGraphsBars::updateBarSeriesMargin(QSizeF margin)
     calculateSceneScalingFactors();
     setSeriesVisualsDirty(true);
 }
+QT_END_NAMESPACE

src/graphs3d/qml/qquickgraphsitem.cpp

@@ -45,6 +45,9 @@ QT_BEGIN_NAMESPACE
 
 constexpr float doublePi = static_cast<float>(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
@@ -3898,7 +3901,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) {
@@ -4000,7 +4003,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);
     }
 
@@ -4144,7 +4147,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) {
@@ -4212,7 +4215,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);
     }
 
@@ -6904,7 +6907,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) {
@@ -6960,7 +6963,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) {

src/graphs3d/qml/qquickgraphsscatter.cpp

@@ -25,6 +25,9 @@
 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
@@ -1961,7 +1964,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);
         }
     }
@@ -1997,7 +2000,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);

src/graphs3d/qml/qquickgraphssurface.cpp

@@ -24,6 +24,10 @@
 
 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
@@ -2609,7 +2613,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())
@@ -3026,7 +3030,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);
 }