Fix coverity issues

This commit is contained in:
Nyall Dawson 2016-01-23 10:31:00 +11:00
parent e83a7c869f
commit bfad753f37
5 changed files with 9 additions and 3 deletions

View File

@ -7480,7 +7480,9 @@ void QgisApp::layerSubsetString()
QgsLayerTreeUtils::insertLayerBelow( QgsProject::instance()->layerTreeRoot(), vlayer, newLayer );
mLayerTreeView->setCurrentLayer( newLayer );
// hide the old layer
QgsProject::instance()->layerTreeRoot()->findLayer( vlayer->id() )->setVisible( Qt::Unchecked );
QgsLayerTreeLayer* vLayerTreeLayer = QgsProject::instance()->layerTreeRoot()->findLayer( vlayer->id() );
if ( vLayerTreeLayer )
vLayerTreeLayer->setVisible( Qt::Unchecked );
vlayer = newLayer;
}
else

View File

@ -1788,7 +1788,7 @@ void QgsProjectProperties::checkOWS( QgsLayerTreeGroup* treeGroup, QStringList&
owsNames << shortName;
if ( l->type() == QgsMapLayer::VectorLayer )
{
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer *>( l );
QgsVectorLayer* vl = static_cast<QgsVectorLayer *>( l );
if ( vl->dataProvider()->encoding() == "System" )
encodingMessages << tr( "Update layer \"%1\" encoding" ).arg( l->name() );
}

View File

@ -399,6 +399,9 @@ QgsLayerTreeLayer* QgsLayerTreeUtils::insertLayerBelow( QgsLayerTreeGroup* group
{
// get the index of the reflayer
QgsLayerTreeLayer* inTree = group->findLayer( refLayer->id() );
if ( !inTree )
return nullptr;
int idx = 0;
foreach ( QgsLayerTreeNode* vl, inTree->parent()->children() )
{

View File

@ -38,6 +38,7 @@ QgsFileWidget::QgsFileWidget( QWidget *parent )
, mFilter( QString() )
, mDefaultRoot( QString() )
, mStorageMode( GetFile )
, mRelativeStorage( Absolute )
{
setBackgroundRole( QPalette::Window );
setAutoFillBackground( true );

View File

@ -4056,7 +4056,7 @@ abort:
if ( toCommit )
{
// ROLLBACK after some previous error
sqlite3_exec( sqliteHandle, "ROLLBACK", nullptr, nullptr, nullptr );
( void )sqlite3_exec( sqliteHandle, "ROLLBACK", nullptr, nullptr, nullptr );
}
return false;