Fix deprecated uses of QScopedPointer

By changing it to unique_ptr.

Fixes: QTBUG-102140
Change-Id: I579a41e62832b026fd7ec682b91a42738030b675
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 24fa9b3b0ba97d065b1705c7698e623b4ddc72a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

13 files changed, 37 insertions, 32 deletions

diff --git a/src/charts/areachart/qareaseries.cpp b/src/charts/areachart/qareaseries.cpp
index efd75736..9685c915 100644
--- a/src/charts/areachart/qareaseries.cpp
+++ b/src/charts/areachart/qareaseries.cpp
@@ -465,8 +465,8 @@ void QAreaSeries::setUpperSeries(QLineSeries *series)
         if (series)
             series->d_ptr->setBlockOpenGL(true);
         d->m_upperSeries = series;
-        if (!d->m_item.isNull())
-            static_cast<AreaChartItem *>(d->m_item.data())->setUpperSeries(series);
+        if (d->m_item)
+            static_cast<AreaChartItem *>(d->m_item.get())->setUpperSeries(series);
     }
 }
 
@@ -486,8 +486,8 @@ void QAreaSeries::setLowerSeries(QLineSeries *series)
         if (series)
             series->d_ptr->setBlockOpenGL(true);
         d->m_lowerSeries = series;
-        if (!d->m_item.isNull())
-            static_cast<AreaChartItem *>(d->m_item.data())->setLowerSeries(series);
+        if (d->m_item)
+            static_cast<AreaChartItem *>(d->m_item.get())->setLowerSeries(series);
     }
 }
 
@@ -755,7 +755,7 @@ void  QAreaSeriesPrivate::initializeAnimations(QChart::AnimationOptions options,
                                                QEasingCurve &curve)
 {
     Q_Q(QAreaSeries);
-    AreaChartItem *area = static_cast<AreaChartItem *>(m_item.data());
+    AreaChartItem *area = static_cast<AreaChartItem *>(m_item.get());
 
     if (q->upperSeries() && area->upperLineItem()->animation())
         area->upperLineItem()->animation()->stopAndDestroyLater();
diff --git a/src/charts/axis/qabstractaxis.cpp b/src/charts/axis/qabstractaxis.cpp
index 6def930b..156c4c8e 100644
--- a/src/charts/axis/qabstractaxis.cpp
+++ b/src/charts/axis/qabstractaxis.cpp
@@ -1156,7 +1156,7 @@ void QAbstractAxisPrivate::initializeGraphics(QGraphicsItem* parent)
 void QAbstractAxisPrivate::initializeAnimations(QChart::AnimationOptions options, int duration,
                                                 QEasingCurve &curve)
 {
-    ChartAxisElement *axis = m_item.data();
+    ChartAxisElement *axis = m_item.get();
     Q_ASSERT(axis);
     if (axis->animation())
         axis->animation()->stopAndDestroyLater();
diff --git a/src/charts/axis/qabstractaxis_p.h b/src/charts/axis/qabstractaxis_p.h
index 1249602e..2599a58a 100644
--- a/src/charts/axis/qabstractaxis_p.h
+++ b/src/charts/axis/qabstractaxis_p.h
@@ -45,6 +45,8 @@
 #include <QtCharts/private/qchartglobal_p.h>
 #include <QtCore/QDebug>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 class QGraphicsItem;
 QT_END_NAMESPACE
@@ -87,7 +89,7 @@ public:
     virtual qreal min() = 0;
     virtual qreal max() = 0;
 
-    ChartAxisElement *axisItem() { return m_item.data(); }
+    ChartAxisElement *axisItem() { return m_item.get(); }
 
 public Q_SLOTS:
     void handleRangeChanged(qreal min, qreal max);
@@ -98,7 +100,7 @@ Q_SIGNALS:
 protected:
     QAbstractAxis *q_ptr;
     QChart *m_chart = nullptr;
-    QScopedPointer<ChartAxisElement> m_item;
+    std::unique_ptr<ChartAxisElement> m_item;
 
 private:
     QList<QAbstractSeries*> m_series;
diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp
index bbf30329..270953b5 100644
--- a/src/charts/barchart/qabstractbarseries.cpp
+++ b/src/charts/barchart/qabstractbarseries.cpp
@@ -1107,7 +1107,7 @@ void QAbstractBarSeriesPrivate::initializeAxes()
     }
 
     // Make sure series animations are reset when axes change
-    AbstractBarChartItem *item = qobject_cast<AbstractBarChartItem *>(m_item.data());
+    AbstractBarChartItem *item = qobject_cast<AbstractBarChartItem *>(m_item.get());
     if (item)
         item->resetAnimation();
 }
