Initialize default symbol to 0 in rule based renderer

mhugent · mhugent · commit d6ffb8106ec6 · 2011-11-18T13:10:26.000+01:00
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -118,10 +118,8 @@ QgsRuleBasedRendererV2::Rule& QgsRuleBasedRendererV2::Rule::operator=( const Qgs
 /////////////////////
 
 QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsSymbolV2* defaultSymbol )
-    : QgsFeatureRendererV2( "RuleRenderer" )
+    : QgsFeatureRendererV2( "RuleRenderer" ), mDefaultSymbol( defaultSymbol ), mCurrentSymbol( 0 )
 {
-  mDefaultSymbol = defaultSymbol;
-
   // add the default rule
   mRules << Rule( defaultSymbol->clone() );
 }

Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,8 @@ QgsRuleBasedRendererV2::Rule& QgsRuleBasedRendererV2::Rule::operator=( const Qgs`
`118`	`118`	`/////////////////////`
`119`	`119`
`120`	`120`	`QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsSymbolV2* defaultSymbol )`
`121`		`- : QgsFeatureRendererV2( "RuleRenderer" )`
	`121`	`+ : QgsFeatureRendererV2( "RuleRenderer" ), mDefaultSymbol( defaultSymbol ), mCurrentSymbol( 0 )`
`122`	`122`	`{`
`123`		`- mDefaultSymbol = defaultSymbol;`
`124`		`-`
`125`	`123`	`// add the default rule`
`126`	`124`	`mRules << Rule( defaultSymbol->clone() );`
`127`	`125`	`}`