HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2084:8911fa47051b

bugfix: pie does not disconnect signals when a slice is taken (not deleted)

Jani Honkonen -

r2084:8911fa47051b

parent child

Context file:

r2084:8911fa47051b

src/piechart/piechartitem.cpp +2 0

                         continue;
                     m_sliceItems.remove(slice);
+                    slice->disconnect(this);
+                    QPieSlicePrivate::fromSlice(slice)->disconnect(this);
                     if (m_animation)
                         presenter()->startAnimation(m_animation->removeSlice(sliceItem)); // animator deletes the PieSliceItem

src/piechart/qpieseries.cpp +5 -3

                     return false;
                 QPieSlicePrivate::fromSlice(slice)->m_series = 0;
+                slice->disconnect(d);
                 d->updateDerivativeData();
                     return;
                 QList<QPieSlice*> slices = d->m_slices;
-                foreach (QPieSlice* s, d->m_slices) {
+                foreach (QPieSlice* s, d->m_slices)
                     d->m_slices.removeOne(s);
-                    delete s;
                 d->updateDerivativeData();
                 emit removed(slices);
                 emit countChanged();
+                foreach (QPieSlice* s, slices)
+                    delete s;
             }
             /*!

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages