From 80b01df748b7f816af2b75c18c8b15c4e1111747 2012-04-04 08:39:17
From: Michal Klocek <michal.klocek@digia.com>
Date: 2012-04-04 08:39:17
Subject: [PATCH] Bugfix for handleMarkerDestroyed(), removing it

---

diff --git a/src/qlegend.cpp b/src/qlegend.cpp
index fb8b7d0..388f6df 100644
--- a/src/qlegend.cpp
+++ b/src/qlegend.cpp
@@ -290,7 +290,6 @@ void QLegend::handleAdded(QList<QPieSlice *> slices)
     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();
@@ -305,17 +304,6 @@ void QLegend::handleRemoved(QList<QPieSlice *> slices)
     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.
 */
@@ -346,7 +334,6 @@ bool QLegend::isAttachedToChart()
 void QLegend::appendMarkers(QAreaSeries* series)
 {
     AreaLegendMarker* marker = new AreaLegendMarker(series,this);
-    connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
     m_markers->addToGroup(marker);
 }
 
@@ -356,7 +343,6 @@ void QLegend::appendMarkers(QAreaSeries* series)
 void QLegend::appendMarkers(QXYSeries* series)
 {
     XYLegendMarker* marker = new XYLegendMarker(series,this);
-    connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
     m_markers->addToGroup(marker);
 }
 
@@ -367,7 +353,6 @@ void QLegend::appendMarkers(QBarSeries *series)
 {
     foreach(QBarSet* set, series->barSets()) {
         BarLegendMarker* marker = new BarLegendMarker(series,set, this);
-        connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
         m_markers->addToGroup(marker);
     }
 }
@@ -379,7 +364,6 @@ void QLegend::appendMarkers(QPieSeries *series)
 {
     foreach(QPieSlice* slice, series->slices()) {
         PieLegendMarker* marker = new PieLegendMarker(series,slice, this);
-        connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
         m_markers->addToGroup(marker);
     }
 }
@@ -393,8 +377,8 @@ void QLegend::deleteMarkers(QSeries *series)
 
     QList<QGraphicsItem *> items = m_markers->childItems();
 
-    foreach (QGraphicsItem *m, items) {
-        LegendMarker *marker = static_cast<LegendMarker*>(m);
+    foreach (QGraphicsItem *markers, items) {
+        LegendMarker *marker = static_cast<LegendMarker*>(markers);
         if (marker->series() == series) {
             delete marker;
         }
diff --git a/src/qlegend.h b/src/qlegend.h
index 00d5462..2fd4e82 100644
--- a/src/qlegend.h
+++ b/src/qlegend.h
@@ -97,8 +97,6 @@ public Q_SLOTS:
     void handleSeriesRemoved(QSeries *series);
     void handleAdded(QList<QPieSlice *> slices);
     void handleRemoved(QList<QPieSlice *> slices);
-    void handleMarkerDestroyed();
-
     // PIMPL <---
 
 private: