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 May 1, 2016
1 parent 31e6b4b commit 752ba70
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
9 changes: 8 additions & 1 deletion src/app/qgsrulebasedlabelingwidget.cpp
Expand Up @@ -623,7 +623,14 @@ void QgsRuleBasedLabelingModel::updateRule( const QModelIndex& parent, int row )
/////////

QgsLabelingRulePropsDialog::QgsLabelingRulePropsDialog( QgsRuleBasedLabeling::Rule* rule, QgsVectorLayer* layer, QWidget* parent, QgsMapCanvas* mapCanvas, bool dockMode )
: QDialog( parent ), mRule( rule ), mLayer( layer ), mLabelingGui( nullptr ), mSettings( nullptr ), mMapCanvas( mapCanvas ), mDockMode( dockMode )
: QDialog( parent )
, mRule( rule )
, mLayer( layer )
, mLabelingGui( nullptr )
, mSettings( nullptr )
, mMapCanvas( mapCanvas )
, mDockMode( dockMode )
, mCurrentMode( Adding )
{
setupUi( this );
#ifdef Q_OS_MAC
Expand Down
5 changes: 5 additions & 0 deletions src/core/symbology-ng/qgsarrowsymbollayer.cpp
Expand Up @@ -25,6 +25,11 @@ QgsArrowSymbolLayer::QgsArrowSymbolLayer()
, mHeadSizeUnit( QgsSymbolV2::MM )
, mHeadType( HeadSingle )
, mIsCurved( true )
, mScaledArrowWidth( 1.0 )
, mScaledArrowStartWidth( 1.0 )
, mScaledHeadSize( 1.5 )
, mScaledOffset( 0.0 )
, mComputedHeadType( HeadSingle )
{
/* default values */
setOffset( 0.0 );
Expand Down
7 changes: 6 additions & 1 deletion src/core/symbology-ng/qgsfillsymbollayerv2.cpp
Expand Up @@ -3386,7 +3386,12 @@ QSet<QString> QgsPointPatternFillSymbolLayer::usedAttributes() const
//////////////


QgsCentroidFillSymbolLayerV2::QgsCentroidFillSymbolLayerV2(): mMarker( nullptr ), mPointOnSurface( false ), mPointOnAllParts( true )
QgsCentroidFillSymbolLayerV2::QgsCentroidFillSymbolLayerV2()
: mMarker( nullptr )
, mPointOnSurface( false )
, mPointOnAllParts( true )
, mCurrentFeatureId( -1 )
, mBiggestPartIndex( -1 )
{
setSubSymbol( new QgsMarkerSymbolV2() );
}
Expand Down

0 comments on commit 752ba70

Please sign in to comment.