ModelEditor: Use more member initializers in modelinglib

Change-Id: I8e0a93e0b83c45e0e8c20a92657340b24a346849
Reviewed-by: André Hartmann <aha_1980@gmx.de>

68 files changed, 155 insertions, 283 deletions

diff --git a/src/libs/modelinglib/qmt/controller/undocommand.cpp b/src/libs/modelinglib/qmt/controller/undocommand.cpp
index eea123a9424..40348d3f86c 100644
--- a/src/libs/modelinglib/qmt/controller/undocommand.cpp
+++ b/src/libs/modelinglib/qmt/controller/undocommand.cpp
@@ -30,9 +30,7 @@
 namespace qmt {
 
 UndoCommand::UndoCommand(const QString &text)
-    : QUndoCommand(text),
-      m_canRedo(false),
-      m_doNotMerge(false)
+    : QUndoCommand(text)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/controller/undocommand.h b/src/libs/modelinglib/qmt/controller/undocommand.h
index 52cd00b7078..aa96cd7430c 100644
--- a/src/libs/modelinglib/qmt/controller/undocommand.h
+++ b/src/libs/modelinglib/qmt/controller/undocommand.h
@@ -47,8 +47,8 @@ public:
     void redo() override;
 
 private:
-    bool m_canRedo;
-    bool m_doNotMerge;
+    bool m_canRedo = false;
+    bool m_doNotMerge = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/controller/undocontroller.cpp b/src/libs/modelinglib/qmt/controller/undocontroller.cpp
index 85475d55cc8..a9940291417 100644
--- a/src/libs/modelinglib/qmt/controller/undocontroller.cpp
+++ b/src/libs/modelinglib/qmt/controller/undocontroller.cpp
@@ -33,8 +33,7 @@ namespace qmt {
 
 UndoController::UndoController(QObject *parent) :
     QObject(parent),
-    m_undoStack(new QUndoStack(this)),
-    m_doNotMerge(false)
+    m_undoStack(new QUndoStack(this))
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/controller/undocontroller.h b/src/libs/modelinglib/qmt/controller/undocontroller.h
index c696c6c1a1e..8179493a55e 100644
--- a/src/libs/modelinglib/qmt/controller/undocontroller.h
+++ b/src/libs/modelinglib/qmt/controller/undocontroller.h
@@ -54,8 +54,8 @@ public:
     void doNotMerge();
 
 private:
-    QUndoStack *m_undoStack;
-    bool m_doNotMerge;
+    QUndoStack *m_undoStack = nullptr;
+    bool m_doNotMerge = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram/dannotation.cpp b/src/libs/modelinglib/qmt/diagram/dannotation.cpp
index cae6d96eb22..2a7787c7b58 100644
--- a/src/libs/modelinglib/qmt/diagram/dannotation.cpp
+++ b/src/libs/modelinglib/qmt/diagram/dannotation.cpp
@@ -31,9 +31,7 @@
 namespace qmt {
 
 DAnnotation::DAnnotation()
-    : DElement(),
-      m_visualRole(RoleNormal),
-      m_isAutoSized(true)
+    : DElement()
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram/dannotation.h b/src/libs/modelinglib/qmt/diagram/dannotation.h
index fe1e57d37d2..f0080820e5d 100644
--- a/src/libs/modelinglib/qmt/diagram/dannotation.h
+++ b/src/libs/modelinglib/qmt/diagram/dannotation.h
@@ -69,8 +69,8 @@ private:
     QString m_text;
     QPointF m_pos;
     QRectF m_rect;
-    VisualRole m_visualRole;
-    bool m_isAutoSized;
+    VisualRole m_visualRole = RoleNormal;
+    bool m_isAutoSized = true;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram/dassociation.cpp b/src/libs/modelinglib/qmt/diagram/dassociation.cpp
index 1c62bd388f9..f1c2ea9b521 100644
--- a/src/libs/modelinglib/qmt/diagram/dassociation.cpp
+++ b/src/libs/modelinglib/qmt/diagram/dassociation.cpp
@@ -31,8 +31,6 @@
 namespace qmt {
 
 DAssociationEnd::DAssociationEnd()
-    : m_kind(MAssociationEnd::Association),
-      m_isNavigable(false)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram/dassociation.h b/src/libs/modelinglib/qmt/diagram/dassociation.h
index 1da72c36b5b..7c914272e58 100644
--- a/src/libs/modelinglib/qmt/diagram/dassociation.h
+++ b/src/libs/modelinglib/qmt/diagram/dassociation.h
@@ -49,8 +49,8 @@ public:
 private:
     QString m_name;
     QString m_cardinality;
-    MAssociationEnd::Kind m_kind;
-    bool m_isNavigable;
+    MAssociationEnd::Kind m_kind = MAssociationEnd::Association;
+    bool m_isNavigable = false;
 
 };
 
diff --git a/src/libs/modelinglib/qmt/diagram/dclass.cpp b/src/libs/modelinglib/qmt/diagram/dclass.cpp
index 56337a998ef..92103439c5f 100644
--- a/src/libs/modelinglib/qmt/diagram/dclass.cpp
+++ b/src/libs/modelinglib/qmt/diagram/dclass.cpp
@@ -31,8 +31,6 @@
 namespace qmt {
 
 DClass::DClass()
-    : m_templateDisplay(TemplateSmart),
-      m_showAllMembers(false)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram/dclass.h b/src/libs/modelinglib/qmt/diagram/dclass.h
index c86d8b335cc..159c79a940e 100644
--- a/src/libs/modelinglib/qmt/diagram/dclass.h
+++ b/src/libs/modelinglib/qmt/diagram/dclass.h
@@ -65,8 +65,8 @@ private:
     QList<QString> m_templateParameters;
     QList<MClassMember> m_members;
     QSet<Uid> m_visibleMembers;
-    TemplateDisplay m_templateDisplay;
-    bool m_showAllMembers;
+    TemplateDisplay m_templateDisplay = TemplateSmart;
+    bool m_showAllMembers = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram/dcomponent.cpp b/src/libs/modelinglib/qmt/diagram/dcomponent.cpp
index 4bee3ad9b95..4fe05aa8a64 100644
--- a/src/libs/modelinglib/qmt/diagram/dcomponent.cpp
+++ b/src/libs/modelinglib/qmt/diagram/dcomponent.cpp
@@ -31,8 +31,6 @@
 namespace qmt {
 
 DComponent::DComponent()
-    : DObject(),
-      m_isPlainShape(false)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram/dcomponent.h b/src/libs/modelinglib/qmt/diagram/dcomponent.h
index 03ef43ecdbe..c3602a10154 100644
--- a/src/libs/modelinglib/qmt/diagram/dcomponent.h
+++ b/src/libs/modelinglib/qmt/diagram/dcomponent.h
@@ -42,7 +42,7 @@ public:
     void accept(DConstVisitor *visitor) const override;
 
 private:
-    bool m_isPlainShape;
+    bool m_isPlainShape = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram/ditem.cpp b/src/libs/modelinglib/qmt/diagram/ditem.cpp
index d9a33dc6026..3c7241575f2 100644
--- a/src/libs/modelinglib/qmt/diagram/ditem.cpp
+++ b/src/libs/modelinglib/qmt/diagram/ditem.cpp
@@ -31,8 +31,6 @@
 namespace qmt {
 
 DItem::DItem()
-    : DObject(),
-      m_isShapeEditable(true)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram/ditem.h b/src/libs/modelinglib/qmt/diagram/ditem.h
index 7782e9497d6..e6c184bf338 100644
--- a/src/libs/modelinglib/qmt/diagram/ditem.h
+++ b/src/libs/modelinglib/qmt/diagram/ditem.h
@@ -48,7 +48,7 @@ public:
 private:
     QString m_variety;
     QString m_shape;
-    bool m_isShapeEditable;
+    bool m_isShapeEditable = true;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram/dobject.cpp b/src/libs/modelinglib/qmt/diagram/dobject.cpp
index 4405b165549..4111ba929e5 100644
--- a/src/libs/modelinglib/qmt/diagram/dobject.cpp
+++ b/src/libs/modelinglib/qmt/diagram/dobject.cpp
@@ -31,14 +31,6 @@
 namespace qmt {
 
 DObject::DObject()
-    : DElement(),
-      m_modelUid(Uid::invalidUid()),
-      m_depth(0),
-      m_visualPrimaryRole(PrimaryRoleNormal),
-      m_visualSecondaryRole(SecondaryRoleNone),
-      m_stereotypeDisplay(StereotypeSmart),
-      m_isAutoSized(true),
-      m_isVisualEmphasized(false)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram/dobject.h b/src/libs/modelinglib/qmt/diagram/dobject.h
index 6e5f85358a8..17d22488ab5 100644
--- a/src/libs/modelinglib/qmt/diagram/dobject.h
+++ b/src/libs/modelinglib/qmt/diagram/dobject.h
@@ -104,18 +104,18 @@ public:
     void accept(DConstVisitor *visitor) const override;
 
 private:
-    Uid m_modelUid;
+    Uid m_modelUid = Uid::invalidUid();
     QList<QString> m_stereotypes;
     QString m_context;
     QString m_name;
     QPointF m_pos;
     QRectF m_rect;
-    int m_depth;
-    VisualPrimaryRole m_visualPrimaryRole;
-    VisualSecondaryRole m_visualSecondaryRole;
-    StereotypeDisplay m_stereotypeDisplay;
-    bool m_isAutoSized;
-    bool m_isVisualEmphasized;
+    int m_depth = 0;
+    VisualPrimaryRole m_visualPrimaryRole = PrimaryRoleNormal;
+    VisualSecondaryRole m_visualSecondaryRole = SecondaryRoleNone;
+    StereotypeDisplay m_stereotypeDisplay = StereotypeSmart;
+    bool m_isAutoSized = true;
+    bool m_isVisualEmphasized = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp
index e689c4cb210..d882c81eef8 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp
@@ -45,7 +45,6 @@
 namespace qmt {
 
 DCloneVisitor::DCloneVisitor()
-    : m_cloned(nullptr)
 {
 }
 
@@ -154,7 +153,6 @@ void DCloneVisitor::visitDSwimlane(const DSwimlane *swimlane)
 
 
 DCloneDeepVisitor::DCloneDeepVisitor()
-    : m_cloned(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h
index 5531717c951..82877bef583 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h
+++ b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h
@@ -54,7 +54,7 @@ public:
     void visitDSwimlane(const DSwimlane *swimlane) override;
 
 private:
-    DElement *m_cloned;
+    DElement *m_cloned = nullptr;
 };
 
 class QMT_EXPORT DCloneDeepVisitor : public DConstVisitor
@@ -81,7 +81,7 @@ public:
     void visitDSwimlane(const DSwimlane *swimlane) override;
 
 private:
-    DElement *m_cloned;
+    DElement *m_cloned = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp b/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp
index 648a2c671d1..e87fb8ce5ef 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp
@@ -54,7 +54,6 @@
 namespace qmt {
 
 DFactory::DFactory()
-    : m_product(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dfactory.h b/src/libs/modelinglib/qmt/diagram_controller/dfactory.h
index d2933ff15fc..c55879c73e6 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dfactory.h
+++ b/src/libs/modelinglib/qmt/diagram_controller/dfactory.h
@@ -54,7 +54,7 @@ public:
     void visitMConnection(const MConnection *connection) override;
 
 private:
-    DElement *m_product;
+    DElement *m_product = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
index 62d3b4b4d79..a794de55a76 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
@@ -325,9 +325,7 @@ private:
 };
 
 DiagramController::DiagramController(QObject *parent)
-    : QObject(parent),
-      m_modelController(nullptr),
-      m_undoController(nullptr)
+    : QObject(parent)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
index 832fddd4b13..aa09636e5e3 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
+++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
@@ -167,8 +167,8 @@ private:
     void verifyDiagramsIntegrity();
     void verifyDiagramIntegrity(const MDiagram *diagram);
 
-    ModelController *m_modelController;
-    UndoController *m_undoController;
+    ModelController *m_modelController = nullptr;
+    UndoController *m_undoController = nullptr;
     QList<MDiagram *> m_allDiagrams;
 };
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
index dcab0ee3681..b1ca87b008e 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
@@ -96,16 +96,9 @@ public:
 
 DiagramSceneModel::DiagramSceneModel(QObject *parent)
     : QObject(parent),
-      m_diagramController(nullptr),
-      m_diagramSceneController(nullptr),
-      m_styleController(nullptr),
-      m_stereotypeController(nullptr),
-      m_diagram(nullptr),
       m_graphicsScene(new DiagramGraphicsScene(this)),
       m_latchController(new LatchController(this)),
-      m_busyState(NotBusy),
-      m_originItem(new OriginItem()),
-      m_focusItem(nullptr)
+      m_originItem(new OriginItem())
 {
     m_latchController->setDiagramSceneModel(this);
     connect(m_graphicsScene, &QGraphicsScene::selectionChanged,
@@ -115,7 +108,6 @@ DiagramSceneModel::DiagramSceneModel(QObject *parent)
     m_graphicsScene->addItem(m_originItem);
 
     m_latchController->addToGraphicsScene(m_graphicsScene);
-
 }
 
 DiagramSceneModel::~DiagramSceneModel()
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
index 212920fdd78..04cbf6b418d 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
@@ -169,21 +169,21 @@ private:
         RemoveElement
     };
 
-    DiagramController *m_diagramController;
-    DiagramSceneController *m_diagramSceneController;
-    StyleController *m_styleController;
-    StereotypeController *m_stereotypeController;
-    MDiagram *m_diagram;
-    DiagramGraphicsScene *m_graphicsScene;
-    LatchController *m_latchController;
+    DiagramController *m_diagramController = nullptr;
+    DiagramSceneController *m_diagramSceneController = nullptr;
+    StyleController *m_styleController = nullptr;
+    StereotypeController *m_stereotypeController = nullptr;
+    MDiagram *m_diagram = nullptr;
+    DiagramGraphicsScene *m_graphicsScene = nullptr;
+    LatchController *m_latchController = nullptr;
     QList<QGraphicsItem *> m_graphicsItems;
     QHash<const QGraphicsItem *, DElement *> m_itemToElementMap;
     QHash<const DElement *, QGraphicsItem *> m_elementToItemMap;
     QSet<QGraphicsItem *> m_selectedItems;
     QSet<QGraphicsItem *> m_secondarySelectedItems;
-    Busy m_busyState;
-    OriginItem *m_originItem;
-    QGraphicsItem *m_focusItem;
+    Busy m_busyState = NotBusy;
+    OriginItem *m_originItem = nullptr;
+    QGraphicsItem *m_focusItem = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
index 25aa2cfdca7..2a0a557190b 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
@@ -57,8 +57,7 @@
 namespace qmt {
 
 DiagramSceneModel::CreationVisitor::CreationVisitor(DiagramSceneModel *diagramSceneModel)
-    : m_diagramSceneModel(diagramSceneModel),
-      m_graphicsItem(nullptr)
+    : m_diagramSceneModel(diagramSceneModel)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h
index 4116dae5eea..a2bbefc9f0e 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h
@@ -55,8 +55,8 @@ public:
     void visitDSwimlane(DSwimlane *swimlane) override;
 
 private:
-    DiagramSceneModel *m_diagramSceneModel;
-    QGraphicsItem *m_graphicsItem;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
+    QGraphicsItem *m_graphicsItem = nullptr;
 };
 
 class QMT_EXPORT DiagramSceneModel::UpdateVisitor : public DVisitor
@@ -82,9 +82,9 @@ public:
     void visitDSwimlane(DSwimlane *swimlane) override;
 
 private:
-    QGraphicsItem *m_graphicsItem;
-    DiagramSceneModel *m_diagramSceneModel;
-    DElement *m_relatedElement;
+    QGraphicsItem *m_graphicsItem = nullptr;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
+    DElement *m_relatedElement = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp
index 9b0be56bd8f..6ac9ab91203 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp
@@ -41,13 +41,8 @@ namespace qmt {
 
 LatchController::LatchController(QObject *parent)
     : QObject(parent),
-      m_diagramSceneModel(nullptr),
       m_horizontalAlignLine(new AlignLineItem(AlignLineItem::Horizontal, 0)),
-      m_verticalAlignLine(new AlignLineItem(AlignLineItem::Vertical, 0)),
-      m_foundHorizontalLatch(false),
-      m_horizontalDist(0.0),
-      m_foundVerticalLatch(false),
-      m_verticalDist(0.0)
+      m_verticalAlignLine(new AlignLineItem(AlignLineItem::Vertical, 0))
 {
     m_horizontalAlignLine->setZValue(LATCH_LINES_ZVALUE);
     m_horizontalAlignLine->setVisible(false);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h
index 96a0d4759e9..18c977114fe 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h
@@ -67,15 +67,15 @@ private:
     void applyLatches();
 
 private:
-    DiagramSceneModel *m_diagramSceneModel;
-    AlignLineItem *m_horizontalAlignLine;
-    AlignLineItem *m_verticalAlignLine;
-    bool m_foundHorizontalLatch;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
+    AlignLineItem *m_horizontalAlignLine = nullptr;
+    AlignLineItem *m_verticalAlignLine = nullptr;
+    bool m_foundHorizontalLatch = false;
     ILatchable::Latch m_horizontalLatch;
-    qreal m_horizontalDist;
-    bool m_foundVerticalLatch;
+    qreal m_horizontalDist = 0.0;
+    bool m_foundVerticalLatch = false;
     ILatchable::Latch m_verticalLatch;
-    qreal m_verticalDist;
+    qreal m_verticalDist = 0.0;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp
index 6feb1a36953..0b5097fe639 100644
--- a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp
+++ b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp
@@ -64,12 +64,7 @@ DiagramsManager::ManagedDiagram::~ManagedDiagram()
 }
 
 DiagramsManager::DiagramsManager(QObject *parent)
-    : QObject(parent),
-      m_diagramsView(nullptr),
-      m_diagramController(nullptr),
-      m_diagramSceneController(nullptr),
-      m_styleController(nullptr),
-      m_stereotypeController(nullptr)
+    : QObject(parent)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h
index cb708b79d92..226c2389a54 100644
--- a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h
+++ b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h
@@ -84,11 +84,11 @@ private:
     void onDataChanged(const QModelIndex &topleft, const QModelIndex &bottomright);
 
     QPointer<TreeModel> m_model;
-    DiagramsViewInterface *m_diagramsView;
-    DiagramController *m_diagramController;
-    DiagramSceneController *m_diagramSceneController;
-    StyleController *m_styleController;
-    StereotypeController *m_stereotypeController;
+    DiagramsViewInterface *m_diagramsView = nullptr;
+    DiagramController *m_diagramController = nullptr;
+    DiagramSceneController *m_diagramSceneController = nullptr;
+    StyleController *m_styleController = nullptr;
+    StereotypeController *m_stereotypeController = nullptr;
     QHash<Uid, ManagedDiagram *> m_diagramUidToManagedDiagramMap;
 };
 
diff --git a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp
index 2c5200b8355..3e3a144f1c3 100644
--- a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp
+++ b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp
@@ -38,8 +38,7 @@
 namespace qmt {
 
 SceneInspector::SceneInspector(QObject *parent)
-    : QObject(parent),
-      m_diagramsManager(nullptr)
+    : QObject(parent)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h
index 5585dff33f3..dcc5bed532b 100644
--- a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h
+++ b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h
@@ -47,7 +47,7 @@ public:
     IResizable *resizable(const DElement *element, const MDiagram *diagram) const override;
 
 private:
-    DiagramsManager *m_diagramsManager;
+    DiagramsManager *m_diagramsManager = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp
index 43cd7a9a8bc..e0bce45f090 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp
@@ -37,8 +37,7 @@
 namespace qmt {
 
 DiagramsView::DiagramsView(QWidget *parent)
-    : QTabWidget(parent),
-      m_diagramsManager(nullptr)
+    : QTabWidget(parent)
 {
     setTabsClosable(true);
     setMovable(true);
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h
index e005df7c60d..ec8cc026a4c 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h
@@ -69,7 +69,7 @@ private:
     MDiagram *diagram(int tabIndex) const;
     MDiagram *diagram(DiagramView * diagramView) const;
 
-    DiagramsManager *m_diagramsManager;
+    DiagramsManager *m_diagramsManager = nullptr;
     QHash<Uid, DiagramView *> m_diagramViews;
 };
 
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
index 57c0ce1f46d..7592bc57db3 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
@@ -37,8 +37,7 @@
 namespace qmt {
 
 StackedDiagramsView::StackedDiagramsView(QWidget *parent)
-    : QStackedWidget(parent),
-      m_diagramsManager(nullptr)
+    : QStackedWidget(parent)
 {
     connect(this, &QStackedWidget::currentChanged, this, &StackedDiagramsView::onCurrentChanged);
 }
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h
index 495586075c6..36822ea245e 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h
@@ -67,7 +67,7 @@ private:
     MDiagram *diagram(int tabIndex) const;
     MDiagram *diagram(DiagramView * diagramView) const;
 
-    DiagramsManager *m_diagramsManager;
+    DiagramsManager *m_diagramsManager = nullptr;
     QHash<Uid, DiagramView *> m_diagramViews;
 };
 
diff --git a/src/libs/modelinglib/qmt/model/massociation.cpp b/src/libs/modelinglib/qmt/model/massociation.cpp
index 5bd833df522..79b88226d97 100644
--- a/src/libs/modelinglib/qmt/model/massociation.cpp
+++ b/src/libs/modelinglib/qmt/model/massociation.cpp
@@ -31,8 +31,6 @@
 namespace qmt {
 
 MAssociationEnd::MAssociationEnd()
-    : m_kind(Association),
-      m_isNavigable(false)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/model/massociation.h b/src/libs/modelinglib/qmt/model/massociation.h
index 82f6bdf0c6f..cec083f4fcd 100644
--- a/src/libs/modelinglib/qmt/model/massociation.h
+++ b/src/libs/modelinglib/qmt/model/massociation.h
@@ -61,8 +61,8 @@ public:
 private:
     QString m_name;
     QString m_cardinality;
-    Kind m_kind;
-    bool m_isNavigable;
+    Kind m_kind = Association;
+    bool m_isNavigable = false;
 };
 
 bool operator==(const MAssociationEnd &lhs, const MAssociationEnd &rhs);
diff --git a/src/libs/modelinglib/qmt/model/mitem.cpp b/src/libs/modelinglib/qmt/model/mitem.cpp
index 3eb766fa3b9..ada6be5fc09 100644
--- a/src/libs/modelinglib/qmt/model/mitem.cpp
+++ b/src/libs/modelinglib/qmt/model/mitem.cpp
@@ -31,9 +31,6 @@
 namespace qmt {
 
 MItem::MItem()
-    : MObject(),
-      m_isVarietyEditable(true),
-      m_isShapeEditable(false)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/model/mitem.h b/src/libs/modelinglib/qmt/model/mitem.h
index ebedea5efe8..e60efde215c 100644
--- a/src/libs/modelinglib/qmt/model/mitem.h
+++ b/src/libs/modelinglib/qmt/model/mitem.h
@@ -47,8 +47,8 @@ public:
 
 private:
     QString m_variety;
-    bool m_isVarietyEditable;
-    bool m_isShapeEditable;
+    bool m_isVarietyEditable = true;
+    bool m_isShapeEditable = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model/msourceexpansion.cpp b/src/libs/modelinglib/qmt/model/msourceexpansion.cpp
index d0b821e521c..1d02c2811a4 100644
--- a/src/libs/modelinglib/qmt/model/msourceexpansion.cpp
+++ b/src/libs/modelinglib/qmt/model/msourceexpansion.cpp
@@ -30,8 +30,6 @@
 namespace qmt {
 
 MSourceExpansion::MSourceExpansion()
-    : MExpansion(),
-      m_isTransient(false)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/model/msourceexpansion.h b/src/libs/modelinglib/qmt/model/msourceexpansion.h
index eb7c1bc3a50..a631f1ab5f4 100644
--- a/src/libs/modelinglib/qmt/model/msourceexpansion.h
+++ b/src/libs/modelinglib/qmt/model/msourceexpansion.h
@@ -47,7 +47,7 @@ public:
 
 private:
     QString m_sourceId;
-    bool m_isTransient;
+    bool m_isTransient = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp
index 464c5b77e6d..7231346b55f 100644
--- a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp
@@ -45,7 +45,6 @@
 namespace qmt {
 
 MCloneVisitor::MCloneVisitor()
-    : m_cloned(nullptr)
 {
 }
 
@@ -145,7 +144,6 @@ void MCloneVisitor::visitMConnection(const MConnection *connection)
 }
 
 MCloneDeepVisitor::MCloneDeepVisitor()
-    : m_cloned(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.h b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.h
index 437ed0d2407..2f833bc53e6 100644
--- a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.h
+++ b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.h
@@ -54,7 +54,7 @@ public:
     void visitMConnection(const MConnection *connection) override;
 
 private:
-    MElement *m_cloned;
+    MElement *m_cloned = nullptr;
 };
 
 class QMT_EXPORT MCloneDeepVisitor : public MConstVisitor
@@ -79,7 +79,7 @@ public:
     void visitMConnection(const MConnection *connection) override;
 
 private:
-    MElement *m_cloned;
+    MElement *m_cloned = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp
index ffdbfaa3fc4..5a2711b14c6 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp
+++ b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp
@@ -38,9 +38,7 @@
 namespace qmt {
 
 TreeModelManager::TreeModelManager(QObject *parent) :
-    QObject(parent),
-    m_treeModel(nullptr),
-    m_modelTreeView(nullptr)
+    QObject(parent)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h
index 0fdc158691a..ea5156c1171 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h
+++ b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h
@@ -55,8 +55,8 @@ public:
     MSelection selectedObjects() const;
 
 private:
-    TreeModel *m_treeModel;
-    ModelTreeViewInterface *m_modelTreeView;
+    TreeModel *m_treeModel = nullptr;
+    ModelTreeViewInterface *m_modelTreeView = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
index ecf898a1d92..37e74adeac8 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
@@ -48,9 +48,7 @@
 namespace qmt {
 
 ModelTreeView::ModelTreeView(QWidget *parent)
-    : QTreeView(parent),
-      m_sortedTreeModel(nullptr),
-      m_elementTasks(nullptr)
+    : QTreeView(parent)
 {
     setHeaderHidden(true);
     setSortingEnabled(false);
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
index dcbe916f63e..724097a3656 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
@@ -67,8 +67,8 @@ protected:
     void contextMenuEvent(QContextMenuEvent *event) override;
 
 private:
-    SortedTreeModel *m_sortedTreeModel;
-    IElementTasks *m_elementTasks;
+    SortedTreeModel *m_sortedTreeModel = nullptr;
+    IElementTasks *m_elementTasks = nullptr;
     QModelIndex m_autoDelayIndex;
     QTime m_autoDelayStartTime;
 };
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp
index d924c518846..350803d1684 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp
@@ -39,13 +39,7 @@ namespace qmt {
 
 PropertiesView::PropertiesView(QObject *parent)
     : QObject(parent),
-      m_modelController(nullptr),
-      m_diagramController(nullptr),
-      m_stereotypeController(nullptr),
-      m_styleController(nullptr),
-      m_viewFactory([=](PropertiesView *propertiesView) { return new MView(propertiesView); }),
-      m_selectedDiagram(nullptr),
-      m_widget(nullptr)
+      m_viewFactory([=](PropertiesView *propertiesView) { return new MView(propertiesView); })
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h
index 1eeaae307e9..78273ed01b9 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h
@@ -116,16 +116,16 @@ private:
     void beginUpdate(DElement *diagramElement);
     void endUpdate(DElement *diagramElement, bool cancelled);
 
-    ModelController *m_modelController;
-    DiagramController *m_diagramController;
-    StereotypeController *m_stereotypeController;
-    StyleController *m_styleController;
-    std::function<MView *(PropertiesView *)> m_viewFactory;
+    ModelController *m_modelController = nullptr;
+    DiagramController *m_diagramController = nullptr;
+    StereotypeController *m_stereotypeController = nullptr;
+    StyleController *m_styleController = nullptr;
+    std::function<MView *(PropertiesView *)> m_viewFactory = nullptr;
     QList<MElement *> m_selectedModelElements;
     QList<DElement *> m_selectedDiagramElements;
-    MDiagram *m_selectedDiagram;
+    MDiagram *m_selectedDiagram = nullptr;
     QScopedPointer<MView> m_mview;
-    QWidget *m_widget;
+    QWidget *m_widget = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
index 2cb9017e766..d0a87dfaa9d 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
@@ -285,50 +285,7 @@ static DAnnotation::VisualRole translateIndexToAnnotationVisualRole(int index)
 
 PropertiesView::MView::MView(PropertiesView *propertiesView)
     : m_propertiesView(propertiesView),
-      m_diagram(nullptr),
-      m_stereotypesController(new StereotypesController(this)),
-      m_topWidget(nullptr),
-      m_topLayout(nullptr),
-      m_stereotypeElement(StereotypeIcon::ElementAny),
-      m_classNameLabel(nullptr),
-      m_stereotypeComboBox(nullptr),
-      m_reverseEngineeredLabel(nullptr),
-      m_elementNameLineEdit(nullptr),
-      m_childrenLabel(nullptr),
-      m_relationsLabel(nullptr),
-      m_namespaceLineEdit(nullptr),
-      m_templateParametersLineEdit(nullptr),
-      m_classMembersStatusLabel(nullptr),
-      m_classMembersParseButton(nullptr),
-      m_classMembersEdit(nullptr),
-      m_diagramsLabel(nullptr),
-      m_itemVarietyEdit(nullptr),
-      m_endALabel(nullptr),
-      m_endBLabel(nullptr),
-      m_directionSelector(nullptr),
-      m_endAEndName(nullptr),
-      m_endACardinality(nullptr),
-      m_endANavigable(nullptr),
-      m_endAKind(nullptr),
-      m_endBEndName(nullptr),
-      m_endBCardinality(nullptr),
-      m_endBNavigable(nullptr),
-      m_endBKind(nullptr),
-      m_separatorLine(nullptr),
-      m_styleElementType(StyleEngine::TypeOther),
-      m_posRectLabel(nullptr),
-      m_autoSizedCheckbox(nullptr),
-      m_visualPrimaryRoleSelector(nullptr),
-      m_visualSecondaryRoleSelector(nullptr),
-      m_visualEmphasizedCheckbox(nullptr),
-      m_stereotypeDisplaySelector(nullptr),
-      m_depthLabel(nullptr),
-      m_templateDisplaySelector(nullptr),
-      m_showAllMembersCheckbox(nullptr),
-      m_plainShapeCheckbox(nullptr),
-      m_itemShapeEdit(nullptr),
-      m_annotationAutoWidthCheckbox(nullptr),
-      m_annotationVisualRoleSelector(nullptr)
+      m_stereotypesController(new StereotypesController(this))
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h
index 98c3f61c66c..1c3f091f354 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h
@@ -190,72 +190,72 @@ protected:
                                     void (T::*setter)(const E &),
                                     V (E::*vGetter)() const, void (E::*vSetter)(V));
 
-    PropertiesView *m_propertiesView;
+    PropertiesView *m_propertiesView = nullptr;
     QList<MElement *> m_modelElements;
     QList<DElement *> m_diagramElements;
-    MDiagram *m_diagram;
-    StereotypesController *m_stereotypesController;
-    QWidget *m_topWidget;
-    QFormLayout *m_topLayout;
+    MDiagram *m_diagram = nullptr;
+    StereotypesController *m_stereotypesController = nullptr;
+    QWidget *m_topWidget = nullptr;
+    QFormLayout *m_topLayout = nullptr;
     QList<const char *> m_rowToId;
     QString m_propertiesTitle;
     // MElement
-    StereotypeIcon::Element m_stereotypeElement;
-    QLabel *m_classNameLabel;
-    QComboBox *m_stereotypeComboBox;
-    QLabel *m_reverseEngineeredLabel;
+    StereotypeIcon::Element m_stereotypeElement = StereotypeIcon::ElementAny;
+    QLabel *m_classNameLabel = nullptr;
+    QComboBox *m_stereotypeComboBox = nullptr;
+    QLabel *m_reverseEngineeredLabel = nullptr;
     // MObject
-    QLineEdit *m_elementNameLineEdit;
-    QLabel *m_childrenLabel;
-    QLabel *m_relationsLabel;
+    QLineEdit *m_elementNameLineEdit = nullptr;
+    QLabel *m_childrenLabel = nullptr;
+    QLabel *m_relationsLabel = nullptr;
     // MClass
-    QLineEdit *m_namespaceLineEdit;
-    QLineEdit *m_templateParametersLineEdit;
-    QLabel *m_classMembersStatusLabel;
-    QPushButton *m_classMembersParseButton;
-    ClassMembersEdit *m_classMembersEdit;
+    QLineEdit *m_namespaceLineEdit = nullptr;
+    QLineEdit *m_templateParametersLineEdit = nullptr;
+    QLabel *m_classMembersStatusLabel = nullptr;
+    QPushButton *m_classMembersParseButton = nullptr;
+    ClassMembersEdit *m_classMembersEdit = nullptr;
     // MDiagram
-    QLabel *m_diagramsLabel;
+    QLabel *m_diagramsLabel = nullptr;
     // MItem
-    QLineEdit *m_itemVarietyEdit;
+    QLineEdit *m_itemVarietyEdit = nullptr;
     // MRelation
     QString m_endAName;
-    QLabel *m_endALabel;
+    QLabel *m_endALabel = nullptr;
     QString m_endBName;
-    QLabel *m_endBLabel;
+    QLabel *m_endBLabel = nullptr;
     // MDependency
-    QComboBox *m_directionSelector;
+    QComboBox *m_directionSelector = nullptr;
     // MAssociation
-    QLineEdit *m_endAEndName;
-    QLineEdit *m_endACardinality;
-    QCheckBox *m_endANavigable;
-    QComboBox *m_endAKind;
-    QLineEdit *m_endBEndName;
-    QLineEdit *m_endBCardinality;
-    QCheckBox *m_endBNavigable;
-    QComboBox *m_endBKind;
+    QLineEdit *m_endAEndName = nullptr;
+    QLineEdit *m_endACardinality = nullptr;
+    QCheckBox *m_endANavigable = nullptr;
+    QComboBox *m_endAKind = nullptr;
+    QLineEdit *m_endBEndName = nullptr;
+    QLineEdit *m_endBCardinality = nullptr;
+    QCheckBox *m_endBNavigable = nullptr;
+    QComboBox *m_endBKind = nullptr;
 
     // DElement
-    QFrame *m_separatorLine;
+    QFrame *m_separatorLine = nullptr;
     // DObject
-    StyleEngine::ElementType m_styleElementType;
-    QLabel *m_posRectLabel;
-    QCheckBox *m_autoSizedCheckbox;
-    PaletteBox *m_visualPrimaryRoleSelector;
-    QComboBox *m_visualSecondaryRoleSelector;
-    QCheckBox *m_visualEmphasizedCheckbox;
-    QComboBox *m_stereotypeDisplaySelector;
-    QLabel *m_depthLabel;
+    StyleEngine::ElementType m_styleElementType = StyleEngine::TypeOther;
+    QLabel *m_posRectLabel = nullptr;
+    QCheckBox *m_autoSizedCheckbox = nullptr;
+    PaletteBox *m_visualPrimaryRoleSelector = nullptr;
+    QComboBox *m_visualSecondaryRoleSelector = nullptr;
+    QCheckBox *m_visualEmphasizedCheckbox = nullptr;
+    QComboBox *m_stereotypeDisplaySelector = nullptr;
+    QLabel *m_depthLabel = nullptr;
     // DClass
-    QComboBox *m_templateDisplaySelector;
-    QCheckBox *m_showAllMembersCheckbox;
+    QComboBox *m_templateDisplaySelector = nullptr;
+    QCheckBox *m_showAllMembersCheckbox = nullptr;
     // DComponent
-    QCheckBox *m_plainShapeCheckbox;
+    QCheckBox *m_plainShapeCheckbox = nullptr;
     // DItem
-    QLineEdit *m_itemShapeEdit;
+    QLineEdit *m_itemShapeEdit = nullptr;
     // DAnnotation
-    QCheckBox *m_annotationAutoWidthCheckbox;
-    QComboBox *m_annotationVisualRoleSelector;
+    QCheckBox *m_annotationAutoWidthCheckbox = nullptr;
+    QComboBox *m_annotationVisualRoleSelector = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp b/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp
index 9698a2f601f..5feb0ebd560 100644
--- a/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp
+++ b/src/libs/modelinglib/qmt/project_controller/projectcontroller.cpp
@@ -43,8 +43,7 @@ ProjectIsModifiedException::ProjectIsModifiedException()
 }
 
 ProjectController::ProjectController(QObject *parent)
-    : QObject(parent),
-      m_isModified(false)
+    : QObject(parent)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/project_controller/projectcontroller.h b/src/libs/modelinglib/qmt/project_controller/projectcontroller.h
index 6945fa7322b..6b57522e202 100644
--- a/src/libs/modelinglib/qmt/project_controller/projectcontroller.h
+++ b/src/libs/modelinglib/qmt/project_controller/projectcontroller.h
@@ -73,7 +73,7 @@ public:
 
 private:
     QScopedPointer<Project> m_project;
-    bool m_isModified;
+    bool m_isModified = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/stereotype/shapevalue.h b/src/libs/modelinglib/qmt/stereotype/shapevalue.h
index 4b2f09a1dc7..8e184b147da 100644
--- a/src/libs/modelinglib/qmt/stereotype/shapevalue.h
+++ b/src/libs/modelinglib/qmt/stereotype/shapevalue.h
@@ -80,9 +80,9 @@ public:
                       qreal actualSize) const;
 
 private:
-    qreal m_value;
-    Unit m_unit;
-    Origin m_origin;
+    qreal m_value = 0.0;
+    Unit m_unit = UnitRelative;
+    Origin m_origin = OriginSmart;
 };
 
 class QMT_EXPORT ShapePointF
diff --git a/src/libs/modelinglib/qmt/style/objectvisuals.cpp b/src/libs/modelinglib/qmt/style/objectvisuals.cpp
index e9c73267f8b..a4bdadc26e6 100644
--- a/src/libs/modelinglib/qmt/style/objectvisuals.cpp
+++ b/src/libs/modelinglib/qmt/style/objectvisuals.cpp
@@ -30,10 +30,6 @@
 namespace qmt {
 
 ObjectVisuals::ObjectVisuals()
-    : m_visualPrimaryRole(DObject::PrimaryRoleNormal),
-      m_visualSecondaryRole(DObject::SecondaryRoleNone),
-      m_isEmphasized(false),
-      m_depth(0)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/style/objectvisuals.h b/src/libs/modelinglib/qmt/style/objectvisuals.h
index 715252befc1..0d708fe0a52 100644
--- a/src/libs/modelinglib/qmt/style/objectvisuals.h
+++ b/src/libs/modelinglib/qmt/style/objectvisuals.h
@@ -52,11 +52,11 @@ public:
     void setDepth(int depth);
 
 private:
-    DObject::VisualPrimaryRole m_visualPrimaryRole;
-    DObject::VisualSecondaryRole m_visualSecondaryRole;
-    bool m_isEmphasized;
+    DObject::VisualPrimaryRole m_visualPrimaryRole = DObject::PrimaryRoleNormal;
+    DObject::VisualSecondaryRole m_visualSecondaryRole = DObject::SecondaryRoleNone;
+    bool m_isEmphasized = false;
     QColor m_baseColor;
-    int m_depth;
+    int m_depth = 0;
 };
 
 bool operator==(const ObjectVisuals &lhs, const ObjectVisuals &rhs);
diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.cpp b/src/libs/modelinglib/qmt/style/stylecontroller.cpp
index d539ebec15b..947fef94459 100644
--- a/src/libs/modelinglib/qmt/style/stylecontroller.cpp
+++ b/src/libs/modelinglib/qmt/style/stylecontroller.cpp
@@ -54,8 +54,7 @@ StyleController::StyleController(QObject *parent)
     : QObject(parent),
       m_defaultStyle(new DefaultStyle),
       m_relationStarterStyle(new RelationStarterStyle),
-      m_defaultStyleEngine(new DefaultStyleEngine),
-      m_suppressGradients(false)
+      m_defaultStyleEngine(new DefaultStyleEngine)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.h b/src/libs/modelinglib/qmt/style/stylecontroller.h
index 789eb16226d..5a36da6e361 100644
--- a/src/libs/modelinglib/qmt/style/stylecontroller.h
+++ b/src/libs/modelinglib/qmt/style/stylecontroller.h
@@ -67,7 +67,7 @@ private:
     QScopedPointer<Style> m_defaultStyle;
     QScopedPointer<Style> m_relationStarterStyle;
     QScopedPointer<StyleEngine> m_defaultStyleEngine;
-    bool m_suppressGradients;
+    bool m_suppressGradients = false;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp
index f0f75863ae7..e896f084623 100644
--- a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp
+++ b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp
@@ -49,9 +49,6 @@
 namespace qmt {
 
 AlignOnRasterVisitor::AlignOnRasterVisitor()
-    : m_diagramController(nullptr),
-      m_sceneInspector(nullptr),
-      m_diagram(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h
index 690ae88129e..195f1a5c517 100644
--- a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h
+++ b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h
@@ -61,9 +61,9 @@ public:
     void visitDSwimlane(DSwimlane *swimlane) override;
 
 private:
-    DiagramController *m_diagramController;
-    ISceneInspector *m_sceneInspector;
-    MDiagram *m_diagram;
+    DiagramController *m_diagramController = nullptr;
+    ISceneInspector *m_sceneInspector = nullptr;
+    MDiagram *m_diagram = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.cpp b/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.cpp
index 8bbb88f60fa..a4bbd79528d 100644
--- a/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.cpp
+++ b/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.cpp
@@ -31,8 +31,6 @@
 namespace qmt {
 
 FindDiagramVisitor::FindDiagramVisitor()
-    : MVoidConstVisitor(),
-      m_diagram(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h b/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h
index bd664629f18..6be8e188d93 100644
--- a/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h
+++ b/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h
@@ -41,7 +41,7 @@ public:
     void visitMDiagram(const MDiagram *diagram) override;
 
 private:
-    const MDiagram *m_diagram;
+    const MDiagram *m_diagram = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.cpp b/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.cpp
index cf73774f324..6fad5d6d34d 100644
--- a/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.cpp
+++ b/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.cpp
@@ -30,8 +30,6 @@
 namespace qmt {
 
 FindRootDiagramVisitor::FindRootDiagramVisitor()
-    : MVoidVisitor(),
-      m_diagram(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h b/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h
index a520ef6e341..c06315a0cd7 100644
--- a/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h
+++ b/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h
@@ -42,7 +42,7 @@ public:
     void visitMObject(MObject *object) override;
 
 private:
-    MDiagram *m_diagram;
+    MDiagram *m_diagram = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h
index 6a52047dd57..e4ba311a854 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h
@@ -296,9 +296,7 @@ private:
 
 public:
     explicit QXmlInArchive(QXmlStreamReader &stream)
-        : m_stream(stream),
-          m_endTagWasRead(false),
-          m_currentRefNode(nullptr)
+        : m_stream(stream)
     {
     }
 
@@ -837,10 +835,10 @@ private:
     inline void skipUntilEndOfTag(const XmlTag &xmlTag);
 
     QXmlStreamReader &m_stream;
-    bool m_endTagWasRead;
+    bool m_endTagWasRead = false;
     QStack<Node *> m_nodeStack;
     impl::LoadingRefMap m_loadingRefMap;
-    Node *m_currentRefNode;
+    Node *m_currentRefNode = nullptr;
 };
 
 QXmlInArchive::XmlTag QXmlInArchive::readTag()
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h
index 91525173cbc..8c51d0a2c49 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h
@@ -52,8 +52,7 @@ public:
     static const bool outArchive = true;
 
     QXmlOutArchive(QXmlStreamWriter &stream)
-        : m_stream(stream),
-          m_isNextPointerAReference(false)
+        : m_stream(stream)
     {
     }
 
@@ -322,7 +321,7 @@ public:
 private:
     QXmlStreamWriter &m_stream;
     impl::SavingRefMap m_savingRefMap;
-    bool m_isNextPointerAReference;
+    bool m_isNextPointerAReference = false;
 };
 
 } // namespace qark
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
index 4e631d94f53..c92ac8f3760 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
@@ -119,8 +119,6 @@ public:
         typedef Archive &(*LoadFuncType)(Archive &, BASE * &p);
 
         explicit TypeInfo()
-            : m_saveFunc(nullptr),
-              m_loadFunc(nullptr)
         {
         }
 
@@ -135,8 +133,8 @@ public:
             return m_saveFunc == rhs.m_saveFunc && m_loadFunc == rhs.m_loadFunc;
         }
 
-        SaveFuncType m_saveFunc;
-        LoadFuncType m_loadFunc;
+        SaveFuncType m_saveFunc = nullptr;
+        LoadFuncType m_loadFunc = nullptr;
     };
 
     typedef QHash<QString, TypeInfo> MapType;