Skip to content

Commit 326786b

Browse files
committed
Fix Coverity memory leak warning
1 parent 07a72ad commit 326786b

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/core/symbology-ng/qgsrulebasedrendererv2.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,8 +1240,7 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe
12401240
{
12411241
r = dynamic_cast<QgsRuleBasedRendererV2*>( renderer->clone() );
12421242
}
1243-
1244-
if ( renderer->type() == "singleSymbol" )
1243+
else if ( renderer->type() == "singleSymbol" )
12451244
{
12461245
const QgsSingleSymbolRendererV2* singleSymbolRenderer = dynamic_cast<const QgsSingleSymbolRendererV2*>( renderer );
12471246
if ( !singleSymbolRenderer )
@@ -1251,8 +1250,7 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe
12511250
convertToDataDefinedSymbology( origSymbol, singleSymbolRenderer->sizeScaleField() );
12521251
r = new QgsRuleBasedRendererV2( origSymbol );
12531252
}
1254-
1255-
if ( renderer->type() == "categorizedSymbol" )
1253+
else if ( renderer->type() == "categorizedSymbol" )
12561254
{
12571255
const QgsCategorizedSymbolRendererV2* categorizedRenderer = dynamic_cast<const QgsCategorizedSymbolRendererV2*>( renderer );
12581256
if ( !categorizedRenderer )
@@ -1315,8 +1313,7 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe
13151313

13161314
r = new QgsRuleBasedRendererV2( rootrule );
13171315
}
1318-
1319-
if ( renderer->type() == "graduatedSymbol" )
1316+
else if ( renderer->type() == "graduatedSymbol" )
13201317
{
13211318
const QgsGraduatedSymbolRendererV2* graduatedRenderer = dynamic_cast<const QgsGraduatedSymbolRendererV2*>( renderer );
13221319
if ( !graduatedRenderer )
@@ -1372,14 +1369,13 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe
13721369

13731370
r = new QgsRuleBasedRendererV2( rootrule );
13741371
}
1375-
1376-
if ( renderer->type() == "pointDisplacement" )
1372+
else if ( renderer->type() == "pointDisplacement" )
13771373
{
13781374
const QgsPointDisplacementRenderer* pointDisplacementRenderer = dynamic_cast<const QgsPointDisplacementRenderer*>( renderer );
13791375
if ( pointDisplacementRenderer )
13801376
r = convertFromRenderer( pointDisplacementRenderer->embeddedRenderer() );
13811377
}
1382-
if ( renderer->type() == "invertedPolygonRenderer" )
1378+
else if ( renderer->type() == "invertedPolygonRenderer" )
13831379
{
13841380
const QgsInvertedPolygonRenderer* invertedPolygonRenderer = dynamic_cast<const QgsInvertedPolygonRenderer*>( renderer );
13851381
if ( invertedPolygonRenderer )

0 commit comments

Comments
 (0)