Resolve coverity issues

nyalldawson · nyalldawson · commit 26dbb42a71d7 · 2015-11-09T09:00:22.000+11:00
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -1565,7 +1565,7 @@ void QgsComposerMapWidget::on_mGridLineStyleButton_clicked()
     return;
   }
 
-  QgsLineSymbolV2* newSymbol = dynamic_cast<QgsLineSymbolV2*>( grid->lineSymbol()->clone() );
+  QgsLineSymbolV2* newSymbol = static_cast<QgsLineSymbolV2*>( grid->lineSymbol()->clone() );
   QgsSymbolV2SelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), 0, this );
 
   if ( d.exec() == QDialog::Accepted )
@@ -1590,7 +1590,7 @@ void QgsComposerMapWidget::on_mGridMarkerStyleButton_clicked()
     return;
   }
 
-  QgsMarkerSymbolV2* newSymbol = dynamic_cast<QgsMarkerSymbolV2*>( grid->markerSymbol()->clone() );
+  QgsMarkerSymbolV2* newSymbol = static_cast<QgsMarkerSymbolV2*>( grid->markerSymbol()->clone() );
   QgsSymbolV2SelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), 0, this );
 
   if ( d.exec() == QDialog::Accepted )
@@ -2569,7 +2569,7 @@ void QgsComposerMapWidget::on_mOverviewFrameStyleButton_clicked()
     return;
   }
 
-  QgsFillSymbolV2* newSymbol = dynamic_cast<QgsFillSymbolV2*>( overview->frameSymbol()->clone() );
+  QgsFillSymbolV2* newSymbol = static_cast<QgsFillSymbolV2*>( overview->frameSymbol()->clone() );
   QgsSymbolV2SelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), 0, this );
 
   if ( d.exec() == QDialog::Accepted )
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -992,6 +992,7 @@ QgisApp::QgisApp()
     , mMacrosWarn( 0 )
     , mUserInputDockWidget( 0 )
     , mVectorLayerTools( 0 )
+    , mActionFilterLegend( 0 )
     , mLegendExpressionFilterButton( 0 )
     , mSnappingUtils( 0 )
     , mProjectLastModified()
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -64,6 +64,9 @@ QgsComposerLegend::QgsComposerLegend()
     , mComposerMap( 0 )
     , mLegendFilterByMap( false )
     , mLegendFilterByExpression( false )
+    , mFilterOutAtlas( false )
+    , mFilterAskedForUpdate( false )
+    , mInAtlas( false )
 {
 
 }
diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp
@@ -402,7 +402,9 @@ void TestQgsLegendRenderer::testFilterByExpression()
   mapSettings.setLayers( ll );
 
   // use an expression to only include the red point
-  QgsLayerTreeUtils::setLegendFilterByExpression( *legendModel.rootGroup()->findLayer( mVL3->id() ), "test_attr=1" );
+  QgsLayerTreeLayer* layer = legendModel.rootGroup()->findLayer( mVL3->id() );
+  QVERIFY( layer );
+  QgsLayerTreeUtils::setLegendFilterByExpression( *layer, "test_attr=1" );
 
   legendModel.setLegendFilterByMap( &mapSettings );
 

Original file line number	Diff line number	Diff line change
`@@ -1565,7 +1565,7 @@ void QgsComposerMapWidget::on_mGridLineStyleButton_clicked()`
`1565`	`1565`	`return;`
`1566`	`1566`	`}`
`1567`	`1567`
`1568`		`- QgsLineSymbolV2* newSymbol = dynamic_cast<QgsLineSymbolV2*>( grid->lineSymbol()->clone() );`
	`1568`	`+ QgsLineSymbolV2* newSymbol = static_cast<QgsLineSymbolV2*>( grid->lineSymbol()->clone() );`
`1569`	`1569`	`QgsSymbolV2SelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), 0, this );`
`1570`	`1570`
`1571`	`1571`	`if ( d.exec() == QDialog::Accepted )`
`@@ -1590,7 +1590,7 @@ void QgsComposerMapWidget::on_mGridMarkerStyleButton_clicked()`
`1590`	`1590`	`return;`
`1591`	`1591`	`}`
`1592`	`1592`
`1593`		`- QgsMarkerSymbolV2* newSymbol = dynamic_cast<QgsMarkerSymbolV2*>( grid->markerSymbol()->clone() );`
	`1593`	`+ QgsMarkerSymbolV2* newSymbol = static_cast<QgsMarkerSymbolV2*>( grid->markerSymbol()->clone() );`
`1594`	`1594`	`QgsSymbolV2SelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), 0, this );`
`1595`	`1595`
`1596`	`1596`	`if ( d.exec() == QDialog::Accepted )`
`@@ -2569,7 +2569,7 @@ void QgsComposerMapWidget::on_mOverviewFrameStyleButton_clicked()`
`2569`	`2569`	`return;`
`2570`	`2570`	`}`
`2571`	`2571`
`2572`		`- QgsFillSymbolV2* newSymbol = dynamic_cast<QgsFillSymbolV2*>( overview->frameSymbol()->clone() );`
	`2572`	`+ QgsFillSymbolV2* newSymbol = static_cast<QgsFillSymbolV2*>( overview->frameSymbol()->clone() );`
`2573`	`2573`	`QgsSymbolV2SelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), 0, this );`
`2574`	`2574`
`2575`	`2575`	`if ( d.exec() == QDialog::Accepted )`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,9 @@ QgsComposerLegend::QgsComposerLegend()`
`64`	`64`	`, mComposerMap( 0 )`
`65`	`65`	`, mLegendFilterByMap( false )`
`66`	`66`	`, mLegendFilterByExpression( false )`
	`67`	`+ , mFilterOutAtlas( false )`
	`68`	`+ , mFilterAskedForUpdate( false )`
	`69`	`+ , mInAtlas( false )`
`67`	`70`	`{`
`68`	`71`
`69`	`72`	`}`