Initialize in headers

qgis · Jun 21, 2018 · 57ed9ed · 57ed9ed
1 parent d2e3755
commit 57ed9ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp
@@ -38,13 +38,7 @@
 QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas *canvas, QWidget *parent )
   : QgsDockWidget( parent )
   , mMapCanvas( canvas )
-  , mCurrentMapToolSupportsCad( false )
-  , mCadEnabled( false )
-  , mConstructionMode( false )
   , mCommonAngleConstraint( QgsSettings().value( QStringLiteral( "/Cad/CommonAngle" ), 90 ).toInt() )
-  , mSnappedToVertex( false )
-  , mSessionActive( false )
-  , mErrorMessage( nullptr )
 {
   setupUi( this );
 

diff --git a/src/gui/qgsadvanceddigitizingdockwidget.h b/src/gui/qgsadvanceddigitizingdockwidget.h
@@ -452,29 +452,29 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
     QgsMapCanvas *mMapCanvas = nullptr;
     QgsAdvancedDigitizingCanvasItem *mCadPaintItem = nullptr;
 
-    CadCapacities mCapacities;
+    CadCapacities mCapacities = nullptr;
 
-    bool mCurrentMapToolSupportsCad;
+    bool mCurrentMapToolSupportsCad = false;
 
     // CAD properties
     //! is CAD currently enabled for current map tool
-    bool mCadEnabled;
-    bool mConstructionMode;
+    bool mCadEnabled = false;
+    bool mConstructionMode = false;
 
     // constraints
     std::unique_ptr< CadConstraint > mAngleConstraint;
     std::unique_ptr< CadConstraint > mDistanceConstraint;
     std::unique_ptr< CadConstraint > mXConstraint;
     std::unique_ptr< CadConstraint > mYConstraint;
     AdditionalConstraint mAdditionalConstraint;
-    int mCommonAngleConstraint; // if 0: do not snap to common angles
+    int mCommonAngleConstraint = 90; // if 0: do not snap to common angles
 
     // point list and current snap point / segment
     QList<QgsPointXY> mCadPointList;
     QList<QgsPointXY> mSnappedSegment;
-    bool mSnappedToVertex;
+    bool mSnappedToVertex = false;
 
-    bool mSessionActive;
+    bool mSessionActive = false;
 
     // error message
     std::unique_ptr<QgsMessageBarItem> mErrorMessage;