Skip to content

Commit

Permalink
Fix coverity uninitialized variable warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Apr 26, 2016
1 parent d604a92 commit 5e3645a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 14 deletions.
1 change: 1 addition & 0 deletions src/core/qgsexpression.h
Expand Up @@ -518,6 +518,7 @@ class CORE_EXPORT QgsExpression
bool handlesNull = false,
bool isContextual = false )
: mName( fnname )
, mParams( 0 )
, mParameterList( params )
, mUsesGeometry( usesGeometry )
, mGroup( group )
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsproject.cpp
Expand Up @@ -331,6 +331,7 @@ struct QgsProject::Imp

Imp()
: title()
, autoTransaction( false )
, dirty( false )
{ // top property node is the root
// "properties" that contains all plug-in
Expand Down
1 change: 1 addition & 0 deletions src/gui/symbology-ng/qgsnullsymbolrendererwidget.cpp
Expand Up @@ -26,6 +26,7 @@ QgsRendererV2Widget* QgsNullSymbolRendererWidget::create( QgsVectorLayer* layer,

QgsNullSymbolRendererWidget::QgsNullSymbolRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
: QgsRendererV2Widget( layer, style )
, mRenderer( nullptr )
{
if ( renderer )
{
Expand Down
12 changes: 0 additions & 12 deletions src/providers/db2/qgsdb2dataitems.h
Expand Up @@ -118,18 +118,6 @@ class QgsDb2ConnectionItem : public QgsDataCollectionItem

private:
QString mConnInfo;
QString mService;
QString mHost;
QString mDriver;
QString mPort;
QString mDatabase;
QString mUsername;
QString mPassword;
QString mAuthcfg;
int mEnvironment;
bool mUseGeometryColumns;
bool mUseEstimatedMetadata;
bool mAllowGeometrylessTables;

void readConnectionSettings();
};
Expand Down
3 changes: 2 additions & 1 deletion src/providers/db2/qgsdb2geometrycolumns.cpp
Expand Up @@ -23,6 +23,7 @@

QgsDb2GeometryColumns::QgsDb2GeometryColumns( const QSqlDatabase db )
: mDatabase( db )
, mEnvironment( ENV_LUW )
{
QgsDebugMsg( "constructing" );
}
Expand Down Expand Up @@ -160,4 +161,4 @@ bool QgsDb2GeometryColumns::populateLayerProperty( QgsDb2LayerProperty &layer )
}
layer.pkColumnName = layer.pkCols.size() > 0 ? layer.pkCols.at( 0 ) : QString::null;
return true;
}
}
3 changes: 2 additions & 1 deletion src/providers/db2/qgsdb2provider.cpp
Expand Up @@ -32,6 +32,7 @@ int QgsDb2Provider::sConnectionId = 0;

QgsDb2Provider::QgsDb2Provider( QString uri )
: QgsVectorDataProvider( uri )
, mNumberFeatures( 0 )
, mEnvironment( ENV_LUW )
, mWkbType( QGis::WKBUnknown )
{
Expand Down Expand Up @@ -1754,4 +1755,4 @@ QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(
uri, fields, wkbType, srs, overwrite,
oldToNewAttrIdxMap, errorMessage, options
);
}
}

0 comments on commit 5e3645a

Please sign in to comment.