setRenderer(V2) also updates V2 renderer flag

jef-n · jef-n · commit d52905ccc2c8 · 2012-02-09T11:38:08.000+01:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1297,13 +1297,14 @@ const QgsRenderer* QgsVectorLayer::renderer() const
   return mRenderer;
 }
 
-void QgsVectorLayer::setRenderer( QgsRenderer * r )
+void QgsVectorLayer::setRenderer( QgsRenderer *r )
 {
   if ( !hasGeometryType() )
     return;
 
   if ( r != mRenderer )
   {
+    setUsingRendererV2( false );
     delete mRenderer;
     mRenderer = r;
   }
@@ -4634,13 +4635,18 @@ QgsFeatureRendererV2* QgsVectorLayer::rendererV2()
 {
   return mRendererV2;
 }
-void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2* r )
+
+void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2 *r )
 {
   if ( !hasGeometryType() )
     return;
 
-  delete mRendererV2;
-  mRendererV2 = r;
+  if ( r != mRendererV2 )
+  {
+    setUsingRendererV2( true );
+    delete mRendererV2;
+    mRendererV2 = r;
+  }
 }
 bool QgsVectorLayer::isUsingRendererV2()
 {

Original file line number	Diff line number	Diff line change
`@@ -1297,13 +1297,14 @@ const QgsRenderer* QgsVectorLayer::renderer() const`
`1297`	`1297`	`return mRenderer;`
`1298`	`1298`	`}`
`1299`	`1299`
`1300`		`-void QgsVectorLayer::setRenderer( QgsRenderer * r )`
	`1300`	`+void QgsVectorLayer::setRenderer( QgsRenderer *r )`
`1301`	`1301`	`{`
`1302`	`1302`	`if ( !hasGeometryType() )`
`1303`	`1303`	`return;`
`1304`	`1304`
`1305`	`1305`	`if ( r != mRenderer )`
`1306`	`1306`	`{`
	`1307`	`+ setUsingRendererV2( false );`
`1307`	`1308`	`delete mRenderer;`
`1308`	`1309`	`mRenderer = r;`
`1309`	`1310`	`}`
`@@ -4634,13 +4635,18 @@ QgsFeatureRendererV2* QgsVectorLayer::rendererV2()`
`4634`	`4635`	`{`
`4635`	`4636`	`return mRendererV2;`
`4636`	`4637`	`}`
`4637`		`-void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2* r )`
	`4638`	`+`
	`4639`	`+void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2 *r )`
`4638`	`4640`	`{`
`4639`	`4641`	`if ( !hasGeometryType() )`
`4640`	`4642`	`return;`
`4641`	`4643`
`4642`		`- delete mRendererV2;`
`4643`		`- mRendererV2 = r;`
	`4644`	`+ if ( r != mRendererV2 )`
	`4645`	`+ {`
	`4646`	`+ setUsingRendererV2( true );`
	`4647`	`+ delete mRendererV2;`
	`4648`	`+ mRendererV2 = r;`
	`4649`	`+ }`
`4644`	`4650`	`}`
`4645`	`4651`	`bool QgsVectorLayer::isUsingRendererV2()`
`4646`	`4652`	`{`