Fix coverity issues

qgis · Dec 9, 2015 · 7d59be8 · nyalldawson · Dec 9, 2015 · m-kuhn
1 parent 0287daf
commit 7d59be8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9904,7 +9904,7 @@ QgsRasterLayer* QgisApp::addRasterLayerPrivate(
   {
     QFileInfo fileInfo( uri );
     QString dirName = fileInfo.path();
-    layer = new QgsRasterLayer( dirName, QFileInfo( dirName ).completeBaseName(), "gdal" );
+    layer = new QgsRasterLayer( dirName, QFileInfo( dirName ).completeBaseName(), QString( "gdal" ) );
   }
   else if ( providerKey.isEmpty() )
     layer = new QgsRasterLayer( uri, baseName ); // fi.completeBaseName());

diff --git a/src/app/qgsguivectorlayertools.cpp b/src/app/qgsguivectorlayertools.cpp
@@ -38,7 +38,7 @@ bool QgsGuiVectorLayerTools::addFeature( QgsVectorLayer* layer, const QgsAttribu
   if ( !feat )
     f = new QgsFeature();
 
-  feat->setGeometry( defaultGeometry );
+  f->setGeometry( defaultGeometry );
   QgsFeatureAction a( tr( "Add feature" ), *f, layer );
   bool added = a.addFeature( defaultValues );
   if ( !feat )

diff --git a/src/core/qgseditformconfig.h b/src/core/qgseditformconfig.h
@@ -622,8 +622,6 @@ class CORE_EXPORT QgsEditFormConfig : public QObject
 
     QgsFields mFields;
 
-    bool mUseInitCode;
-
     friend class QgsVectorLayer;
 };
 

diff --git a/tests/src/core/testqgslayertree.cpp b/tests/src/core/testqgslayertree.cpp
@@ -396,6 +396,7 @@ void TestQgsLayerTree::testRendererLegend( QgsFeatureRendererV2* renderer )
   }
   //try changing a symbol's color
   QgsSymbolV2LegendNode* symbolNode = dynamic_cast< QgsSymbolV2LegendNode* >( m->findLegendNode( vl->id(), symbolList.at( 1 ).ruleKey() ) );
+  QVERIFY( symbolNode );
   QgsSymbolV2* newSymbol = symbolNode->symbol()->clone();
   newSymbol->setColor( QColor( 255, 255, 0 ) );
   symbolNode->setSymbol( newSymbol );
@@ -410,6 +411,7 @@ void TestQgsLayerTree::testRendererLegend( QgsFeatureRendererV2* renderer )
   renderer->setLegendSymbolItem( symbolList.at( 2 ).ruleKey(), QgsMarkerSymbolV2::createSimple( props ) );
   m->refreshLayerLegend( n );
   symbolNode = dynamic_cast< QgsSymbolV2LegendNode* >( m->findLegendNode( vl->id(), symbolList.at( 2 ).ruleKey() ) );
+  QVERIFY( symbolNode );
   QCOMPARE( symbolNode->symbol()->color(), QColor( 0, 255, 255 ) );
 
   //cleanup