##// END OF EJS Templates
Fix deleteLater in case presenter keeps deleteLater objects
Michal Klocek -
r1569:b01c048a48db
parent child
Show More
@@ -127,7 +127,7 void ChartDataSet::removeSeries(QAbstractSeries* series)
127
127
128 if(x==-1) {
128 if(x==-1) {
129 emit axisRemoved(axisX);
129 emit axisRemoved(axisX);
130 delete axisX;
130 axisX->deleteLater();
131 }
131 }
132 }
132 }
133
133
@@ -140,7 +140,7 void ChartDataSet::removeSeries(QAbstractSeries* series)
140
140
141 if(y==-1) {
141 if(y==-1) {
142 emit axisRemoved(axisY);
142 emit axisRemoved(axisY);
143 delete axisY;
143 axisY->deleteLater();
144 }
144 }
145 }
145 }
146 }
146 }
@@ -213,6 +213,7 QAbstractAxis* ChartDataSet::axisY(QAbstractSeries *series) const
213
213
214 void ChartDataSet::setAxisX(QAbstractSeries *series, QAbstractAxis *axis)
214 void ChartDataSet::setAxisX(QAbstractSeries *series, QAbstractAxis *axis)
215 {
215 {
216
216 Q_ASSERT(axis);
217 Q_ASSERT(axis);
217 QAbstractAxis *oldAxis = m_seriesAxisXMap.take(series);
218 QAbstractAxis *oldAxis = m_seriesAxisXMap.take(series);
218
219
@@ -230,7 +231,7 void ChartDataSet::setAxisX(QAbstractSeries *series, QAbstractAxis *axis)
230 int x = axesX.indexOf(oldAxis);
231 int x = axesX.indexOf(oldAxis);
231 if(x==-1) {
232 if(x==-1) {
232 emit axisRemoved(oldAxis);
233 emit axisRemoved(oldAxis);
233 delete oldAxis;
234 oldAxis->deleteLater();
234 }
235 }
235
236
236 Domain* domain = m_seriesDomainMap.value(series);
237 Domain* domain = m_seriesDomainMap.value(series);
@@ -267,7 +268,7 void ChartDataSet::setAxisY(QAbstractSeries *series, QAbstractAxis *axis)
267 int y = axesY.indexOf(oldAxis);
268 int y = axesY.indexOf(oldAxis);
268 if(y==-1) {
269 if(y==-1) {
269 emit axisRemoved(oldAxis);
270 emit axisRemoved(oldAxis);
270 delete oldAxis;
271 oldAxis->deleteLater();
271 }
272 }
272
273
273 Domain* domain = m_seriesDomainMap.value(series);
274 Domain* domain = m_seriesDomainMap.value(series);
General Comments 0
You need to be logged in to leave comments. Login now