summaryrefslogtreecommitdiffstats
path: root/examples/charts
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-03-10 08:34:25 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-04-06 15:14:33 +0200
commit8a8b69bf140b21d8d5d865ac11d18273fb47da16 (patch)
tree3614ff441bb5bcab7423adf9d84ed02055d03c60 /examples/charts
parentfe003ee4fcaae8ceb877112d63c22bda2e9f06fd (diff)
Update dependencies
qtbase: Adapt to OpenGL split (a64f4b405222527a72fb087226801c52ddf54ef0), add missing Q_MOC_INCLUDE, adapt examples to changed signals. Task-number: QTBUG-74273 Change-Id: I96b7bb67c0403e3aa72debe16fd9965c70f5c806 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'examples/charts')
-rw-r--r--examples/charts/candlestickchart/main.cpp1
-rw-r--r--examples/charts/piechartcustomization/brushtool.cpp2
-rw-r--r--examples/charts/piechartcustomization/mainwidget.cpp11
-rw-r--r--examples/charts/piechartcustomization/pentool.cpp12
4 files changed, 10 insertions, 16 deletions
diff --git a/examples/charts/candlestickchart/main.cpp b/examples/charts/candlestickchart/main.cpp
index 243b0f61..26a26a37 100644
--- a/examples/charts/candlestickchart/main.cpp
+++ b/examples/charts/candlestickchart/main.cpp
@@ -32,6 +32,7 @@
#include <QtCharts/QChartView>
#include <QtCharts/QValueAxis>
#include <QtCore/QDateTime>
+#include <QtCore/QFile>
#include <QtWidgets/QApplication>
#include <QtWidgets/QMainWindow>
diff --git a/examples/charts/piechartcustomization/brushtool.cpp b/examples/charts/piechartcustomization/brushtool.cpp
index d4c1785b..a33674a6 100644
--- a/examples/charts/piechartcustomization/brushtool.cpp
+++ b/examples/charts/piechartcustomization/brushtool.cpp
@@ -62,7 +62,7 @@ BrushTool::BrushTool(QString title, QWidget *parent)
setLayout(layout);
connect(m_colorButton, &QPushButton::clicked, this, &BrushTool::showColorDialog);
- connect(m_styleCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+ connect(m_styleCombo, &QComboBox::currentIndexChanged,
this, &BrushTool::updateStyle);
}
diff --git a/examples/charts/piechartcustomization/mainwidget.cpp b/examples/charts/piechartcustomization/mainwidget.cpp
index 7c3648a2..4a7a1243 100644
--- a/examples/charts/piechartcustomization/mainwidget.cpp
+++ b/examples/charts/piechartcustomization/mainwidget.cpp
@@ -89,7 +89,7 @@ MainWidget::MainWidget(QWidget *parent)
QGroupBox *chartSettings = new QGroupBox("Chart");
chartSettings->setLayout(chartSettingsLayout);
- connect(m_themeComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+ connect(m_themeComboBox, &QComboBox::currentIndexChanged,
this, &MainWidget::updateChartSettings);
connect(m_aaCheckBox, &QCheckBox::toggled, this, &MainWidget::updateChartSettings);
connect(m_animationsCheckBox, &QCheckBox::toggled, this, &MainWidget::updateChartSettings);
@@ -223,15 +223,12 @@ MainWidget::MainWidget(QWidget *parent)
connect(m_labelBrushTool, &BrushTool::changed, this, &MainWidget::updateSliceSettings);
connect(m_sliceLabelVisible, &QCheckBox::toggled, this, &MainWidget::updateSliceSettings);
connect(m_sliceLabelVisible, &QCheckBox::toggled, this, &MainWidget::updateSliceSettings);
- connect(m_sliceLabelArmFactor,
- static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
+ connect(m_sliceLabelArmFactor, &QDoubleSpinBox::valueChanged,
this, &MainWidget::updateSliceSettings);
connect(m_sliceExploded, &QCheckBox::toggled, this, &MainWidget::updateSliceSettings);
- connect(m_sliceExplodedFactor,
- static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
+ connect(m_sliceExplodedFactor, &QDoubleSpinBox::valueChanged,
this, &MainWidget::updateSliceSettings);
- connect(m_labelPosition,
- static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+ connect(m_labelPosition, &QComboBox::currentIndexChanged,
this, &MainWidget::updateSliceSettings);
// create chart view
diff --git a/examples/charts/piechartcustomization/pentool.cpp b/examples/charts/piechartcustomization/pentool.cpp
index 3b160859..36e970d3 100644
--- a/examples/charts/piechartcustomization/pentool.cpp
+++ b/examples/charts/piechartcustomization/pentool.cpp
@@ -73,17 +73,13 @@ PenTool::PenTool(QString title, QWidget *parent)
// Use old style connect on some signals because the signal is overloaded
connect(m_colorButton, &QPushButton::clicked, this, &PenTool::showColorDialog);
- connect(m_widthSpinBox,
- static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
+ connect(m_widthSpinBox, &QDoubleSpinBox::valueChanged,
this, &PenTool::updateWidth);
- connect(m_styleCombo,
- static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+ connect(m_styleCombo, &QComboBox::currentIndexChanged,
this, &PenTool::updateStyle);
- connect(m_capStyleCombo,
- static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+ connect(m_capStyleCombo, &QComboBox::currentIndexChanged,
this, &PenTool::updateCapStyle);
- connect(m_joinStyleCombo,
- static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+ connect(m_joinStyleCombo, &QComboBox::currentIndexChanged,
this, &PenTool::updateJoinStyle);
}