Skip to content

Commit 7d59be8

Browse files
committed
Fix coverity issues
1 parent 0287daf commit 7d59be8

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/app/qgisapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9904,7 +9904,7 @@ QgsRasterLayer* QgisApp::addRasterLayerPrivate(
99049904
{
99059905
QFileInfo fileInfo( uri );
99069906
QString dirName = fileInfo.path();
9907-
layer = new QgsRasterLayer( dirName, QFileInfo( dirName ).completeBaseName(), "gdal" );
9907+
layer = new QgsRasterLayer( dirName, QFileInfo( dirName ).completeBaseName(), QString( "gdal" ) );
99089908
}
99099909
else if ( providerKey.isEmpty() )
99109910
layer = new QgsRasterLayer( uri, baseName ); // fi.completeBaseName());

src/app/qgsguivectorlayertools.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ bool QgsGuiVectorLayerTools::addFeature( QgsVectorLayer* layer, const QgsAttribu
3838
if ( !feat )
3939
f = new QgsFeature();
4040

41-
feat->setGeometry( defaultGeometry );
41+
f->setGeometry( defaultGeometry );
4242
QgsFeatureAction a( tr( "Add feature" ), *f, layer );
4343
bool added = a.addFeature( defaultValues );
4444
if ( !feat )

src/core/qgseditformconfig.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,6 @@ class CORE_EXPORT QgsEditFormConfig : public QObject
622622

623623
QgsFields mFields;
624624

625-
bool mUseInitCode;
626-
627625
friend class QgsVectorLayer;
628626
};
629627

tests/src/core/testqgslayertree.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ void TestQgsLayerTree::testRendererLegend( QgsFeatureRendererV2* renderer )
396396
}
397397
//try changing a symbol's color
398398
QgsSymbolV2LegendNode* symbolNode = dynamic_cast< QgsSymbolV2LegendNode* >( m->findLegendNode( vl->id(), symbolList.at( 1 ).ruleKey() ) );
399+
QVERIFY( symbolNode );
399400
QgsSymbolV2* newSymbol = symbolNode->symbol()->clone();
400401
newSymbol->setColor( QColor( 255, 255, 0 ) );
401402
symbolNode->setSymbol( newSymbol );
@@ -410,6 +411,7 @@ void TestQgsLayerTree::testRendererLegend( QgsFeatureRendererV2* renderer )
410411
renderer->setLegendSymbolItem( symbolList.at( 2 ).ruleKey(), QgsMarkerSymbolV2::createSimple( props ) );
411412
m->refreshLayerLegend( n );
412413
symbolNode = dynamic_cast< QgsSymbolV2LegendNode* >( m->findLegendNode( vl->id(), symbolList.at( 2 ).ruleKey() ) );
414+
QVERIFY( symbolNode );
413415
QCOMPARE( symbolNode->symbol()->color(), QColor( 0, 255, 255 ) );
414416

415417
//cleanup

0 commit comments

Comments
 (0)