##// END OF EJS Templates
Fixes wrong bar destruction by adding destructor for bar*series , note this breaks ABI
Michal Klocek -
r1727:6649ab3bbd98
parent child
Show More
@@ -175,6 +175,10 QAreaSeries::QAreaSeries(QObject *parent)
175 */
175 */
176 QAreaSeries::~QAreaSeries()
176 QAreaSeries::~QAreaSeries()
177 {
177 {
178 Q_D(QAreaSeries);
179 if(d->m_dataset){
180 d->m_dataset->removeSeries(this);
181 }
178 }
182 }
179
183
180 /*!
184 /*!
@@ -64,6 +64,14 QHorizontalBarSeries::QHorizontalBarSeries(QObject *parent) :
64 {
64 {
65 }
65 }
66
66
67 QHorizontalBarSeries::~QHorizontalBarSeries()
68 {
69 Q_D(QHorizontalBarSeries);
70 if(d->m_dataset) {
71 d->m_dataset->removeSeries(this);
72 }
73 }
74
67 QAbstractSeries::SeriesType QHorizontalBarSeries::type() const
75 QAbstractSeries::SeriesType QHorizontalBarSeries::type() const
68 {
76 {
69 return QAbstractSeries::SeriesTypeHorizontalBar;
77 return QAbstractSeries::SeriesTypeHorizontalBar;
@@ -32,6 +32,7 class QTCOMMERCIALCHART_EXPORT QHorizontalBarSeries : public QAbstractBarSeries
32 Q_OBJECT
32 Q_OBJECT
33 public:
33 public:
34 explicit QHorizontalBarSeries(QObject *parent = 0);
34 explicit QHorizontalBarSeries(QObject *parent = 0);
35 ~QHorizontalBarSeries();
35 QAbstractSeries::SeriesType type() const;
36 QAbstractSeries::SeriesType type() const;
36
37
37 private:
38 private:
@@ -18,7 +18,13 QAbstractSeries::SeriesType QHorizontalPercentBarSeries::type() const
18 return QAbstractSeries::SeriesTypeHorizontalPercentBar;
18 return QAbstractSeries::SeriesTypeHorizontalPercentBar;
19 }
19 }
20
20
21
21 QHorizontalPercentBarSeries::~QHorizontalPercentBarSeries()
22 {
23 Q_D(QHorizontalPercentBarSeries);
24 if(d->m_dataset) {
25 d->m_dataset->removeSeries(this);
26 }
27 }
22
28
23 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
29 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
24
30
@@ -32,6 +32,7 class QTCOMMERCIALCHART_EXPORT QHorizontalPercentBarSeries : public QAbstractBar
32 Q_OBJECT
32 Q_OBJECT
33 public:
33 public:
34 explicit QHorizontalPercentBarSeries(QObject *parent = 0);
34 explicit QHorizontalPercentBarSeries(QObject *parent = 0);
35 ~QHorizontalPercentBarSeries();
35 QAbstractSeries::SeriesType type() const;
36 QAbstractSeries::SeriesType type() const;
36
37
37 private:
38 private:
@@ -13,13 +13,19 QHorizontalStackedBarSeries::QHorizontalStackedBarSeries(QObject *parent) :
13 {
13 {
14 }
14 }
15
15
16 QHorizontalStackedBarSeries::~QHorizontalStackedBarSeries()
17 {
18 Q_D(QHorizontalStackedBarSeries);
19 if(d->m_dataset) {
20 d->m_dataset->removeSeries(this);
21 }
22 }
23
16 QAbstractSeries::SeriesType QHorizontalStackedBarSeries::type() const
24 QAbstractSeries::SeriesType QHorizontalStackedBarSeries::type() const
17 {
25 {
18 return QAbstractSeries::SeriesTypeHorizontalStackedBar;
26 return QAbstractSeries::SeriesTypeHorizontalStackedBar;
19 }
27 }
20
28
21
22
23 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
29 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
24
30
25 QHorizontalStackedBarSeriesPrivate::QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q) : QAbstractBarSeriesPrivate(q)
31 QHorizontalStackedBarSeriesPrivate::QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q) : QAbstractBarSeriesPrivate(q)
@@ -32,6 +32,7 class QTCOMMERCIALCHART_EXPORT QHorizontalStackedBarSeries : public QAbstractBar
32 Q_OBJECT
32 Q_OBJECT
33 public:
33 public:
34 explicit QHorizontalStackedBarSeries(QObject *parent = 0);
34 explicit QHorizontalStackedBarSeries(QObject *parent = 0);
35 ~QHorizontalStackedBarSeries();
35 QAbstractSeries::SeriesType type() const;
36 QAbstractSeries::SeriesType type() const;
36
37
37 private:
38 private:
@@ -73,13 +73,12 QAbstractSeries::SeriesType QBarSeries::type() const
73 return QAbstractSeries::SeriesTypeBar;
73 return QAbstractSeries::SeriesTypeBar;
74 }
74 }
75
75
76 QBarSeries::~QBarSeries() {
76 QBarSeries::~QBarSeries()
77
77 {
78 Q_D(QBarSeries);
78 Q_D(QBarSeries);
79 if(d->m_dataset) {
79 if(d->m_dataset) {
80 d->m_dataset->removeSeries(this);
80 d->m_dataset->removeSeries(this);
81 }
81 }
82
83 }
82 }
84 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
83 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
85
84
@@ -64,6 +64,14 QPercentBarSeries::QPercentBarSeries(QObject *parent)
64 {
64 {
65 }
65 }
66
66
67 QPercentBarSeries::~QPercentBarSeries()
68 {
69 Q_D(QPercentBarSeries);
70 if(d->m_dataset) {
71 d->m_dataset->removeSeries(this);
72 }
73 }
74
67 /*!
75 /*!
68 Returns QChartSeries::SeriesTypePercentBar.
76 Returns QChartSeries::SeriesTypePercentBar.
69 */
77 */
@@ -33,6 +33,7 class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QAbstractBarSeries
33 Q_OBJECT
33 Q_OBJECT
34 public:
34 public:
35 explicit QPercentBarSeries(QObject *parent = 0);
35 explicit QPercentBarSeries(QObject *parent = 0);
36 ~QPercentBarSeries();
36 QAbstractSeries::SeriesType type() const;
37 QAbstractSeries::SeriesType type() const;
37
38
38 private:
39 private:
@@ -65,6 +65,13 QStackedBarSeries::QStackedBarSeries(QObject *parent)
65 {
65 {
66 }
66 }
67
67
68 QStackedBarSeries::~QStackedBarSeries()
69 {
70 Q_D(QStackedBarSeries);
71 if(d->m_dataset) {
72 d->m_dataset->removeSeries(this);
73 }
74 }
68 /*!
75 /*!
69 Returns QChartSeries::SeriesTypeStackedBar.
76 Returns QChartSeries::SeriesTypeStackedBar.
70 */
77 */
@@ -33,6 +33,7 class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QAbstractBarSeries
33 Q_OBJECT
33 Q_OBJECT
34 public:
34 public:
35 explicit QStackedBarSeries(QObject *parent = 0);
35 explicit QStackedBarSeries(QObject *parent = 0);
36 ~QStackedBarSeries();
36 QAbstractSeries::SeriesType type() const;
37 QAbstractSeries::SeriesType type() const;
37
38
38 private:
39 private:
General Comments 0
You need to be logged in to leave comments. Login now