HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r870:80b01df748b7

Bugfix for handleMarkerDestroyed(), removing it

Michal Klocek -

r870:80b01df748b7

parent child

Context file:

r870:80b01df748b7

Collapse all files

src/qlegend.cpp +2 -18

                 QPieSeries* series = static_cast<QPieSeries *> (sender());
                 foreach(QPieSlice* slice, slices) {
                     PieLegendMarker* marker = new PieLegendMarker(series,slice, this);
-                    connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers->addToGroup(marker);
                 }
                 updateLayout();
                 Q_UNUSED(slices)
             }
-            /*!
-                \internal Notifies legend that some marker has been removed. Sent by legend markers when destroyed
-            */
-            void QLegend::handleMarkerDestroyed()
-                LegendMarker* m = static_cast<LegendMarker *> (sender());
-                delete m;
-               // updateLayout();
             /*!
                 Detaches the legend from chart. Chart won't change layout of the legend.
             */
             void QLegend::appendMarkers(QAreaSeries* series)
             {
                 AreaLegendMarker* marker = new AreaLegendMarker(series,this);
-                connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                 m_markers->addToGroup(marker);
             }
             void QLegend::appendMarkers(QXYSeries* series)
             {
                 XYLegendMarker* marker = new XYLegendMarker(series,this);
-                connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                 m_markers->addToGroup(marker);
             }
             {
                 foreach(QBarSet* set, series->barSets()) {
                     BarLegendMarker* marker = new BarLegendMarker(series,set, this);
-                    connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers->addToGroup(marker);
                 }
             }
             {
                 foreach(QPieSlice* slice, series->slices()) {
                     PieLegendMarker* marker = new PieLegendMarker(series,slice, this);
-                    connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
                     m_markers->addToGroup(marker);
                 }
             }
                 QList<QGraphicsItem *> items = m_markers->childItems();
-                foreach (QGraphicsItem *m, items) {
+                foreach (QGraphicsItem *markers, items) {
-                    LegendMarker *marker = static_cast<LegendMarker*>(m);
+                    LegendMarker *marker = static_cast<LegendMarker*>(markers);
                     if (marker->series() == series) {
                         delete marker;
                     }

src/qlegend.h 0 -2

                 void handleSeriesRemoved(QSeries *series);
                 void handleAdded(QList<QPieSlice *> slices);
                 void handleRemoved(QList<QPieSlice *> slices);
-                void handleMarkerDestroyed();
                 // PIMPL <---
             private:

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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