Fix leak in diagram renderer

nyalldawson · nyalldawson · commit 572a3f4e3f83 · 2015-08-25T21:40:03.000+10:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -185,6 +185,7 @@ QgsVectorLayer::~QgsVectorLayer()
   delete mCache;
   delete mLabel;
   delete mDiagramLayerSettings;
+  delete mDiagramRenderer;
 
   delete mActions;
 
@@ -2272,7 +2273,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )
 
   qSort( attrs.begin(), attrs.end(), qGreater<int>() );
 
-  Q_FOREACH( int attr, attrs )
+  Q_FOREACH ( int attr, attrs )
   {
     if ( deleteAttribute( attr ) )
     {
@@ -3031,7 +3032,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int
     if ( mEditBuffer )
     {
       QSet<QString> vals;
-      Q_FOREACH( const QVariant& v, uniqueValues )
+      Q_FOREACH ( const QVariant& v, uniqueValues )
       {
         vals << v.toString();
       }
@@ -3861,7 +3862,7 @@ void QgsVectorLayer::invalidateSymbolCountedFlag()
 
 void QgsVectorLayer::onRelationsLoaded()
 {
-  Q_FOREACH( QgsAttributeEditorElement* elem, mAttributeEditorElements )
+  Q_FOREACH ( QgsAttributeEditorElement* elem, mAttributeEditorElements )
   {
     if ( elem->type() == QgsAttributeEditorElement::AeTypeContainer )
     {
@@ -3870,7 +3871,7 @@ void QgsVectorLayer::onRelationsLoaded()
         continue;
 
       QList<QgsAttributeEditorElement*> relations = cont->findElements( QgsAttributeEditorElement::AeTypeRelation );
-      Q_FOREACH( QgsAttributeEditorElement* relElem, relations )
+      Q_FOREACH ( QgsAttributeEditorElement* relElem, relations )
       {
         QgsAttributeEditorRelation* rel = dynamic_cast< QgsAttributeEditorRelation* >( relElem );
         if ( !rel )
@@ -3939,7 +3940,7 @@ QDomElement QgsAttributeEditorContainer::toDomElement( QDomDocument& doc ) const
   QDomElement elem = doc.createElement( "attributeEditorContainer" );
   elem.setAttribute( "name", mName );
 
-  Q_FOREACH( QgsAttributeEditorElement* child, mChildren )
+  Q_FOREACH ( QgsAttributeEditorElement* child, mChildren )
   {
     elem.appendChild( child->toDomElement( doc ) );
   }
@@ -3960,7 +3961,7 @@ QList<QgsAttributeEditorElement*> QgsAttributeEditorContainer::findElements( Qgs
 {
   QList<QgsAttributeEditorElement*> results;
 
-  Q_FOREACH( QgsAttributeEditorElement* elem, mChildren )
+  Q_FOREACH ( QgsAttributeEditorElement* elem, mChildren )
   {
     if ( elem->type() == type )
     {

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ QgsVectorLayer::~QgsVectorLayer()`
`185`	`185`	`delete mCache;`
`186`	`186`	`delete mLabel;`
`187`	`187`	`delete mDiagramLayerSettings;`
	`188`	`+ delete mDiagramRenderer;`
`188`	`189`
`189`	`190`	`delete mActions;`
`190`	`191`
`@@ -2272,7 +2273,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )`
`2272`	`2273`
`2273`	`2274`	`qSort( attrs.begin(), attrs.end(), qGreater<int>() );`
`2274`	`2275`
`2275`		`- Q_FOREACH( int attr, attrs )`
	`2276`	`+ Q_FOREACH ( int attr, attrs )`
`2276`	`2277`	`{`
`2277`	`2278`	`if ( deleteAttribute( attr ) )`
`2278`	`2279`	`{`
`@@ -3031,7 +3032,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int`
`3031`	`3032`	`if ( mEditBuffer )`
`3032`	`3033`	`{`
`3033`	`3034`	`QSet<QString> vals;`
`3034`		`- Q_FOREACH( const QVariant& v, uniqueValues )`
	`3035`	`+ Q_FOREACH ( const QVariant& v, uniqueValues )`
`3035`	`3036`	`{`
`3036`	`3037`	`vals << v.toString();`
`3037`	`3038`	`}`
`@@ -3861,7 +3862,7 @@ void QgsVectorLayer::invalidateSymbolCountedFlag()`
`3861`	`3862`
`3862`	`3863`	`void QgsVectorLayer::onRelationsLoaded()`
`3863`	`3864`	`{`
`3864`		`- Q_FOREACH( QgsAttributeEditorElement* elem, mAttributeEditorElements )`
	`3865`	`+ Q_FOREACH ( QgsAttributeEditorElement* elem, mAttributeEditorElements )`
`3865`	`3866`	`{`
`3866`	`3867`	`if ( elem->type() == QgsAttributeEditorElement::AeTypeContainer )`
`3867`	`3868`	`{`
`@@ -3870,7 +3871,7 @@ void QgsVectorLayer::onRelationsLoaded()`
`3870`	`3871`	`continue;`
`3871`	`3872`
`3872`	`3873`	`QList<QgsAttributeEditorElement*> relations = cont->findElements( QgsAttributeEditorElement::AeTypeRelation );`
`3873`		`- Q_FOREACH( QgsAttributeEditorElement* relElem, relations )`
	`3874`	`+ Q_FOREACH ( QgsAttributeEditorElement* relElem, relations )`
`3874`	`3875`	`{`
`3875`	`3876`	`QgsAttributeEditorRelation* rel = dynamic_cast< QgsAttributeEditorRelation* >( relElem );`
`3876`	`3877`	`if ( !rel )`
`@@ -3939,7 +3940,7 @@ QDomElement QgsAttributeEditorContainer::toDomElement( QDomDocument& doc ) const`
`3939`	`3940`	`QDomElement elem = doc.createElement( "attributeEditorContainer" );`
`3940`	`3941`	`elem.setAttribute( "name", mName );`
`3941`	`3942`
`3942`		`- Q_FOREACH( QgsAttributeEditorElement* child, mChildren )`
	`3943`	`+ Q_FOREACH ( QgsAttributeEditorElement* child, mChildren )`
`3943`	`3944`	`{`
`3944`	`3945`	`elem.appendChild( child->toDomElement( doc ) );`
`3945`	`3946`	`}`
`@@ -3960,7 +3961,7 @@ QList<QgsAttributeEditorElement*> QgsAttributeEditorContainer::findElements( Qgs`
`3960`	`3961`	`{`
`3961`	`3962`	`QList<QgsAttributeEditorElement*> results;`
`3962`	`3963`
`3963`		`- Q_FOREACH( QgsAttributeEditorElement* elem, mChildren )`
	`3964`	`+ Q_FOREACH ( QgsAttributeEditorElement* elem, mChildren )`
`3964`	`3965`	`{`
`3965`	`3966`	`if ( elem->type() == type )`
`3966`	`3967`	`{`