Skip to content

Commit bf76049

Browse files
committed
Fix some Coverity uninitialized variable warnings
1 parent c732c68 commit bf76049

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

src/app/qgisapp.h

+1
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
15231523
, mDeletePart( nullptr )
15241524
, mNodeTool( nullptr )
15251525
, mRotatePointSymbolsTool( nullptr )
1526+
, mOffsetPointSymbolTool( nullptr )
15261527
, mAnnotation( nullptr )
15271528
, mFormAnnotation( nullptr )
15281529
, mHtmlAnnotation( nullptr )

src/app/qgsbookmarks.cpp

+13-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
#include <QAbstractTableModel>
3535

3636

37-
QgsBookmarks::QgsBookmarks( QWidget *parent ) : QDockWidget( parent )
37+
QgsBookmarks::QgsBookmarks( QWidget *parent )
38+
: QDockWidget( parent )
3839
{
3940
setupUi( this );
4041
restorePosition();
@@ -490,10 +491,11 @@ bool QgsProjectBookmarksTableModel::removeRows( int row, int count, const QModel
490491
return true;
491492
}
492493

493-
QgsMergedBookmarksTableModel::QgsMergedBookmarksTableModel( QAbstractTableModel& qgisTableModel, QAbstractTableModel& projectTableModel, QTreeView* treeView ):
494-
mQgisTableModel( qgisTableModel ),
495-
mProjectTableModel( projectTableModel ),
496-
mTreeView( treeView )
494+
QgsMergedBookmarksTableModel::QgsMergedBookmarksTableModel( QAbstractTableModel& qgisTableModel, QAbstractTableModel& projectTableModel, QTreeView* treeView )
495+
: mQgisTableModel( qgisTableModel )
496+
, mProjectTableModel( projectTableModel )
497+
, mTreeView( treeView )
498+
, mProjectOpen( false )
497499
{
498500
connect(
499501
QgisApp::instance(), SIGNAL( projectRead() ),
@@ -674,7 +676,12 @@ void QgsMergedBookmarksTableModel::moveBookmark( QAbstractTableModel& modelFrom,
674676
query.bindValue( ":ymax", modelFrom.data( modelFrom.index( row, 6 ) ).toDouble() );
675677
query.bindValue( ":projection_srid", modelFrom.data( modelFrom.index( row, 7 ) ).toInt() );
676678

677-
query.exec();
679+
if ( !query.exec() )
680+
{
681+
QgsDebugMsg( QString( "Could not move bookmark: %1" )
682+
.arg( query.lastError().text() ) );
683+
return;
684+
}
678685
qgisModel->setSort( 0, Qt::AscendingOrder );
679686
qgisModel->select();
680687
}

src/gui/qgscolordialog.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ QColor QgsColorDialog::getLiveColor( const QColor& initialColor, QObject* update
6969
QgsColorDialogV2::QgsColorDialogV2( QWidget *parent, const Qt::WindowFlags& fl, const QColor& color )
7070
: QDialog( parent, fl )
7171
, mPreviousColor( color )
72+
, mAllowAlpha( true )
7273
{
7374
setupUi( this );
7475

src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class QgsVectorGradientColorRampV2;
2424
class QwtPlot;
2525
class QwtPlotCurve;
2626
class QwtPlotMarker;
27-
class QwtPlotPicker;
2827
class QgsGradientPlotEventFilter;
2928

3029
class GUI_EXPORT QgsVectorGradientColorRampV2Dialog : public QDialog, private Ui::QgsVectorGradientColorRampV2DialogBase
@@ -69,7 +68,6 @@ class GUI_EXPORT QgsVectorGradientColorRampV2Dialog : public QDialog, private Ui
6968
QwtPlotCurve* mHueCurve;
7069
QwtPlotCurve* mAlphaCurve;
7170
QList< QwtPlotMarker* > mMarkers;
72-
QwtPlotPicker* mPicker;
7371
QgsGradientPlotEventFilter* mPlotFilter;
7472
int mCurrentPlotColorComponent;
7573
int mCurrentPlotMarkerIndex;

0 commit comments

Comments
 (0)