@@ -1190,7 +1190,7 @@ void QAbstractBarSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bo
     // with single bar series with a lot of sets colored as they always have been.
     int actualIndex = 0;
     int firstSeriesSetCount = m_barSets.count();
-    if (!m_item.isNull()) {
+    if (m_item) {
         auto seriesMap = m_item->themeManager()->seriesMap();
         int lowestSeries = index;
         for (auto it = seriesMap.cbegin(), end = seriesMap.cend(); it != end; ++it) {
@@ -1260,7 +1260,7 @@ void QAbstractBarSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bo
 void QAbstractBarSeriesPrivate::initializeAnimations(QChart::AnimationOptions options, int duration,
                                                      QEasingCurve &curve)
 {
-    AbstractBarChartItem *bar = static_cast<AbstractBarChartItem *>(m_item.data());
+    AbstractBarChartItem *bar = static_cast<AbstractBarChartItem *>(m_item.get());
     Q_ASSERT(bar);
     if (bar->animation())
         bar->animation()->stopAndDestroyLater();
diff --git a/src/charts/boxplotchart/qboxplotseries.cpp b/src/charts/boxplotchart/qboxplotseries.cpp
index 531bcf72..02baf873 100644
--- a/src/charts/boxplotchart/qboxplotseries.cpp
+++ b/src/charts/boxplotchart/qboxplotseries.cpp
@@ -509,7 +509,7 @@ void QBoxPlotSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool f
 void QBoxPlotSeriesPrivate::initializeAnimations(QChart::AnimationOptions options, int duration,
                                                  QEasingCurve &curve)
 {
-    BoxPlotChartItem *item = static_cast<BoxPlotChartItem *>(m_item.data());
+    BoxPlotChartItem *item = static_cast<BoxPlotChartItem *>(m_item.get());
     Q_ASSERT(item);
     if (item->animation())
         item->animation()->stopAndDestroyLater();
@@ -547,7 +547,7 @@ void QBoxPlotSeriesPrivate::handleSeriesRemove(QAbstractSeries *series)
 
     // Test if series removed is me, then don't do anything
     if (q != removedSeries) {
-        BoxPlotChartItem *item = static_cast<BoxPlotChartItem *>(m_item.data());
+        BoxPlotChartItem *item = static_cast<BoxPlotChartItem *>(m_item.get());
         if (item) {
             item->m_seriesCount = item->m_seriesCount - 1;
             if (removedSeries->d_func()->m_index < m_index) {
@@ -566,7 +566,7 @@ void QBoxPlotSeriesPrivate::handleSeriesChange(QAbstractSeries *series)
 
     Q_Q(QBoxPlotSeries);
 
-    BoxPlotChartItem *boxPlot = static_cast<BoxPlotChartItem *>(m_item.data());
+    BoxPlotChartItem *boxPlot = static_cast<BoxPlotChartItem *>(m_item.get());
 
     if (m_chart) {
         QList<QAbstractSeries *> serieses = m_chart->series();
diff --git a/src/charts/candlestickchart/qcandlestickseries.cpp b/src/charts/candlestickchart/qcandlestickseries.cpp
index 96335a02..6307e518 100644
--- a/src/charts/candlestickchart/qcandlestickseries.cpp
+++ b/src/charts/candlestickchart/qcandlestickseries.cpp
@@ -1011,7 +1011,7 @@ void QCandlestickSeriesPrivate::initializeGraphics(QGraphicsItem *parent)
 void QCandlestickSeriesPrivate::initializeAnimations(QChart::AnimationOptions options, int duration,
                                                      QEasingCurve &curve)
 {
-    CandlestickChartItem *item = static_cast<CandlestickChartItem *>(m_item.data());
+    CandlestickChartItem *item = static_cast<CandlestickChartItem *>(m_item.get());
     Q_ASSERT(item);
 
     if (item->animation())
@@ -1118,7 +1118,7 @@ void QCandlestickSeriesPrivate::handleSeriesChange(QAbstractSeries *series)
     Q_UNUSED(series);
 
     if (m_chart) {
-        CandlestickChartItem *item = static_cast<CandlestickChartItem *>(m_item.data());
+        CandlestickChartItem *item = static_cast<CandlestickChartItem *>(m_item.get());
         if (item)
             item->handleCandlestickSeriesChange();
     }
@@ -1136,7 +1136,7 @@ void QCandlestickSeriesPrivate::handleSeriesRemove(QAbstractSeries *series)
     }
 
     if (q != removedSeries) {
-        CandlestickChartItem *item = static_cast<CandlestickChartItem *>(m_item.data());
+        CandlestickChartItem *item = static_cast<CandlestickChartItem *>(m_item.get());
         if (item)
             item->handleCandlestickSeriesChange();
     }
diff --git a/src/charts/chartpresenter.cpp b/src/charts/chartpresenter.cpp
index b33a3355..969b2c68 100644
--- a/src/charts/chartpresenter.cpp
+++ b/src/charts/chartpresenter.cpp
@@ -138,7 +138,7 @@ void ChartPresenter::handleAxisAdded(QAbstractAxis *axis)
 
 void ChartPresenter::handleAxisRemoved(QAbstractAxis *axis)
 {
-    ChartAxisElement *item = axis->d_ptr->m_item.take();
+    ChartAxisElement *item = axis->d_ptr->m_item.release();
     if (item->animation())
         item->animation()->stopAndDestroyLater();
     item->hide();
@@ -169,7 +169,7 @@ void ChartPresenter::handleSeriesAdded(QAbstractSeries *series)
 
 void ChartPresenter::handleSeriesRemoved(QAbstractSeries *series)
 {
-    ChartItem *chart  = series->d_ptr->m_item.take();
+    ChartItem *chart = series->d_ptr->m_item.release();
     chart->hide();
     chart->cleanup();
     series->disconnect(chart);
diff --git a/src/charts/piechart/qpieseries.cpp b/src/charts/piechart/qpieseries.cpp
index a031f3d4..77402cdb 100644
--- a/src/charts/piechart/qpieseries.cpp
+++ b/src/charts/piechart/qpieseries.cpp
@@ -996,7 +996,7 @@ void QPieSeriesPrivate::initializeGraphics(QGraphicsItem* parent)
 void QPieSeriesPrivate::initializeAnimations(QChart::AnimationOptions options,
                                              int duration, QEasingCurve &curve)
 {
-    PieChartItem *item = static_cast<PieChartItem *>(m_item.data());
+    PieChartItem *item = static_cast<PieChartItem *>(m_item.get());
     Q_ASSERT(item);
     if (item->animation())
         item->animation()->stopAndDestroyLater();
diff --git a/src/charts/qabstractseries.cpp b/src/charts/qabstractseries.cpp
index c3d5cd7d..0af48070 100644
--- a/src/charts/qabstractseries.cpp
+++ b/src/charts/qabstractseries.cpp
@@ -416,8 +416,8 @@ QList<QAbstractAxis*> QAbstractSeries::attachedAxes()
 
 QAbstractSeriesPrivate::QAbstractSeriesPrivate(QAbstractSeries *q)
     : q_ptr(q),
-      m_chart(0),
-      m_item(0),
+      m_chart(nullptr),
+      m_item(nullptr),
       m_domain(new XYDomain()),
       m_visible(true),
       m_opacity(1.0),
@@ -434,10 +434,11 @@ void QAbstractSeriesPrivate::setDomain(AbstractDomain* domain)
 {
     Q_ASSERT(domain);
     if(m_domain.data()!=domain) {
-        if(!m_item.isNull()) QObject::disconnect(m_domain.data(), SIGNAL(updated()), m_item.data(), SLOT(handleDomainUpdated()));
+        if (m_item)
+            QObject::disconnect(m_domain.data(), SIGNAL(updated()), m_item.get(), SLOT(handleDomainUpdated()));
         m_domain.reset(domain);
-        if(!m_item.isNull()) {
-            QObject::connect(m_domain.data(), SIGNAL(updated()),m_item.data(), SLOT(handleDomainUpdated()));
+        if (m_item) {
+            QObject::connect(m_domain.data(), SIGNAL(updated()), m_item.get(), SLOT(handleDomainUpdated()));
             m_item->handleDomainUpdated();
         }
     }
@@ -455,9 +456,9 @@ ChartPresenter *QAbstractSeriesPrivate::presenter() const
 
 void QAbstractSeriesPrivate::initializeGraphics(QGraphicsItem* parent)
 {
-    Q_ASSERT(!m_item.isNull());
+    Q_ASSERT(m_item);
     Q_UNUSED(parent);
-    QObject::connect(m_domain.data(), SIGNAL(updated()),m_item.data(), SLOT(handleDomainUpdated()));
+    QObject::connect(m_domain.data(), SIGNAL(updated()), m_item.get(), SLOT(handleDomainUpdated()));
 }
 
 void QAbstractSeriesPrivate::initializeAnimations(QChart::AnimationOptions options, int duration,
diff --git a/src/charts/qabstractseries_p.h b/src/charts/qabstractseries_p.h
index 5b05f10d..f5c74849 100644
--- a/src/charts/qabstractseries_p.h
+++ b/src/charts/qabstractseries_p.h
@@ -44,6 +44,8 @@
 #include <private/abstractdomain_p.h>
 #include <QtCharts/private/qchartglobal_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 class QGraphicsItem;
 QT_END_NAMESPACE
@@ -81,7 +83,7 @@ public:
     virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation) const = 0;
     virtual QAbstractAxis* createDefaultAxis(Qt::Orientation) const = 0;
 
-    ChartItem* chartItem() { return m_item.data(); }
+    ChartItem* chartItem() { return m_item.get(); }
 
     virtual void setDomain(AbstractDomain* domain);
     AbstractDomain* domain() { return m_domain.data(); }
@@ -99,7 +101,7 @@ Q_SIGNALS:
 protected:
     QAbstractSeries *q_ptr;
     QChart *m_chart;
-    QScopedPointer<ChartItem> m_item;
+    std::unique_ptr<ChartItem> m_item;
     QList<QAbstractAxis*> m_axes;
 
 private:
diff --git a/src/charts/scatterchart/qscatterseries.cpp b/src/charts/scatterchart/qscatterseries.cpp
index 44ab2a49..6c86afe8 100644
--- a/src/charts/scatterchart/qscatterseries.cpp
+++ b/src/charts/scatterchart/qscatterseries.cpp
@@ -372,7 +372,7 @@ void QScatterSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool f
 void QScatterSeriesPrivate::initializeAnimations(QChart::AnimationOptions options, int duration,
                                                  QEasingCurve &curve)
 {
-    ScatterChartItem *item = static_cast<ScatterChartItem *>(m_item.data());
+    ScatterChartItem *item = static_cast<ScatterChartItem *>(m_item.get());
     Q_ASSERT(item);
 
     if (item->animation())
diff --git a/src/charts/splinechart/qsplineseries.cpp b/src/charts/splinechart/qsplineseries.cpp
index a57b6097..26686717 100644
--- a/src/charts/splinechart/qsplineseries.cpp
+++ b/src/charts/splinechart/qsplineseries.cpp
@@ -173,7 +173,7 @@ void QSplineSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool fo
 void QSplineSeriesPrivate::initializeAnimations(QChart::AnimationOptions options,
                                                 int duration, QEasingCurve &curve)
 {
-    SplineChartItem *item = static_cast<SplineChartItem *>(m_item.data());
+    SplineChartItem *item = static_cast<SplineChartItem *>(m_item.get());
     Q_ASSERT(item);
     if (item->animation())
         item->animation()->stopAndDestroyLater();
diff --git a/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp
index 5f15f0ad..7de917f4 100644
--- a/src/charts/xychart/qxyseries.cpp
+++ b/src/charts/xychart/qxyseries.cpp
@@ -1809,7 +1809,7 @@ QAbstractAxis* QXYSeriesPrivate::createDefaultAxis(Qt::Orientation orientation)
 void QXYSeriesPrivate::initializeAnimations(QChart::AnimationOptions options,
                                             int duration, QEasingCurve &curve)
 {
-    XYChart *item = static_cast<XYChart *>(m_item.data());
+    XYChart *item = static_cast<XYChart *>(m_item.get());
     Q_ASSERT(item);
     if (item->animation())
         item->animation()->stopAndDestroyLater();