Skip to content

Commit f69e0bb

Browse files
committed
Minor Coverity fixes (null dereference, uninitialised members)
1 parent 0080f9e commit f69e0bb

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

src/app/composer/qgscomposerlegendwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend )
109109
mainLayout->addWidget( itemPropertiesWidget );
110110

111111
mItemTreeView->setHeaderHidden( true );
112-
mItemTreeView->setModel( legend->modelV2() );
113-
mItemTreeView->setMenuProvider( new QgsComposerLegendMenuProvider( mItemTreeView, this ) );
114112

115113
if ( legend )
116114
{
115+
mItemTreeView->setModel( legend->modelV2() );
116+
mItemTreeView->setMenuProvider( new QgsComposerLegendMenuProvider( mItemTreeView, this ) );
117117
connect( legend, SIGNAL( itemChanged() ), this, SLOT( setGuiElements() ) );
118118
mWrapCharLineEdit->setText( legend->wrapChar() );
119119
}

src/app/composer/qgscomposermapwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap )
4949
{
5050
setupUi( this );
5151

52-
mLabel->setText( tr( "Map %1" ).arg( composerMap->id() ) );
53-
5452
//add widget for general composer item properties
5553
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, composerMap );
5654
mainLayout->addWidget( itemPropertiesWidget );
@@ -135,6 +133,8 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap )
135133

136134
if ( composerMap )
137135
{
136+
mLabel->setText( tr( "Map %1" ).arg( composerMap->id() ) );
137+
138138
connect( composerMap, SIGNAL( itemChanged() ), this, SLOT( setGuiElementValues() ) );
139139

140140
QgsAtlasComposition* atlas = atlasComposition();

src/app/qgslabelinggui.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
4949
: QWidget( parent )
5050
, mLayer( layer )
5151
, mMapCanvas( mapCanvas )
52+
, mCharDlg( 0 )
53+
, mQuadrantBtnGrp( 0 )
54+
, mDirectSymbBtnGrp( 0 )
55+
, mUpsidedownBtnGrp( 0 )
56+
, mPlacePointBtnGrp( 0 )
57+
, mPlaceLineBtnGrp( 0 )
58+
, mPlacePolygonBtnGrp( 0 )
59+
, mPreviewSize( 24 )
5260
, mMinPixelLimit( 0 )
5361
, mLoadSvgParams( false )
5462
{
@@ -81,7 +89,6 @@ QgsLabelingGui::QgsLabelingGui( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas,
8189
mCharDlg = new QgsCharacterSelectorDialog( this );
8290

8391
mRefFont = lblFontPreview->font();
84-
mPreviewSize = 24;
8592

8693
// main layer label-enabling connections
8794
connect( chkEnableLabeling, SIGNAL( toggled( bool ) ), mFieldExpressionWidget, SLOT( setEnabled( bool ) ) );

src/core/composer/qgscomposerhtml.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ QgsComposerHtml::QgsComposerHtml()
9292
, mLoaded( false )
9393
, mHtmlUnitsToMM( 1.0 )
9494
, mRenderedPage( 0 )
95+
, mEvaluateExpressions( true )
9596
, mUseSmartBreaks( true )
9697
, mMaxBreakDistance( 10 )
9798
, mExpressionFeature( 0 )

0 commit comments

Comments
 (0)