Skip to content

Commit

Permalink
Fix minor Coverity issues
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jul 10, 2016
1 parent b94fbc0 commit 8828197
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/core/auth/qgsauthmanager.cpp
Expand Up @@ -3351,7 +3351,7 @@ bool QgsAuthManager::authDbCommit() const
const char* err = QT_TR_NOOP( "Auth db FAILED to rollback changes" );
QgsDebugMsg( err );
emit messageOut( tr( err ), authManTag(), WARNING );
authDbConnection().rollback();
( void )authDbConnection().rollback();
return false;
}

Expand All @@ -3378,7 +3378,7 @@ bool QgsAuthManager::authDbTransactionQuery( QSqlQuery *query ) const
const char* err = QT_TR_NOOP( "Auth db FAILED to rollback changes" );
QgsDebugMsg( err );
emit messageOut( tr( err ), authManTag(), WARNING );
authDbConnection().rollback();
( void )authDbConnection().rollback();
return false;
}

Expand Down
1 change: 1 addition & 0 deletions src/core/qgsattributetableconfig.cpp
Expand Up @@ -19,6 +19,7 @@

QgsAttributeTableConfig::QgsAttributeTableConfig()
: mActionWidgetStyle( DropDown )
, mSortOrder( Qt::AscendingOrder )
{

}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsattributetablemodel.cpp
Expand Up @@ -790,7 +790,7 @@ void QgsAttributeTableModel::prefetchSortData( const QString& expressionString )

if ( mSortCacheExpression.isField() )
{
QString fieldName = dynamic_cast<const QgsExpression::NodeColumnRef*>( mSortCacheExpression.rootNode() )->name();
QString fieldName = static_cast<const QgsExpression::NodeColumnRef*>( mSortCacheExpression.rootNode() )->name();
mSortFieldIndex = mLayerCache->layer()->fieldNameIndex( fieldName );
}

Expand Down
6 changes: 5 additions & 1 deletion src/providers/db2/qgsdb2provider.cpp
Expand Up @@ -932,7 +932,11 @@ bool QgsDb2Provider::addFeatures( QgsFeatureList & flist )
return false;
}
}
mDatabase.transaction();
if ( !mDatabase.transaction() )
{
QgsDebugMsg( "transaction failed" );
return false;
}
QSqlQuery query = QSqlQuery( mDatabase );
query.setForwardOnly( true );
QSqlQuery queryFid = QSqlQuery( mDatabase );
Expand Down

0 comments on commit 8828197

Please sign in to comment.