Fix clazy warnings from examples

Pick-to: 6.5
Fixes: QTBUG-110365
Change-Id: I5598b3035d40b375d4913ae14c710d7bb6f52dfb
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

5 files changed, 18 insertions, 14 deletions

diff --git a/examples/datavisualization/bars/graphmodifier.cpp b/examples/datavisualization/bars/graphmodifier.cpp
index 610cc3cc..b0083cfa 100644
--- a/examples/datavisualization/bars/graphmodifier.cpp
+++ b/examples/datavisualization/bars/graphmodifier.cpp
@@ -13,8 +13,6 @@
 #include <QtWidgets/QComboBox>
 #include <QtCore/qmath.h>
 
-const QString celsiusString = QString(QChar(0xB0)) + "C";
-
 //! [0]
 GraphModifier::GraphModifier(Q3DBars *bargraph)
     : m_graph(bargraph),
@@ -51,7 +49,7 @@ GraphModifier::GraphModifier(Q3DBars *bargraph)
     m_temperatureAxis->setSegmentCount(m_segments);
     m_temperatureAxis->setSubSegmentCount(m_subSegments);
     m_temperatureAxis->setRange(m_minval, m_maxval);
-    m_temperatureAxis->setLabelFormat(QString(QStringLiteral("%.1f ") + celsiusString));
+    m_temperatureAxis->setLabelFormat(QString(QStringLiteral("%.1f ") + m_celsiusString));
     m_temperatureAxis->setLabelAutoRotation(30.0f);
     m_temperatureAxis->setTitleVisible(true);
 
diff --git a/examples/datavisualization/bars/graphmodifier.h b/examples/datavisualization/bars/graphmodifier.h
index 319ea40e..c1a6476e 100644
--- a/examples/datavisualization/bars/graphmodifier.h
+++ b/examples/datavisualization/bars/graphmodifier.h
@@ -80,6 +80,7 @@ private:
     float m_defaultAngleY;
     float m_defaultZoom;
     QVector3D m_defaultTarget;
+    const QString m_celsiusString = QString(QChar(0xB0)) + QLatin1String("C");
 };
 
 #endif
diff --git a/examples/datavisualization/customproxy/variantbardatamapping.h b/examples/datavisualization/customproxy/variantbardatamapping.h
index 95d291ed..6a33cee4 100644
--- a/examples/datavisualization/customproxy/variantbardatamapping.h
+++ b/examples/datavisualization/customproxy/variantbardatamapping.h
@@ -11,11 +11,11 @@ class VariantBarDataMapping : public QObject
 {
     Q_OBJECT
     //! [0]
-    Q_PROPERTY(int rowIndex READ rowIndex WRITE setRowIndex)
-    Q_PROPERTY(int columnIndex READ columnIndex WRITE setColumnIndex)
-    Q_PROPERTY(int valueIndex READ valueIndex WRITE setValueIndex)
-    Q_PROPERTY(QStringList rowCategories READ rowCategories WRITE setRowCategories)
-    Q_PROPERTY(QStringList columnCategories READ columnCategories WRITE setColumnCategories)
+    Q_PROPERTY(int rowIndex READ rowIndex WRITE setRowIndex NOTIFY rowIndexChanged)
+    Q_PROPERTY(int columnIndex READ columnIndex WRITE setColumnIndex NOTIFY columnIndexChanged)
+    Q_PROPERTY(int valueIndex READ valueIndex WRITE setValueIndex NOTIFY valueIndexChanged)
+    Q_PROPERTY(QStringList rowCategories READ rowCategories WRITE setRowCategories NOTIFY rowCategoriesChanged)
+    Q_PROPERTY(QStringList columnCategories READ columnCategories WRITE setColumnCategories NOTIFY columnCategoriesChanged)
     //! [0]
 public:
     explicit VariantBarDataMapping();
@@ -47,6 +47,11 @@ public:
                const QStringList &columnCategories);
     //! [2]
 Q_SIGNALS:
+    void rowIndexChanged();
+    void columnIndexChanged();
+    void valueIndexChanged();
+    void rowCategoriesChanged();
+    void columnCategoriesChanged();
     //! [3]
     void mappingChanged();
     //! [3]
diff --git a/examples/datavisualization/scatter/scatterdatamodifier.cpp b/examples/datavisualization/scatter/scatterdatamodifier.cpp
index 3ac2adcc..f2428d32 100644
--- a/examples/datavisualization/scatter/scatterdatamodifier.cpp
+++ b/examples/datavisualization/scatter/scatterdatamodifier.cpp
@@ -77,11 +77,11 @@ void ScatterDataModifier::addData()
 #else
     //! [6]
     float limit = qSqrt(m_itemCount) / 2.0f;
-    for (float i = -limit; i < limit; i++) {
-        for (float j = -limit; j < limit; j++) {
-            ptrToDataArray->setPosition(QVector3D(i + 0.5f,
-                                                  qCos(qDegreesToRadians((i * j) / m_curveDivider)),
-                                                  j + 0.5f));
+    for (int i = -limit; i < limit; i++) {
+        for (int j = -limit; j < limit; j++) {
+            ptrToDataArray->setPosition(QVector3D(float(i) + 0.5f,
+                                                  qCos(qDegreesToRadians(float(i * j) / m_curveDivider)),
+                                                  float(j) + 0.5f));
             ptrToDataArray++;
         }
     }
diff --git a/examples/datavisualization/volumetric/volumetric.cpp b/examples/datavisualization/volumetric/volumetric.cpp
index 8559a8d6..dab8caa8 100644
--- a/examples/datavisualization/volumetric/volumetric.cpp
+++ b/examples/datavisualization/volumetric/volumetric.cpp
@@ -634,7 +634,7 @@ void VolumetricModifier::excavateMineBlock(int textureSize, int dataIndex, int s
                                            QList<uchar> *textureData)
 {
     for (int k = 0; k < size; k++) {
-        int curIndex = dataIndex + (k * textureSize * textureSize / 2);
+        int curIndex = 0;
         for (int l = 0; l < size; l++) {
             curIndex = dataIndex + (k * textureSize * textureSize / 2)
                     + (l * textureSize);