summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-03-01 10:21:15 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-03-01 10:17:26 +0000
commitcf685f3ac7fb4e0eb5f1d01231ed95afb7c932ee (patch)
tree2f7d263628aa99345f4adf18319ed5b2f88f33c4
parent2c3cf4b7ebb891221a4a6f2fb9956dd2605d2d66 (diff)
graphgallery example: Do not cast enum values to int in combo item data
Enumerations are now known to the meta type system, no casts are required. Task-number: QTBUG-110698 Change-Id: I02398a5318547b798f9c95f8ed834443b46a58c5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit a4358dabd997e11f7bcd2e4a9437ffaff2a0d46c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/datavisualization/graphgallery/bargraph.cpp12
-rw-r--r--examples/datavisualization/graphgallery/graphmodifier.cpp2
-rw-r--r--examples/datavisualization/graphgallery/scatterdatamodifier.cpp2
-rw-r--r--examples/datavisualization/graphgallery/scattergraph.cpp8
4 files changed, 12 insertions, 12 deletions
diff --git a/examples/datavisualization/graphgallery/bargraph.cpp b/examples/datavisualization/graphgallery/bargraph.cpp
index fcef6286..ef5112f2 100644
--- a/examples/datavisualization/graphgallery/bargraph.cpp
+++ b/examples/datavisualization/graphgallery/bargraph.cpp
@@ -69,12 +69,12 @@ bool BarGraph::initialize()
smoothCheckBox->setChecked(false);
QComboBox *barStyleList = new QComboBox(m_barsWidget);
- barStyleList->addItem(u"Bar"_s, int(QAbstract3DSeries::MeshBar));
- barStyleList->addItem(u"Pyramid"_s, int(QAbstract3DSeries::MeshPyramid));
- barStyleList->addItem(u"Cone"_s, int(QAbstract3DSeries::MeshCone));
- barStyleList->addItem(u"Cylinder"_s, int(QAbstract3DSeries::MeshCylinder));
- barStyleList->addItem(u"Bevel bar"_s, int(QAbstract3DSeries::MeshBevelBar));
- barStyleList->addItem(u"Sphere"_s, int(QAbstract3DSeries::MeshSphere));
+ barStyleList->addItem(u"Bar"_s, QAbstract3DSeries::MeshBar);
+ barStyleList->addItem(u"Pyramid"_s, QAbstract3DSeries::MeshPyramid);
+ barStyleList->addItem(u"Cone"_s, QAbstract3DSeries::MeshCone);
+ barStyleList->addItem(u"Cylinder"_s, QAbstract3DSeries::MeshCylinder);
+ barStyleList->addItem(u"Bevel bar"_s, QAbstract3DSeries::MeshBevelBar);
+ barStyleList->addItem(u"Sphere"_s, QAbstract3DSeries::MeshSphere);
barStyleList->setCurrentIndex(4);
QPushButton *cameraButton = new QPushButton(m_barsWidget);
diff --git a/examples/datavisualization/graphgallery/graphmodifier.cpp b/examples/datavisualization/graphgallery/graphmodifier.cpp
index 19863889..99bd24c9 100644
--- a/examples/datavisualization/graphgallery/graphmodifier.cpp
+++ b/examples/datavisualization/graphgallery/graphmodifier.cpp
@@ -197,7 +197,7 @@ void GraphModifier::changeStyle(int style)
{
QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
if (comboBox) {
- m_barMesh = QAbstract3DSeries::Mesh(comboBox->itemData(style).toInt());
+ m_barMesh = comboBox->itemData(style).value<QAbstract3DSeries::Mesh>();
m_primarySeries->setMesh(m_barMesh);
m_secondarySeries->setMesh(m_barMesh);
m_customData->customSeries()->setMesh(m_barMesh);
diff --git a/examples/datavisualization/graphgallery/scatterdatamodifier.cpp b/examples/datavisualization/graphgallery/scatterdatamodifier.cpp
index edb4cbd4..93c844c9 100644
--- a/examples/datavisualization/graphgallery/scatterdatamodifier.cpp
+++ b/examples/datavisualization/graphgallery/scatterdatamodifier.cpp
@@ -107,7 +107,7 @@ void ScatterDataModifier::changeStyle(int style)
{
QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
if (comboBox) {
- m_style = QAbstract3DSeries::Mesh(comboBox->itemData(style).toInt());
+ m_style = comboBox->itemData(style).value<QAbstract3DSeries::Mesh>();
if (!m_graph->seriesList().isEmpty())
m_graph->seriesList().at(0)->setMesh(m_style);
}
diff --git a/examples/datavisualization/graphgallery/scattergraph.cpp b/examples/datavisualization/graphgallery/scattergraph.cpp
index cbcc082b..ae20d609 100644
--- a/examples/datavisualization/graphgallery/scattergraph.cpp
+++ b/examples/datavisualization/graphgallery/scattergraph.cpp
@@ -70,10 +70,10 @@ bool ScatterGraph::initialize()
smoothCheckBox->setChecked(true);
QComboBox *itemStyleList = new QComboBox(m_scatterWidget);
- itemStyleList->addItem(u"Sphere"_s, int(QAbstract3DSeries::MeshSphere));
- itemStyleList->addItem(u"Cube"_s, int(QAbstract3DSeries::MeshCube));
- itemStyleList->addItem(u"Minimal"_s, int(QAbstract3DSeries::MeshMinimal));
- itemStyleList->addItem(u"Point"_s, int(QAbstract3DSeries::MeshPoint));
+ itemStyleList->addItem(u"Sphere"_s, QAbstract3DSeries::MeshSphere);
+ itemStyleList->addItem(u"Cube"_s, QAbstract3DSeries::MeshCube);
+ itemStyleList->addItem(u"Minimal"_s, QAbstract3DSeries::MeshMinimal);
+ itemStyleList->addItem(u"Point"_s, QAbstract3DSeries::MeshPoint);
itemStyleList->setCurrentIndex(0);
QComboBox *themeList = new QComboBox(m_scatterWidget);