Skip to content

Commit 57ed9ed

Browse files
committed
Initialize in headers
1 parent d2e3755 commit 57ed9ed

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

src/gui/qgsadvanceddigitizingdockwidget.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,7 @@
3838
QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas *canvas, QWidget *parent )
3939
: QgsDockWidget( parent )
4040
, mMapCanvas( canvas )
41-
, mCurrentMapToolSupportsCad( false )
42-
, mCadEnabled( false )
43-
, mConstructionMode( false )
4441
, mCommonAngleConstraint( QgsSettings().value( QStringLiteral( "/Cad/CommonAngle" ), 90 ).toInt() )
45-
, mSnappedToVertex( false )
46-
, mSessionActive( false )
47-
, mErrorMessage( nullptr )
4842
{
4943
setupUi( this );
5044

src/gui/qgsadvanceddigitizingdockwidget.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -452,29 +452,29 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
452452
QgsMapCanvas *mMapCanvas = nullptr;
453453
QgsAdvancedDigitizingCanvasItem *mCadPaintItem = nullptr;
454454

455-
CadCapacities mCapacities;
455+
CadCapacities mCapacities = nullptr;
456456

457-
bool mCurrentMapToolSupportsCad;
457+
bool mCurrentMapToolSupportsCad = false;
458458

459459
// CAD properties
460460
//! is CAD currently enabled for current map tool
461-
bool mCadEnabled;
462-
bool mConstructionMode;
461+
bool mCadEnabled = false;
462+
bool mConstructionMode = false;
463463

464464
// constraints
465465
std::unique_ptr< CadConstraint > mAngleConstraint;
466466
std::unique_ptr< CadConstraint > mDistanceConstraint;
467467
std::unique_ptr< CadConstraint > mXConstraint;
468468
std::unique_ptr< CadConstraint > mYConstraint;
469469
AdditionalConstraint mAdditionalConstraint;
470-
int mCommonAngleConstraint; // if 0: do not snap to common angles
470+
int mCommonAngleConstraint = 90; // if 0: do not snap to common angles
471471

472472
// point list and current snap point / segment
473473
QList<QgsPointXY> mCadPointList;
474474
QList<QgsPointXY> mSnappedSegment;
475-
bool mSnappedToVertex;
475+
bool mSnappedToVertex = false;
476476

477-
bool mSessionActive;
477+
bool mSessionActive = false;
478478

479479
// error message
480480
std::unique_ptr<QgsMessageBarItem> mErrorMessage;

0 commit comments

Comments
 (0)