ModelEditor: Replace 0 with nullptr in modelinglib

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

107 files changed, 434 insertions, 433 deletions

diff --git a/src/libs/modelinglib/qmt/config/configcontroller.cpp b/src/libs/modelinglib/qmt/config/configcontroller.cpp
index 70cd4805746..c7b9a783557 100644
--- a/src/libs/modelinglib/qmt/config/configcontroller.cpp
+++ b/src/libs/modelinglib/qmt/config/configcontroller.cpp
@@ -42,7 +42,7 @@ namespace qmt {
 class ConfigController::ConfigControllerPrivate
 {
 public:
-    StereotypeController *m_stereotypeController = 0;
+    StereotypeController *m_stereotypeController = nullptr;
 };
 
 ConfigController::ConfigController(QObject *parent)
diff --git a/src/libs/modelinglib/qmt/config/configcontroller.h b/src/libs/modelinglib/qmt/config/configcontroller.h
index 3b715ec64cd..c14202b8c1c 100644
--- a/src/libs/modelinglib/qmt/config/configcontroller.h
+++ b/src/libs/modelinglib/qmt/config/configcontroller.h
@@ -41,7 +41,7 @@ class QMT_EXPORT ConfigController : public QObject
     class ConfigControllerPrivate;
 
 public:
-    explicit ConfigController(QObject *parent = 0);
+    explicit ConfigController(QObject *parent = nullptr);
     ~ConfigController() override;
 
     void setStereotypeController(StereotypeController *stereotypeController);
diff --git a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
index 444c3e83cbd..8c28e638382 100644
--- a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
+++ b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
@@ -321,10 +321,10 @@ void StereotypeDefinitionParser::parse(ITextSource *source)
     try {
         parseFile();
     } catch (...) {
-        d->m_scanner = 0;
+        d->m_scanner = nullptr;
         throw;
     }
-    d->m_scanner = 0;
+    d->m_scanner = nullptr;
 }
 
 void StereotypeDefinitionParser::parseFile()
diff --git a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h
index e132f2747d5..2a25e70b095 100644
--- a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h
+++ b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h
@@ -74,7 +74,7 @@ class QMT_EXPORT StereotypeDefinitionParser : public QObject
     };
 
 public:
-    explicit StereotypeDefinitionParser(QObject *parent = 0);
+    explicit StereotypeDefinitionParser(QObject *parent = nullptr);
     ~StereotypeDefinitionParser() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/config/textscanner.cpp b/src/libs/modelinglib/qmt/config/textscanner.cpp
index 3b156147bd1..32e3d937c10 100644
--- a/src/libs/modelinglib/qmt/config/textscanner.cpp
+++ b/src/libs/modelinglib/qmt/config/textscanner.cpp
@@ -57,7 +57,7 @@ public:
     int m_maxOperatorLength = 0;
     QSet<QChar> m_operatorFirstCharsSet;
     QSet<QChar> m_operatorCharsSet;
-    ITextSource *m_source = 0;
+    ITextSource *m_source = nullptr;
     QStack<SourceChar> m_unreadSourceChars;
     SourcePos m_lastSourcePos;
     QStack<Token> m_unreadTokens;
diff --git a/src/libs/modelinglib/qmt/config/textscanner.h b/src/libs/modelinglib/qmt/config/textscanner.h
index de682a65c46..941a3a5b3e3 100644
--- a/src/libs/modelinglib/qmt/config/textscanner.h
+++ b/src/libs/modelinglib/qmt/config/textscanner.h
@@ -55,7 +55,7 @@ class QMT_EXPORT TextScanner : public QObject
     class TextScannerPrivate;
 
 public:
-    explicit TextScanner(QObject *parent = 0);
+    explicit TextScanner(QObject *parent = nullptr);
     ~TextScanner() override;
 
     void setKeywords(const QList<QPair<QString, int> > &keywords);
diff --git a/src/libs/modelinglib/qmt/controller/namecontroller.h b/src/libs/modelinglib/qmt/controller/namecontroller.h
index ec77165695c..50ed023d201 100644
--- a/src/libs/modelinglib/qmt/controller/namecontroller.h
+++ b/src/libs/modelinglib/qmt/controller/namecontroller.h
@@ -38,7 +38,7 @@ class QMT_EXPORT NameController : public QObject
     Q_OBJECT
 
 private:
-    explicit NameController(QObject *parent = 0);
+    explicit NameController(QObject *parent = nullptr);
     ~NameController() override;
 
 public:
diff --git a/src/libs/modelinglib/qmt/controller/undocontroller.h b/src/libs/modelinglib/qmt/controller/undocontroller.h
index 7a3e162d1b4..c696c6c1a1e 100644
--- a/src/libs/modelinglib/qmt/controller/undocontroller.h
+++ b/src/libs/modelinglib/qmt/controller/undocontroller.h
@@ -41,7 +41,7 @@ class QMT_EXPORT UndoController : public QObject
     Q_OBJECT
 
 public:
-    explicit UndoController(QObject *parent = 0);
+    explicit UndoController(QObject *parent = nullptr);
     ~UndoController() override;
 
     QUndoStack *undoStack() const { return m_undoStack; }
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp
index b2d685e0e5f..e689c4cb210 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp
@@ -45,7 +45,7 @@
 namespace qmt {
 
 DCloneVisitor::DCloneVisitor()
-    : m_cloned(0)
+    : m_cloned(nullptr)
 {
 }
 
@@ -154,7 +154,7 @@ void DCloneVisitor::visitDSwimlane(const DSwimlane *swimlane)
 
 
 DCloneDeepVisitor::DCloneDeepVisitor()
-    : m_cloned(0)
+    : m_cloned(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp b/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp
index c4c9c4fc31c..648a2c671d1 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp
@@ -54,7 +54,7 @@
 namespace qmt {
 
 DFactory::DFactory()
-    : m_product(0)
+    : m_product(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
index e523cc1ff9d..62d3b4b4d79 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
@@ -55,7 +55,7 @@ class DiagramController::Clone
 public:
     Uid m_elementKey;
     int m_indexOfElement = -1;
-    DElement *m_clonedElement = 0;
+    DElement *m_clonedElement = nullptr;
 };
 
 class DiagramController::DiagramUndoCommand : public UndoCommand
@@ -84,7 +84,7 @@ protected:
     }
 
 private:
-    DiagramController *m_diagramController = 0;
+    DiagramController *m_diagramController = nullptr;
     Uid m_diagramKey;
 };
 
@@ -225,7 +225,7 @@ protected:
             QMT_CHECK(clone.m_clonedElement->uid() == clone.m_elementKey);
             emit diagramController->beginInsertElement(clone.m_indexOfElement, diagram);
             diagram->insertDiagramElement(clone.m_indexOfElement, clone.m_clonedElement);
-            clone.m_clonedElement = 0;
+            clone.m_clonedElement = nullptr;
             emit diagramController->endInsertElement(clone.m_indexOfElement, diagram);
             inserted = true;
         }
@@ -321,7 +321,7 @@ public:
     }
 
 private:
-    QList<MDiagram *> *m_allDiagrams = 0;
+    QList<MDiagram *> *m_allDiagrams = nullptr;
 };
 
 DiagramController::DiagramController(QObject *parent)
@@ -338,8 +338,8 @@ DiagramController::~DiagramController()
 void DiagramController::setModelController(ModelController *modelController)
 {
     if (m_modelController) {
-        disconnect(m_modelController, 0, this, 0);
-        m_modelController = 0;
+        disconnect(m_modelController, nullptr, this, nullptr);
+        m_modelController = nullptr;
     }
     if (modelController) {
         m_modelController = modelController;
@@ -432,7 +432,7 @@ DElement *DiagramController::findElement(const Uid &key, const MDiagram *diagram
 bool DiagramController::hasDelegate(const MElement *modelElement, const MDiagram *diagram) const
 {
     // PERFORM smarter implementation after map is introduced
-    return findDelegate(modelElement, diagram) != 0;
+    return findDelegate(modelElement, diagram) != nullptr;
 }
 
 DElement *DiagramController::findDelegate(const MElement *modelElement, const MDiagram *diagram) const
@@ -442,7 +442,7 @@ DElement *DiagramController::findDelegate(const MElement *modelElement, const MD
         if (diagramElement->modelUid().isValid() && diagramElement->modelUid() == modelElement->uid())
             return diagramElement;
     }
-    return 0;
+    return nullptr;
 }
 
 void DiagramController::startUpdateElement(DElement *element, MDiagram *diagram, UpdateAction updateAction)
@@ -757,7 +757,7 @@ DElement *DiagramController::findElementOnAnyDiagram(const Uid &uid)
         if (element)
             return element;
     }
-    return 0;
+    return nullptr;
 }
 
 void DiagramController::removeObjects(MObject *modelObject)
@@ -890,7 +890,7 @@ DReferences DiagramController::simplify(const DSelection &diagramSelection, cons
 MElement *DiagramController::delegatedElement(const DElement *element) const
 {
     if (!element->modelUid().isValid())
-        return 0;
+        return nullptr;
     return m_modelController->findElement(element->modelUid());
 }
 
@@ -936,10 +936,10 @@ void DiagramController::verifyDiagramIntegrity(const MDiagram *diagram)
     QHash<Uid, const DElement *> delementsMap;
     foreach (const DElement *delement, diagram->diagramElements()) {
         delementsMap.insert(delement->uid(), delement);
-        if (dynamic_cast<const DObject *>(delement) != 0 || dynamic_cast<const DRelation *>(delement) != 0) {
+        if (dynamic_cast<const DObject *>(delement) || dynamic_cast<const DRelation *>(delement)) {
             QMT_ASSERT(delement->modelUid().isValid(), return);
-            QMT_ASSERT(m_modelController->findElement(delement->modelUid()) != 0, return);
-            if (!delement->modelUid().isValid() || m_modelController->findElement(delement->modelUid()) == 0) {
+            QMT_ASSERT(m_modelController->findElement(delement->modelUid()), return);
+            if (!delement->modelUid().isValid() || !m_modelController->findElement(delement->modelUid())) {
                 if (const DObject *dobject = dynamic_cast<const DObject *>(delement))
                     qWarning() << "Diagram" << diagram->name() << diagram->uid().toString() << ": object" << dobject->name() << dobject->uid().toString() << "has invalid reference to model element.";
                 else if (const DRelation *drelation = dynamic_cast<const DRelation *>(delement))
diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
index 1f688198a43..832fddd4b13 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
+++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
@@ -65,7 +65,7 @@ private:
     class FindDiagramsVisitor;
 
 public:
-    explicit DiagramController(QObject *parent = 0);
+    explicit DiagramController(QObject *parent = nullptr);
     ~DiagramController() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
index 818da1e5e50..4b99d5e69a2 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
@@ -156,7 +156,7 @@ void DUpdateVisitor::visitMRelation(const MRelation *relation)
     DObject *endAObject = dynamic_cast<DObject *>(m_diagram->findDiagramElement(drelation->endAUid()));
     if (!endAObject || relation->endAUid() != endAObject->modelUid()) {
         (void) isUpdating(true);
-        endAObject = 0;
+        endAObject = nullptr;
         // TODO use DiagramController::findDelegate (and improve performance of that method)
         foreach (DElement *diagramElement, m_diagram->diagramElements()) {
             if (diagramElement->modelUid().isValid() && diagramElement->modelUid() == relation->endAUid()) {
@@ -172,7 +172,7 @@ void DUpdateVisitor::visitMRelation(const MRelation *relation)
     DObject *endBObject = dynamic_cast<DObject *>(m_diagram->findDiagramElement(drelation->endBUid()));
     if (!endBObject || relation->endBUid() != endBObject->modelUid()) {
         (void) isUpdating(true);
-        endBObject = 0;
+        endBObject = nullptr;
         // TODO use DiagramController::findDelegate
         foreach (DElement *diagramElement, m_diagram->diagramElements()) {
             if (diagramElement->modelUid().isValid() && diagramElement->modelUid() == relation->endBUid()) {
diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h
index bb7b0ec81c6..eb1371ea98a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h
@@ -40,7 +40,7 @@ public:
     virtual ~IIntersectionable() { }
 
     virtual bool intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint,
-                                        QLineF *intersectionLine = 0) const = 0;
+                                        QLineF *intersectionLine = nullptr) const = 0;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h b/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h
index 3be43fa3970..2d1fe1a15a3 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h
@@ -37,7 +37,7 @@ class QMT_EXPORT DiagramGraphicsScene : public QGraphicsScene
     Q_OBJECT
 
 public:
-    explicit DiagramGraphicsScene(DiagramSceneModel *diagramSceneModel, QObject *parent = 0);
+    explicit DiagramGraphicsScene(DiagramSceneModel *diagramSceneModel, QObject *parent = nullptr);
     ~DiagramGraphicsScene() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
index 426926b9b35..dcab0ee3681 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
@@ -72,7 +72,7 @@ namespace qmt {
 class DiagramSceneModel::OriginItem : public QGraphicsItem
 {
 public:
-    explicit OriginItem(QGraphicsItem *parent = 0)
+    explicit OriginItem(QGraphicsItem *parent = nullptr)
         : QGraphicsItem(parent)
     {
     }
@@ -96,16 +96,16 @@ public:
 
 DiagramSceneModel::DiagramSceneModel(QObject *parent)
     : QObject(parent),
-      m_diagramController(0),
-      m_diagramSceneController(0),
-      m_styleController(0),
-      m_stereotypeController(0),
-      m_diagram(0),
+      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(0)
+      m_focusItem(nullptr)
 {
     m_latchController->setDiagramSceneModel(this);
     connect(m_graphicsScene, &QGraphicsScene::selectionChanged,
@@ -124,7 +124,7 @@ DiagramSceneModel::~DiagramSceneModel()
     m_latchController->removeFromGraphicsScene(m_graphicsScene);
     disconnect();
     if (m_diagramController)
-        disconnect(m_diagramController, 0, this, 0);
+        disconnect(m_diagramController, nullptr, this, nullptr);
     m_graphicsScene->deleteLater();
 }
 
@@ -133,8 +133,8 @@ void DiagramSceneModel::setDiagramController(DiagramController *diagramControlle
     if (m_diagramController == diagramController)
         return;
     if (m_diagramController) {
-        disconnect(m_diagramController, 0, this, 0);
-        m_diagramController = 0;
+        disconnect(m_diagramController, nullptr, this, nullptr);
+        m_diagramController = nullptr;
     }
     m_diagramController = diagramController;
     if (diagramController) {
@@ -201,7 +201,7 @@ bool DiagramSceneModel::hasMultiObjectsSelection() const
     foreach (QGraphicsItem *item, m_graphicsScene->selectedItems()) {
         DElement *element = m_itemToElementMap.value(item);
         QMT_CHECK(element);
-        if (dynamic_cast<DObject *>(element) != 0) {
+        if (dynamic_cast<DObject *>(element)) {
             ++count;
             if (count > 1)
                 return true;
@@ -229,7 +229,7 @@ DElement *DiagramSceneModel::findTopmostElement(const QPointF &scenePos) const
         if (m_graphicsItems.contains(item))
             return m_itemToElementMap.value(item);
     }
-    return 0;
+    return nullptr;
 }
 
 DObject *DiagramSceneModel::findTopmostObject(const QPointF &scenePos) const
@@ -277,7 +277,7 @@ DElement *DiagramSceneModel::element(QGraphicsItem *item) const
 bool DiagramSceneModel::isElementEditable(const DElement *element) const
 {
     auto editable = dynamic_cast<IEditable *>(m_elementToItemMap.value(element));
-    return editable != 0 && editable->isEditable();
+    return editable && editable->isEditable();
 }
 
 void DiagramSceneModel::selectAllElements()
@@ -300,7 +300,7 @@ void DiagramSceneModel::selectElement(DElement *element)
 void DiagramSceneModel::editElement(DElement *element)
 {
     auto editable = dynamic_cast<IEditable *>(m_elementToItemMap.value(element));
-    if (editable != 0 && editable->isEditable())
+    if (editable && editable->isEditable())
         editable->edit();
 }
 
@@ -643,7 +643,7 @@ void DiagramSceneModel::mouseReleaseEventReparenting(QGraphicsSceneMouseEvent *e
 {
     if (event->modifiers() & Qt::AltModifier) {
         ModelController *modelController = diagramController()->modelController();
-        MPackage *newOwner = 0;
+        MPackage *newOwner = nullptr;
         QSet<QGraphicsItem *> selectedItemSet = m_graphicsScene->selectedItems().toSet();
         QList<QGraphicsItem *> itemsUnderMouse = m_graphicsScene->items(event->scenePos());
         foreach (QGraphicsItem *item, itemsUnderMouse) {
@@ -744,7 +744,7 @@ void DiagramSceneModel::onBeginInsertElement(int row, const MDiagram *diagram)
 void DiagramSceneModel::onEndInsertElement(int row, const MDiagram *diagram)
 {
     QMT_CHECK(m_busyState == InsertElement);
-    QGraphicsItem *item = 0;
+    QGraphicsItem *item = nullptr;
     if (diagram == m_diagram) {
         DElement *element = diagram->diagramElements().at(row);
         item = createGraphicsItem(element);
@@ -805,7 +805,7 @@ void DiagramSceneModel::onSelectionChanged()
     // select all contained objects secondarily
     foreach (QGraphicsItem *selectedItem, m_selectedItems) {
         foreach (QGraphicsItem *item, collectCollidingObjectItems(selectedItem, CollidingInnerItems)) {
-            if (!item->isSelected() && dynamic_cast<ISelectable *>(item) != 0
+            if (!item->isSelected() && dynamic_cast<ISelectable *>(item)
                     && item->collidesWithItem(selectedItem, Qt::ContainsItemBoundingRect)
                     && isInFrontOf(item, selectedItem)) {
                 QMT_CHECK(!m_selectedItems.contains(item));
@@ -891,7 +891,7 @@ void DiagramSceneModel::clearGraphicsScene()
     m_elementToItemMap.clear();
     m_selectedItems.clear();
     m_secondarySelectedItems.clear();
-    m_focusItem = 0;
+    m_focusItem = nullptr;
     // save extra items from being deleted
     removeExtraSceneItems();
     m_graphicsScene->clear();
@@ -961,8 +961,8 @@ void DiagramSceneModel::deleteGraphicsItem(QGraphicsItem *item, DElement *elemen
 void DiagramSceneModel::updateFocusItem(const QSet<QGraphicsItem *> &selectedItems)
 {
     QGraphicsItem *mouseGrabberItem = m_graphicsScene->mouseGrabberItem();
-    QGraphicsItem *focusItem = 0;
-    ISelectable *selectable = 0;
+    QGraphicsItem *focusItem = nullptr;
+    ISelectable *selectable = nullptr;
 
     if (mouseGrabberItem && selectedItems.contains(mouseGrabberItem)) {
         selectable = dynamic_cast<ISelectable *>(mouseGrabberItem);
@@ -985,7 +985,7 @@ void DiagramSceneModel::unsetFocusItem()
             oldSelectable->setFocusSelected(false);
         else
             QMT_CHECK(false);
-        m_focusItem = 0;
+        m_focusItem = nullptr;
     }
 }
 
@@ -995,7 +995,7 @@ bool DiagramSceneModel::isInFrontOf(const QGraphicsItem *frontItem, const QGraph
     QMT_ASSERT(backItem, return false);
 
     // shortcut for usual case of root items
-    if (frontItem->parentItem() == 0 && backItem->parentItem() == 0) {
+    if (!frontItem->parentItem() && !backItem->parentItem()) {
         foreach (const QGraphicsItem *item, m_graphicsScene->items()) {
             if (item == frontItem)
                 return true;
@@ -1009,7 +1009,7 @@ bool DiagramSceneModel::isInFrontOf(const QGraphicsItem *frontItem, const QGraph
     // collect all anchestors of front item
     QList<const QGraphicsItem *> frontStack;
     const QGraphicsItem *iterator = frontItem;
-    while (iterator != 0) {
+    while (iterator) {
         frontStack.append(iterator);
         iterator = iterator->parentItem();
     }
@@ -1017,7 +1017,7 @@ bool DiagramSceneModel::isInFrontOf(const QGraphicsItem *frontItem, const QGraph
     // collect all anchestors of back item
     QList<const QGraphicsItem *> backStack;
     iterator = backItem;
-    while (iterator != 0) {
+    while (iterator) {
         backStack.append(iterator);
         iterator = iterator->parentItem();
     }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
index 7c11c799da8..212920fdd78 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
@@ -74,7 +74,7 @@ public:
         CollidingOuterItems
     };
 
-    explicit DiagramSceneModel(QObject *parent = 0);
+    explicit DiagramSceneModel(QObject *parent = nullptr);
     ~DiagramSceneModel() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
index 55ff3fd9e26..25aa2cfdca7 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
@@ -166,12 +166,12 @@ void DiagramSceneModel::UpdateVisitor::visitDElement(DElement *element)
 
 void DiagramSceneModel::UpdateVisitor::visitDObject(DObject *object)
 {
-    if (m_relatedElement == 0) {
+    if (!m_relatedElement) {
         // update all related relations
         foreach (QGraphicsItem *item, m_diagramSceneModel->m_graphicsItems) {
             DElement *element = m_diagramSceneModel->m_itemToElementMap.value(item);
             QMT_CHECK(element);
-            if (dynamic_cast<DRelation *>(element) != 0) {
+            if (dynamic_cast<DRelation *>(element)) {
                 UpdateVisitor visitor(item, m_diagramSceneModel, object);
                 element->accept(&visitor);
             }
@@ -183,7 +183,7 @@ void DiagramSceneModel::UpdateVisitor::visitDPackage(DPackage *package)
 {
     QMT_ASSERT(m_graphicsItem, return);
 
-    if (m_relatedElement == 0) {
+    if (!m_relatedElement) {
         PackageItem *packageItem = qgraphicsitem_cast<PackageItem *>(m_graphicsItem);
         QMT_ASSERT(packageItem, return);
         QMT_CHECK(packageItem->object() == package);
@@ -197,7 +197,7 @@ void DiagramSceneModel::UpdateVisitor::visitDClass(DClass *klass)
 {
     QMT_ASSERT(m_graphicsItem, return);
 
-    if (m_relatedElement == 0) {
+    if (!m_relatedElement) {
         ClassItem *classItem = qgraphicsitem_cast<ClassItem *>(m_graphicsItem);
         QMT_ASSERT(classItem, return);
         QMT_CHECK(classItem->object() == klass);
@@ -211,7 +211,7 @@ void DiagramSceneModel::UpdateVisitor::visitDComponent(DComponent *component)
 {
     QMT_ASSERT(m_graphicsItem, return);
 
-    if (m_relatedElement == 0) {
+    if (!m_relatedElement) {
         ComponentItem *componentItem = qgraphicsitem_cast<ComponentItem *>(m_graphicsItem);
         QMT_ASSERT(componentItem, return);
         QMT_CHECK(componentItem->object() == component);
@@ -225,7 +225,7 @@ void DiagramSceneModel::UpdateVisitor::visitDDiagram(DDiagram *diagram)
 {
     QMT_ASSERT(m_graphicsItem, return);
 
-    if (m_relatedElement == 0) {
+    if (!m_relatedElement) {
         DiagramItem *documentItem = qgraphicsitem_cast<DiagramItem *>(m_graphicsItem);
         QMT_ASSERT(documentItem, return);
         QMT_CHECK(documentItem->object() == diagram);
@@ -239,7 +239,7 @@ void DiagramSceneModel::UpdateVisitor::visitDItem(DItem *item)
 {
     QMT_ASSERT(m_graphicsItem, return);
 
-    if (m_relatedElement == 0) {
+    if (!m_relatedElement) {
         ItemItem *itemItem = qgraphicsitem_cast<ItemItem *>(m_graphicsItem);
         QMT_ASSERT(itemItem, return);
         QMT_CHECK(itemItem->object() == item);
@@ -253,7 +253,7 @@ void DiagramSceneModel::UpdateVisitor::visitDRelation(DRelation *relation)
 {
     QMT_ASSERT(m_graphicsItem, return);
 
-    if (m_relatedElement == 0
+    if (!m_relatedElement
             || m_relatedElement->uid() == relation->endAUid()
             || m_relatedElement->uid() == relation->endBUid()) {
         RelationItem *relationItem = qgraphicsitem_cast<RelationItem *>(m_graphicsItem);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h
index 09ed4e11815..4116dae5eea 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h
@@ -63,7 +63,7 @@ class QMT_EXPORT DiagramSceneModel::UpdateVisitor : public DVisitor
 {
 public:
     UpdateVisitor(QGraphicsItem *item, DiagramSceneModel *diagramSceneModel,
-                  DElement *relatedElement = 0);
+                  DElement *relatedElement = nullptr);
 
     void visitDElement(DElement *element) override;
     void visitDObject(DObject *object) override;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp
index 990876f6d7e..d9da017d58c 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp
@@ -275,7 +275,7 @@ void AnnotationItem::updateSelectionMarker()
         if (m_selectionMarker->scene())
             m_selectionMarker->scene()->removeItem(m_selectionMarker);
         delete m_selectionMarker;
-        m_selectionMarker = 0;
+        m_selectionMarker = nullptr;
     }
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h
index 69b77670de2..d7bce8d8dc7 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h
@@ -50,7 +50,7 @@ class AnnotationItem :
 
 public:
     AnnotationItem(DAnnotation *annotation, DiagramSceneModel *diagramSceneModel,
-                   QGraphicsItem *parent = 0);
+                   QGraphicsItem *parent = nullptr);
     ~AnnotationItem() override;
 
     DAnnotation *annotation() const { return m_annotation; }
@@ -100,13 +100,13 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    DAnnotation *m_annotation = 0;
-    DiagramSceneModel *m_diagramSceneModel = 0;
+    DAnnotation *m_annotation = nullptr;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
     bool m_isSecondarySelected = false;
     bool m_isFocusSelected = false;
-    RectangularSelectionItem *m_selectionMarker = 0;
-    QGraphicsRectItem *m_noTextItem = 0;
-    AnnotationTextItem *m_textItem = 0;
+    RectangularSelectionItem *m_selectionMarker = nullptr;
+    QGraphicsRectItem *m_noTextItem = nullptr;
+    AnnotationTextItem *m_textItem = nullptr;
     bool m_isUpdating = false;
     bool m_isChanged = false;
 };
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
index 946367119b2..1aee12d4652 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
@@ -86,7 +86,7 @@ void AssociationItem::updateEndLabels(const DAssociationEnd &end, const DAssocia
     } else if (*endName) {
         (*endName)->scene()->removeItem(*endName);
         delete *endName;
-        *endName = 0;
+        *endName = nullptr;
     }
 
     if (!otherEnd.cardinality().isEmpty()) {
@@ -98,7 +98,7 @@ void AssociationItem::updateEndLabels(const DAssociationEnd &end, const DAssocia
     } else if (*endCardinality) {
         (*endCardinality)->scene()->removeItem(*endCardinality);
         delete *endCardinality;
-        *endCardinality = 0;
+        *endCardinality = nullptr;
     }
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h
index ad076eee591..ea11df42e34 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h
@@ -40,7 +40,7 @@ class AssociationItem : public RelationItem
 {
 public:
     AssociationItem(DAssociation *association, DiagramSceneModel *diagramSceneModel,
-                    QGraphicsItem *parent = 0);
+                    QGraphicsItem *parent = nullptr);
     ~AssociationItem() override;
 
 protected:
@@ -54,11 +54,11 @@ private:
                         QGraphicsItem *endCardinality,
                         QGraphicsItem *endItem, double headLength);
 
-    DAssociation *m_association = 0;
-    QGraphicsSimpleTextItem *m_endAName = 0;
-    QGraphicsSimpleTextItem *m_endACardinality = 0;
-    QGraphicsSimpleTextItem *m_endBName = 0;
-    QGraphicsSimpleTextItem *m_endBCardinality = 0;
+    DAssociation *m_association = nullptr;
+    QGraphicsSimpleTextItem *m_endAName = nullptr;
+    QGraphicsSimpleTextItem *m_endACardinality = nullptr;
+    QGraphicsSimpleTextItem *m_endBName = nullptr;
+    QGraphicsSimpleTextItem *m_endBCardinality = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp
index 63a085465bc..cedfc5816c0 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp
@@ -126,7 +126,7 @@ void BoundaryItem::update()
     } else if (m_noTextItem) {
         m_noTextItem->scene()->removeItem(m_noTextItem);
         delete m_noTextItem;
-        m_noTextItem = 0;
+        m_noTextItem = nullptr;
     }
 
     // item shown if annotation has no text and is not selected
@@ -323,7 +323,7 @@ void BoundaryItem::updateSelectionMarker()
         if (m_selectionMarker->scene())
             m_selectionMarker->scene()->removeItem(m_selectionMarker);
         delete m_selectionMarker;
-        m_selectionMarker = 0;
+        m_selectionMarker = nullptr;
     }
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h
index 78843a3a5ce..d2105c08bf9 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h
@@ -50,7 +50,7 @@ class BoundaryItem :
 
 public:
     BoundaryItem(DBoundary *boundary, DiagramSceneModel *diagramSceneModel,
-                 QGraphicsItem *parent = 0);
+                 QGraphicsItem *parent = nullptr);
     ~BoundaryItem() override;
 
     DBoundary *boundary() const { return m_boundary; }
@@ -98,14 +98,14 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    DBoundary *m_boundary = 0;
-    DiagramSceneModel *m_diagramSceneModel = 0;
+    DBoundary *m_boundary = nullptr;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
     bool m_isSecondarySelected = false;
     bool m_isFocusSelected = false;
-    RectangularSelectionItem *m_selectionMarker = 0;
-    QGraphicsRectItem *m_borderItem = 0;
-    QGraphicsRectItem *m_noTextItem = 0;
-    BoundaryTextItem *m_textItem = 0;
+    RectangularSelectionItem *m_selectionMarker = nullptr;
+    QGraphicsRectItem *m_borderItem = nullptr;
+    QGraphicsRectItem *m_noTextItem = nullptr;
+    BoundaryTextItem *m_textItem = nullptr;
     bool m_isUpdating = false;
     bool m_isChanged = false;
 };
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
index ff8d3eb2965..fe459338a17 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
@@ -111,7 +111,7 @@ void ClassItem::update()
     } else if (m_customIcon) {
         m_customIcon->scene()->removeItem(m_customIcon);
         delete m_customIcon;
-        m_customIcon = 0;
+        m_customIcon = nullptr;
     }
 
     // shape
@@ -124,7 +124,7 @@ void ClassItem::update()
     } else if (m_shape){
         m_shape->scene()->removeItem(m_shape);
         delete m_shape;
-        m_shape = 0;
+        m_shape = nullptr;
     }
 
     // stereotypes
@@ -140,7 +140,7 @@ void ClassItem::update()
     } else if (m_namespace) {
         m_namespace->scene()->removeItem(m_namespace);
         delete m_namespace;
-        m_namespace = 0;
+        m_namespace = nullptr;
     }
 
     // class name
@@ -156,7 +156,7 @@ void ClassItem::update()
     } else if (m_contextLabel) {
         m_contextLabel->scene()->removeItem(m_contextLabel);
         delete m_contextLabel;
-        m_contextLabel = 0;
+        m_contextLabel = nullptr;
     }
 
     // attributes separator
@@ -168,7 +168,7 @@ void ClassItem::update()
     } else if (m_attributesSeparator) {
         m_attributesSeparator->scene()->removeItem(m_attributesSeparator);
         delete m_attributesSeparator;
-        m_attributesSeparator = 0;
+        m_attributesSeparator = nullptr;
     }
 
     // attributes
@@ -182,7 +182,7 @@ void ClassItem::update()
     } else if (m_attributes) {
         m_attributes->scene()->removeItem(m_attributes);
         delete m_attributes;
-        m_attributes = 0;
+        m_attributes = nullptr;
     }
 
     // methods separator
@@ -194,7 +194,7 @@ void ClassItem::update()
     } else if (m_methodsSeparator) {
         m_methodsSeparator->scene()->removeItem(m_methodsSeparator);
         delete m_methodsSeparator;
-        m_methodsSeparator = 0;
+        m_methodsSeparator = nullptr;
     }
 
     // methods
@@ -208,7 +208,7 @@ void ClassItem::update()
     } else if (m_methods) {
         m_methods->scene()->removeItem(m_methods);
         delete m_methods;
-        m_methods = 0;
+        m_methods = nullptr;
     }
 
     // template parameters
@@ -229,7 +229,7 @@ void ClassItem::update()
     } else if (m_templateParameterBox) {
         m_templateParameterBox->scene()->removeItem(m_templateParameterBox);
         delete m_templateParameterBox;
-        m_templateParameterBox = 0;
+        m_templateParameterBox = nullptr;
     }
 
     updateSelectionMarker(m_customIcon);
@@ -380,7 +380,7 @@ void ClassItem::setFromDisplayName(const QString &displayName)
         QString name;
         QStringList templateParameters;
         // NOTE namespace is ignored because it has its own edit field
-        if (NameController::parseClassName(displayName, 0, &name, &templateParameters)) {
+        if (NameController::parseClassName(displayName, nullptr, &name, &templateParameters)) {
             auto diagramClass = dynamic_cast<DClass *>(object());
             QMT_ASSERT(diagramClass, return);
             ModelController *modelController = diagramSceneModel()->diagramSceneController()->modelController();
@@ -650,9 +650,9 @@ void ClassItem::updateMembers(const Style *style)
     QString attributesGroup;
     QString methodsGroup;
 
-    MClassMember::Visibility *currentVisibility = 0;
-    QString *currentGroup = 0;
-    QString *text = 0;
+    MClassMember::Visibility *currentVisibility = nullptr;
+    QString *currentGroup = nullptr;
+    QString *text = nullptr;
 
     auto dclass = dynamic_cast<DClass *>(object());
     QMT_ASSERT(dclass, return);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
index bb073cf6bda..9fa9dc40bdc 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h
@@ -49,7 +49,7 @@ class ClassItem : public ObjectItem
     Q_DECLARE_TR_FUNCTIONS(qmt::ClassItem)
 
 public:
-    ClassItem(DClass *klass, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
+    ClassItem(DClass *klass, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = nullptr);
     ~ClassItem() override;
 
     void update() override;
@@ -77,17 +77,17 @@ private:
     void updateGeometry();
     void updateMembers(const Style *style);
 
-    CustomIconItem *m_customIcon = 0;
-    QGraphicsRectItem *m_shape = 0;
-    QGraphicsSimpleTextItem *m_namespace = 0;
-    ContextLabelItem *m_contextLabel = 0;
-    QGraphicsLineItem *m_attributesSeparator = 0;
+    CustomIconItem *m_customIcon = nullptr;
+    QGraphicsRectItem *m_shape = nullptr;
+    QGraphicsSimpleTextItem *m_namespace = nullptr;
+    ContextLabelItem *m_contextLabel = nullptr;
+    QGraphicsLineItem *m_attributesSeparator = nullptr;
     QString m_attributesText;
-    QGraphicsTextItem *m_attributes = 0;
-    QGraphicsLineItem *m_methodsSeparator = 0;
+    QGraphicsTextItem *m_attributes = nullptr;
+    QGraphicsLineItem *m_methodsSeparator = nullptr;
     QString m_methodsText;
-    QGraphicsTextItem *m_methods = 0;
-    TemplateParameterBox *m_templateParameterBox = 0;
+    QGraphicsTextItem *m_methods = nullptr;
+    TemplateParameterBox *m_templateParameterBox = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp
index 7aca202d20a..98aa69c5c3f 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.cpp
@@ -87,7 +87,7 @@ void ComponentItem::update()
     } else if (m_customIcon) {
         m_customIcon->scene()->removeItem(m_customIcon);
         delete m_customIcon;
-        m_customIcon = 0;
+        m_customIcon = nullptr;
     }
 
     // shape
@@ -117,19 +117,19 @@ void ComponentItem::update()
         if (m_shape) {
             m_shape->scene()->removeItem(m_shape);
             delete m_shape;
-            m_shape = 0;
+            m_shape = nullptr;
         }
     }
     if (deleteRects) {
         if (m_lowerRect) {
             m_lowerRect->scene()->removeItem(m_lowerRect);
             delete m_lowerRect;
-            m_lowerRect = 0;
+            m_lowerRect = nullptr;
         }
         if (m_upperRect) {
             m_upperRect->scene()->removeItem(m_upperRect);
             delete m_upperRect;
-            m_upperRect = 0;
+            m_upperRect = nullptr;
         }
     }
 
@@ -149,7 +149,7 @@ void ComponentItem::update()
     } else if (m_contextLabel) {
         m_contextLabel->scene()->removeItem(m_contextLabel);
         delete m_contextLabel;
-        m_contextLabel = 0;
+        m_contextLabel = nullptr;
     }
 
     updateSelectionMarker(m_customIcon);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h
index 2c95f3e7a12..83e01062ea6 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h
@@ -45,7 +45,7 @@ class ComponentItem : public ObjectItem
 {
 public:
     ComponentItem(DComponent *component, DiagramSceneModel *diagramSceneModel,
-                  QGraphicsItem *parent = 0);
+                  QGraphicsItem *parent = nullptr);
     ~ComponentItem() override;
 
     void update() override;
@@ -63,11 +63,11 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = 0;
-    QGraphicsRectItem *m_shape = 0;
-    QGraphicsRectItem *m_upperRect = 0;
-    QGraphicsRectItem *m_lowerRect = 0;
-    ContextLabelItem *m_contextLabel = 0;
+    CustomIconItem *m_customIcon = nullptr;
+    QGraphicsRectItem *m_shape = nullptr;
+    QGraphicsRectItem *m_upperRect = nullptr;
+    QGraphicsRectItem *m_lowerRect = nullptr;
+    ContextLabelItem *m_contextLabel = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp
index c0d28335372..d8e3a37df56 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp
@@ -86,7 +86,7 @@ void ConnectionItem::updateEndLabels(const DConnectionEnd &end, const DConnectio
     } else if (*endName) {
         (*endName)->scene()->removeItem(*endName);
         delete *endName;
-        *endName = 0;
+        *endName = nullptr;
     }
 
     if (!otherEnd.cardinality().isEmpty()) {
@@ -98,7 +98,7 @@ void ConnectionItem::updateEndLabels(const DConnectionEnd &end, const DConnectio
     } else if (*endCardinality) {
         (*endCardinality)->scene()->removeItem(*endCardinality);
         delete *endCardinality;
-        *endCardinality = 0;
+        *endCardinality = nullptr;
     }
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.h
index cc4e747bbb8..6f473067417 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.h
@@ -40,7 +40,7 @@ class ConnectionItem : public RelationItem
 {
 public:
     ConnectionItem(DConnection *connection, DiagramSceneModel *diagramSceneModel,
-                    QGraphicsItem *parent = 0);
+                    QGraphicsItem *parent = nullptr);
     ~ConnectionItem() override;
 
 protected:
@@ -54,11 +54,11 @@ private:
                         QGraphicsItem *endCardinality,
                         QGraphicsItem *endItem, double headLength);
 
-    DConnection *m_connection = 0;
-    QGraphicsSimpleTextItem *m_endAName = 0;
-    QGraphicsSimpleTextItem *m_endACardinality = 0;
-    QGraphicsSimpleTextItem *m_endBName = 0;
-    QGraphicsSimpleTextItem *m_endBCardinality = 0;
+    DConnection *m_connection = nullptr;
+    QGraphicsSimpleTextItem *m_endAName = nullptr;
+    QGraphicsSimpleTextItem *m_endACardinality = nullptr;
+    QGraphicsSimpleTextItem *m_endBName = nullptr;
+    QGraphicsSimpleTextItem *m_endBCardinality = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp
index 1d27039e805..c466328407d 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.cpp
@@ -81,7 +81,7 @@ void DiagramItem::update()
     } else if (m_customIcon) {
         m_customIcon->scene()->removeItem(m_customIcon);
         delete m_customIcon;
-        m_customIcon = 0;
+        m_customIcon = nullptr;
     }
 
     // shape
@@ -100,12 +100,12 @@ void DiagramItem::update()
         if (m_fold) {
             m_fold->scene()->removeItem(m_fold);
             delete m_fold;
-            m_fold = 0;
+            m_fold = nullptr;
         }
         if (m_body) {
             m_body->scene()->removeItem(m_body);
             delete m_body;
-            m_body = 0;
+            m_body = nullptr;
         }
     }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h
index 33919920a6b..d20ba34bee1 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h
@@ -37,7 +37,7 @@ class DiagramItem : public ObjectItem
 {
 public:
     explicit DiagramItem(DDiagram *diagram, DiagramSceneModel *diagramSceneModel,
-                         QGraphicsItem *parent = 0);
+                         QGraphicsItem *parent = nullptr);
     ~DiagramItem() override;
 
     void update() override;
@@ -51,9 +51,9 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = 0;
-    QGraphicsPolygonItem *m_body = 0;
-    QGraphicsPolygonItem *m_fold = 0;
+    CustomIconItem *m_customIcon = nullptr;
+    QGraphicsPolygonItem *m_body = nullptr;
+    QGraphicsPolygonItem *m_fold = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
index e05241a9bea..dba8f7822fd 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
@@ -85,7 +85,7 @@ void ItemItem::update()
     } else if (m_customIcon) {
         m_customIcon->scene()->removeItem(m_customIcon);
         delete m_customIcon;
-        m_customIcon = 0;
+        m_customIcon = nullptr;
     }
 
     // shape
@@ -99,7 +99,7 @@ void ItemItem::update()
         if (m_shape) {
             m_shape->scene()->removeItem(m_shape);
             delete m_shape;
-            m_shape = 0;
+            m_shape = nullptr;
         }
     }
 
@@ -119,7 +119,7 @@ void ItemItem::update()
     } else if (m_contextLabel) {
         m_contextLabel->scene()->removeItem(m_contextLabel);
         delete m_contextLabel;
-        m_contextLabel = 0;
+        m_contextLabel = nullptr;
     }
 
     updateSelectionMarker(m_customIcon);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h
index 9d3e2338a5c..3030071a0dd 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h
@@ -44,7 +44,7 @@ class RelationStarter;
 class ItemItem : public ObjectItem
 {
 public:
-    ItemItem(DItem *item, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
+    ItemItem(DItem *item, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = nullptr);
     ~ItemItem() override;
 
     void update() override;
@@ -61,9 +61,9 @@ private:
     QSizeF calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = 0;
-    QGraphicsRectItem *m_shape = 0;
-    ContextLabelItem *m_contextLabel = 0;
+    CustomIconItem *m_customIcon = nullptr;
+    QGraphicsRectItem *m_shape = nullptr;
+    ContextLabelItem *m_contextLabel = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
index 062316894ac..104d374ee8b 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
@@ -491,7 +491,7 @@ void ObjectItem::updateStereotypes(const QString &stereotypeIconId, StereotypeIc
     } else if (m_stereotypeIcon) {
         m_stereotypeIcon->scene()->removeItem(m_stereotypeIcon);
         delete m_stereotypeIcon;
-        m_stereotypeIcon = 0;
+        m_stereotypeIcon = nullptr;
     }
     if (stereotypeDisplay != StereotypeIcon::DisplayNone && !stereotypes.isEmpty()) {
         if (!m_stereotypes)
@@ -502,7 +502,7 @@ void ObjectItem::updateStereotypes(const QString &stereotypeIconId, StereotypeIc
     } else if (m_stereotypes) {
         m_stereotypes->scene()->removeItem(m_stereotypes);
         delete m_stereotypes;
-        m_stereotypes = 0;
+        m_stereotypes = nullptr;
     }
 }
 
@@ -650,7 +650,7 @@ void ObjectItem::updateSelectionMarker(ResizeFlags resizeFlags)
         if (m_selectionMarker->scene())
             m_selectionMarker->scene()->removeItem(m_selectionMarker);
         delete m_selectionMarker;
-        m_selectionMarker = 0;
+        m_selectionMarker = nullptr;
     }
 }
 
@@ -694,7 +694,7 @@ void ObjectItem::updateRelationStarter()
     } else if (m_relationStarter) {
         scene()->removeItem(m_relationStarter);
         delete m_relationStarter;
-        m_relationStarter = 0;
+        m_relationStarter = nullptr;
     }
 
 }
@@ -791,13 +791,13 @@ void ObjectItem::updateAlignmentButtons()
             if (m_horizontalAlignButtons->scene())
                 m_horizontalAlignButtons->scene()->removeItem(m_horizontalAlignButtons);
             delete m_horizontalAlignButtons;
-            m_horizontalAlignButtons = 0;
+            m_horizontalAlignButtons = nullptr;
         }
         if (m_verticalAlignButtons) {
             if (m_verticalAlignButtons->scene())
                 m_verticalAlignButtons->scene()->removeItem(m_verticalAlignButtons);
             delete m_verticalAlignButtons;
-            m_verticalAlignButtons = 0;
+            m_verticalAlignButtons = nullptr;
         }
     }
 }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
index c0eb6cc574e..89bf89ea576 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h
@@ -86,7 +86,7 @@ protected:
     };
 
 public:
-    ObjectItem(const QString &elementType, DObject *object, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
+    ObjectItem(const QString &elementType, DObject *object, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = nullptr);
     ~ObjectItem() override;
 
     QString elementType() const { return m_elementType; }
@@ -179,20 +179,20 @@ private:
     QSizeF minimumSize(const QSet<QGraphicsItem *> &items) const;
 
     QString m_elementType;
-    DObject *m_object = 0;
-    DiagramSceneModel *m_diagramSceneModel = 0;
+    DObject *m_object = nullptr;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
     bool m_isSecondarySelected = false;
     bool m_isFocusSelected = false;
     QString m_stereotypeIconId;
     QString m_shapeIconId;
     StereotypeIcon::Display m_stereotypeIconDisplay = StereotypeIcon::DisplayLabel;
-    StereotypesItem *m_stereotypes = 0;
-    CustomIconItem *m_stereotypeIcon = 0;
-    EditableTextItem *m_nameItem = 0;
-    RectangularSelectionItem *m_selectionMarker = 0;
-    RelationStarter *m_relationStarter = 0;
-    AlignButtonsItem *m_horizontalAlignButtons = 0;
-    AlignButtonsItem *m_verticalAlignButtons = 0;
+    StereotypesItem *m_stereotypes = nullptr;
+    CustomIconItem *m_stereotypeIcon = nullptr;
+    EditableTextItem *m_nameItem = nullptr;
+    RectangularSelectionItem *m_selectionMarker = nullptr;
+    RelationStarter *m_relationStarter = nullptr;
+    AlignButtonsItem *m_horizontalAlignButtons = nullptr;
+    AlignButtonsItem *m_verticalAlignButtons = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp
index a865225fbab..97ff26f00ad 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.cpp
@@ -98,7 +98,7 @@ void PackageItem::update()
     } else if (m_customIcon) {
         m_customIcon->scene()->removeItem(m_customIcon);
         delete m_customIcon;
-        m_customIcon = 0;
+        m_customIcon = nullptr;
     }
 
     // shape
@@ -111,7 +111,7 @@ void PackageItem::update()
     } else if (m_shape) {
         m_shape->scene()->removeItem(m_shape);
         delete m_shape;
-        m_shape = 0;
+        m_shape = nullptr;
     }
 
     // stereotypes
@@ -130,7 +130,7 @@ void PackageItem::update()
     } else if (m_contextLabel) {
         m_contextLabel->scene()->removeItem(m_contextLabel);
         delete m_contextLabel;
-        m_contextLabel = 0;
+        m_contextLabel = nullptr;
     }
 
     updateSelectionMarker(m_customIcon);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h
index 8ed6fc016a6..323447dda5f 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h
@@ -45,7 +45,7 @@ class PackageItem : public ObjectItem
     class ShapeGeometry;
 
 public:
-    PackageItem(DPackage *package, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
+    PackageItem(DPackage *package, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = nullptr);
     ~PackageItem() override;
 
     void update() override;
@@ -62,9 +62,9 @@ private:
     ShapeGeometry calcMinimumGeometry() const;
     void updateGeometry();
 
-    CustomIconItem *m_customIcon = 0;
-    QGraphicsPolygonItem *m_shape = 0;
-    ContextLabelItem *m_contextLabel = 0;
+    CustomIconItem *m_customIcon = nullptr;
+    QGraphicsPolygonItem *m_shape = nullptr;
+    ContextLabelItem *m_contextLabel = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
index c3a744d3b66..6904bc2a041 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
@@ -210,8 +210,8 @@ public:
     }
 
 private:
-    DiagramSceneModel *m_diagramSceneModel = 0;
-    ArrowItem *m_arrow = 0;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
+    ArrowItem *m_arrow = nullptr;
     QList<QPointF> m_points;
 };
 
@@ -479,7 +479,7 @@ void RelationItem::update(const Style *style)
     } else if (m_name) {
         m_name->scene()->removeItem(m_name);
         delete m_name;
-        m_name = 0;
+        m_name = nullptr;
     }
 
     if (!m_relation->stereotypes().isEmpty()) {
@@ -492,7 +492,7 @@ void RelationItem::update(const Style *style)
     } else if (m_stereotypes) {
         m_stereotypes->scene()->removeItem(m_stereotypes);
         delete m_stereotypes;
-        m_stereotypes = 0;
+        m_stereotypes = nullptr;
     }
 
     if (isSelected() || isSecondarySelected()) {
@@ -504,7 +504,7 @@ void RelationItem::update(const Style *style)
         if (m_selectionHandles->scene())
             m_selectionHandles->scene()->removeItem(m_selectionHandles);
         delete m_selectionHandles;
-        m_selectionHandles = 0;
+        m_selectionHandles = nullptr;
     }
 
     setZValue((isSelected() || isSecondarySelected()) ? RELATION_ITEMS_ZVALUE_SELECTED : RELATION_ITEMS_ZVALUE);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
index faecc330f61..4705b9c5e18 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h
@@ -54,7 +54,7 @@ class RelationItem :
 
 public:
     RelationItem(DRelation *relation, DiagramSceneModel *diagramSceneModel,
-                 QGraphicsItem *parent = 0);
+                 QGraphicsItem *parent = nullptr);
     ~RelationItem() override;
 
     DRelation *relation() const { return m_relation; }
@@ -94,16 +94,16 @@ private:
     QPointF calcEndPoint(const Uid &end, const QPointF &otherEndPos,
                          int nearestIntermediatePointIndex);
 
-    DRelation *m_relation = 0;
+    DRelation *m_relation = nullptr;
 
 protected:
-    DiagramSceneModel *m_diagramSceneModel = 0;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
     bool m_isSecondarySelected = false;
     bool m_isFocusSelected = false;
-    ArrowItem *m_arrow = 0;
-    QGraphicsSimpleTextItem *m_name = 0;
-    StereotypesItem *m_stereotypes = 0;
-    PathSelectionItem *m_selectionHandles = 0;
+    ArrowItem *m_arrow = nullptr;
+    QGraphicsSimpleTextItem *m_name = nullptr;
+    StereotypesItem *m_stereotypes = nullptr;
+    PathSelectionItem *m_selectionHandles = nullptr;
     static bool m_grabbedEndA;
     static bool m_grabbedEndB;
     static QPointF m_grabbedEndPos;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h
index cac65534d20..feb83c07520 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h
@@ -56,8 +56,8 @@ public:
     void visitDItem(const DItem *item) override;
 
 private:
-    ModelController *m_modelController = 0;
-    StereotypeController *m_stereotypeController = 0;
+    ModelController *m_modelController = nullptr;
+    StereotypeController *m_stereotypeController = nullptr;
     DObject::StereotypeDisplay m_stereotypeDisplay = DObject::StereotypeNone;
     QString m_stereotypeIconId;
     QString m_shapeIconId;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h
index fc91764d2ff..96a0d4759e9 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h
@@ -47,7 +47,7 @@ class QMT_EXPORT LatchController : public QObject
     Q_OBJECT
 
 public:
-    explicit LatchController(QObject *parent = 0);
+    explicit LatchController(QObject *parent = nullptr);
     ~LatchController() override;
 
     void setDiagramSceneModel(DiagramSceneModel *diagramSceneModel);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp
index 83c32d84591..4848d91c75b 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp
@@ -85,8 +85,8 @@ public:
 private:
     IAlignable::AlignType m_alignType = IAlignable::AlignLeft;
     QString m_identifier;
-    IAlignable *m_alignable = 0;
-    QGraphicsPixmapItem *m_pixmapItem = 0;
+    IAlignable *m_alignable = nullptr;
+    QGraphicsPixmapItem *m_pixmapItem = nullptr;
 };
 
 AlignButtonsItem::AlignButtonsItem(IAlignable *alignable, QGraphicsItem *parent)
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h
index 96a48f3d8a4..d17906b299b 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h
@@ -48,7 +48,7 @@ public:
         VerticalDistanceToObejct = HorizontalDistanceToObject
     };
 
-    explicit AlignButtonsItem(IAlignable *alignable, QGraphicsItem *parent = 0);
+    explicit AlignButtonsItem(IAlignable *alignable, QGraphicsItem *parent = nullptr);
     ~AlignButtonsItem() override;
 
     QRectF boundingRect() const override;
@@ -58,7 +58,7 @@ public:
     void addButton(IAlignable::AlignType alignType, const QString &identifier, qreal pos);
 
 private:
-    IAlignable *m_alignable = 0;
+    IAlignable *m_alignable = nullptr;
     QList<AlignButtonItem *> m_alignItems;
 };
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h
index a630efc2b7a..1244cb58944 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h
@@ -37,7 +37,7 @@ public:
         Vertical
     };
 
-    explicit AlignLineItem(Direction direction, QGraphicsItem *parent = 0);
+    explicit AlignLineItem(Direction direction, QGraphicsItem *parent = nullptr);
     ~AlignLineItem() override;
 
     void setLine(qreal pos);
@@ -45,11 +45,11 @@ public:
 
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-               QWidget *widget = 0) override;
+               QWidget *widget = nullptr) override;
 
     Direction m_direction = Horizontal;
-    QGraphicsLineItem *m_alignLine = 0;
-    QGraphicsLineItem *m_highlightLine = 0;
+    QGraphicsLineItem *m_alignLine = nullptr;
+    QGraphicsLineItem *m_highlightLine = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
index b869e914bc5..93a4a10f195 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
@@ -192,7 +192,7 @@ public:
         } else if (m_arrowItem) {
             m_arrowItem->scene()->removeItem(m_arrowItem);
             delete m_arrowItem;
-            m_arrowItem = 0;
+            m_arrowItem = nullptr;
         }
 
         if (hasDiamond) {
@@ -217,7 +217,7 @@ public:
         } else if (m_diamondItem) {
             m_diamondItem->scene()->removeItem(m_diamondItem);
             delete m_diamondItem;
-            m_diamondItem = 0;
+            m_diamondItem = nullptr;
         }
     }
 
@@ -225,8 +225,8 @@ private:
     ArrowItem::Head m_head = ArrowItem::HeadNone;
     double m_arrowSize = 10.0;
     double m_diamondSize = 15.0;
-    QGraphicsPathItem *m_arrowItem = 0;
-    QGraphicsPathItem *m_diamondItem = 0;
+    QGraphicsPathItem *m_arrowItem = nullptr;
+    QGraphicsPathItem *m_diamondItem = nullptr;
 };
 
 class ArrowItem::GraphicsShaftItem : public QGraphicsPathItem
@@ -438,7 +438,7 @@ void ArrowItem::deleteHead(QGraphicsItem **headItem)
         if ((*headItem)->scene())
             (*headItem)->scene()->removeItem(*headItem);
         delete *headItem;
-        *headItem = 0;
+        *headItem = nullptr;
     }
 }
 
@@ -449,7 +449,8 @@ void ArrowItem::updateHead(QGraphicsItem **headItem, Head head, const Style *sty
     } else if (head == HeadCustom) {
         // nothing to do
     } else {
-        QTC_ASSERT(*headItem == 0 || dynamic_cast<GraphicsHeadItem *>(*headItem) != 0, return);
+        QTC_ASSERT(headItem, return);
+        QTC_ASSERT(!*headItem || dynamic_cast<GraphicsHeadItem *>(*headItem), return);
         GraphicsHeadItem *item;
         if (!*headItem) {
             item = new GraphicsHeadItem(this);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h
index aaaee4e16b9..6f93a0d710c 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h
@@ -61,8 +61,8 @@ public:
         HeadFilledDiamondFilledTriangle
     };
 
-    explicit ArrowItem(QGraphicsItem *parent = 0);
-    explicit ArrowItem(const ArrowItem &rhs, QGraphicsItem *parent = 0);
+    explicit ArrowItem(QGraphicsItem *parent = nullptr);
+    explicit ArrowItem(const ArrowItem &rhs, QGraphicsItem *parent = nullptr);
     ~ArrowItem() override;
 
     void setShaft(Shaft shaft);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h
index 3bbce880731..62cac6619c4 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h
@@ -32,7 +32,7 @@ namespace qmt {
 class ContextLabelItem : public QGraphicsSimpleTextItem
 {
 public:
-    explicit ContextLabelItem(QGraphicsItem *parent = 0);
+    explicit ContextLabelItem(QGraphicsItem *parent = nullptr);
     ~ContextLabelItem() override;
 
     void setMaxWidth(double maxWidth);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h
index a1280f45e68..93e083b9625 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h
@@ -40,7 +40,7 @@ class DiagramSceneModel;
 class CustomIconItem : public QGraphicsItem
 {
 public:
-    explicit CustomIconItem(DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
+    explicit CustomIconItem(DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = nullptr);
     ~CustomIconItem() override;
 
     void setStereotypeIconId(const QString &stereotypeIconId);
@@ -56,7 +56,7 @@ public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
 private:
-    DiagramSceneModel *m_diagramSceneModel = 0;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
     QString m_stereotypeIconId;
     StereotypeIcon m_stereotypeIcon;
     QSizeF m_baseSize;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
index 7736624e4f5..78fa4fff807 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
@@ -130,7 +130,7 @@ private:
         }
     }
 
-    PathSelectionItem *m_owner = 0;
+    PathSelectionItem *m_owner = nullptr;
     int m_pointIndex = -1;
     QSizeF m_pointSize;
     Selection m_selection = NotSelected;
@@ -210,7 +210,7 @@ void PathSelectionItem::setPoints(const QList<QPointF> &points)
     QMT_ASSERT(points.size() >= 2, return);
     prepareGeometryChange();
 
-    GraphicsHandleItem *focusEndBItem = 0;
+    GraphicsHandleItem *focusEndBItem = nullptr;
     if (!m_handles.isEmpty() && m_focusHandleItem == m_handles.last()) {
         focusEndBItem = m_focusHandleItem;
         m_handles.removeLast();
@@ -222,7 +222,7 @@ void PathSelectionItem::setPoints(const QList<QPointF> &points)
             handle = focusEndBItem;
             handle->setPointIndex(pointIndex);
             m_handles.insert(pointIndex, handle);
-            focusEndBItem = 0;
+            focusEndBItem = nullptr;
         } else if (pointIndex >= m_handles.size()) {
             handle = new GraphicsHandleItem(pointIndex, this);
             handle->setPointSize(m_pointSize);
@@ -297,7 +297,7 @@ void PathSelectionItem::moveHandle(int pointIndex, const QPointF &deltaMove, Han
         m_windable->setHandlePos(pointIndex, newPos);
         if (handleStatus == Release) {
             m_windable->dropHandle(pointIndex, RASTER_WIDTH, RASTER_HEIGHT);
-            m_focusHandleItem = 0;
+            m_focusHandleItem = nullptr;
         }
         break;
     }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
index b38688e2a03..3b8e1685fe9 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h
@@ -49,7 +49,7 @@ class PathSelectionItem : public QGraphicsItem
     };
 
 public:
-    explicit PathSelectionItem(IWindable *windable, QGraphicsItem *parent = 0);
+    explicit PathSelectionItem(IWindable *windable, QGraphicsItem *parent = nullptr);
     ~PathSelectionItem() override;
 
     QRectF boundingRect() const override;
@@ -72,11 +72,11 @@ private:
                     HandleQualifier handleQualifier);
     void keyPressed(int pointIndex, QKeyEvent *event, const QPointF &pos);
 
-    IWindable *m_windable = 0;
+    IWindable *m_windable = nullptr;
     QSizeF m_pointSize;
     bool m_isSecondarySelected = false;
     QList<GraphicsHandleItem *> m_handles;
-    GraphicsHandleItem *m_focusHandleItem = 0;
+    GraphicsHandleItem *m_focusHandleItem = nullptr;
     QPointF m_originalHandlePos;
 };
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp
index c60f498026b..64936fb7735 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp
@@ -86,7 +86,7 @@ protected:
     }
 
 private:
-    RectangularSelectionItem *m_owner = 0;
+    RectangularSelectionItem *m_owner = nullptr;
     RectangularSelectionItem::Handle m_handle = RectangularSelectionItem::HandleNone;
     bool m_isSecondarySelected = false;
     QPointF m_startPos;
@@ -220,7 +220,7 @@ void RectangularSelectionItem::update()
         if (m_borderItem->scene())
             m_borderItem->scene()->removeItem(m_borderItem);
         delete m_borderItem;
-        m_borderItem = 0;
+        m_borderItem = nullptr;
     }
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h
index bb82cc44602..5c5d9fcbf02 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h
@@ -75,7 +75,7 @@ public:
         FreedomKeepRatio
     };
 
-    explicit RectangularSelectionItem(IResizable *itemResizer, QGraphicsItem *parent = 0);
+    explicit RectangularSelectionItem(IResizable *itemResizer, QGraphicsItem *parent = nullptr);
     ~RectangularSelectionItem() override;
 
     QRectF boundingRect() const override;
@@ -99,14 +99,14 @@ private:
     void moveHandle(Handle handle, const QPointF &deltaMove, HandleStatus handleStatus,
                     HandleQualifier handleQualifier);
 
-    IResizable *m_itemResizer = 0;
+    IResizable *m_itemResizer = nullptr;
     QRectF m_rect;
     QSizeF m_pointSize;
     QVector<GraphicsHandleItem *> m_points;
     QPointF m_originalResizePos;
     QRectF m_originalResizeRect;
     bool m_showBorder = false;
-    QGraphicsRectItem *m_borderItem = 0;
+    QGraphicsRectItem *m_borderItem = nullptr;
     Freedom m_freedom = FreedomAny;
     bool m_isSecondarySelected = false;
     Handle m_activeHandle = HandleNone;
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
index 8983b5fbb8a..705f673ac5b 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
@@ -128,7 +128,7 @@ void RelationStarter::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
                                m_currentPreviewArrowIntermediatePoints);
         m_currentPreviewArrow->scene()->removeItem(m_currentPreviewArrow);
         delete m_currentPreviewArrow;
-        m_currentPreviewArrow = 0;
+        m_currentPreviewArrow = nullptr;
         m_currentPreviewArrowIntermediatePoints.clear();
     }
 }
@@ -157,7 +157,7 @@ void RelationStarter::focusOutEvent(QFocusEvent *event)
     if (m_currentPreviewArrow) {
         m_currentPreviewArrow->scene()->removeItem(m_currentPreviewArrow);
         delete m_currentPreviewArrow;
-        m_currentPreviewArrow = 0;
+        m_currentPreviewArrow = nullptr;
         m_currentPreviewArrowIntermediatePoints.clear();
     }
 }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h
index e1244870684..a25d03c7bff 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h
@@ -40,12 +40,12 @@ class RelationStarter : public QGraphicsRectItem
 {
 public:
     RelationStarter(IRelationable *owner, DiagramSceneModel *diagramSceneModel,
-                    QGraphicsItem *parent = 0);
+                    QGraphicsItem *parent = nullptr);
     ~RelationStarter() override;
 
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-               QWidget *widget = 0) override;
+               QWidget *widget = nullptr) override;
 
     void addArrow(const QString &id, ArrowItem::Shaft shaft, ArrowItem::Head startHead,
                   ArrowItem::Head endHead,
@@ -61,11 +61,11 @@ protected:
 private:
     void updateCurrentPreviewArrow(const QPointF &headPoint);
 
-    IRelationable *m_owner = 0;
-    DiagramSceneModel *m_diagramSceneModel = 0;
+    IRelationable *m_owner = nullptr;
+    DiagramSceneModel *m_diagramSceneModel = nullptr;
     QList<ArrowItem *> m_arrows;
     QHash<ArrowItem *, QString> m_arrowIds;
-    ArrowItem *m_currentPreviewArrow = 0;
+    ArrowItem *m_currentPreviewArrow = nullptr;
     QString m_currentPreviewArrowId;
     QList<QPointF> m_currentPreviewArrowIntermediatePoints;
 };
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h
index bfb58082617..b07d59a3dd8 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h
@@ -33,7 +33,7 @@ namespace qmt {
 class StereotypesItem : public QGraphicsSimpleTextItem
 {
 public:
-    explicit StereotypesItem(QGraphicsItem *parent = 0);
+    explicit StereotypesItem(QGraphicsItem *parent = nullptr);
     ~StereotypesItem() override;
 
     void setStereotypes(const QList<QString> &stereotypes);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h
index 63349f8ab81..b93eb3e1e75 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h
@@ -32,7 +32,7 @@ namespace qmt {
 class TemplateParameterBox : public QGraphicsRectItem
 {
 public:
-    explicit TemplateParameterBox(QGraphicsItem *parent = 0);
+    explicit TemplateParameterBox(QGraphicsItem *parent = nullptr);
     ~TemplateParameterBox() override;
 
     void setFont(const QFont &font);
@@ -46,7 +46,7 @@ private:
 
     QList<QString> m_templateParameters;
     bool m_breakLines = false;
-    QGraphicsSimpleTextItem *m_parametersText = 0;
+    QGraphicsSimpleTextItem *m_parametersText = nullptr;
 };
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp
index 57e48879191..6feb1a36953 100644
--- a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp
+++ b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.cpp
@@ -65,11 +65,11 @@ DiagramsManager::ManagedDiagram::~ManagedDiagram()
 
 DiagramsManager::DiagramsManager(QObject *parent)
     : QObject(parent),
-      m_diagramsView(0),
-      m_diagramController(0),
-      m_diagramSceneController(0),
-      m_styleController(0),
-      m_stereotypeController(0)
+      m_diagramsView(nullptr),
+      m_diagramController(nullptr),
+      m_diagramSceneController(nullptr),
+      m_styleController(nullptr),
+      m_stereotypeController(nullptr)
 {
 }
 
@@ -81,7 +81,7 @@ DiagramsManager::~DiagramsManager()
 void DiagramsManager::setModel(TreeModel *model)
 {
     if (m_model)
-        connect(m_model, 0, this, 0);
+        connect(m_model, nullptr, this, nullptr);
     m_model = model;
     if (model) {
         connect(model, &QAbstractItemModel::dataChanged,
@@ -97,7 +97,7 @@ void DiagramsManager::setDiagramsView(DiagramsViewInterface *diagramsView)
 void DiagramsManager::setDiagramController(DiagramController *diagramController)
 {
     if (m_diagramController)
-        connect(m_diagramController, 0, this, 0);
+        connect(m_diagramController, nullptr, this, nullptr);
     m_diagramController = diagramController;
     if (diagramController) {
         connect(diagramController, &DiagramController::diagramAboutToBeRemoved,
diff --git a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h
index f9af7636a01..cb708b79d92 100644
--- a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h
+++ b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h
@@ -56,7 +56,7 @@ class QMT_EXPORT DiagramsManager : public QObject
     class ManagedDiagram;
 
 public:
-    explicit DiagramsManager(QObject *parent = 0);
+    explicit DiagramsManager(QObject *parent = nullptr);
     ~DiagramsManager() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp
index 283506cb2ae..2c5200b8355 100644
--- a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp
+++ b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.cpp
@@ -86,7 +86,7 @@ IMoveable *SceneInspector::moveable(const DElement *element, const MDiagram *dia
         }
     }
     QMT_CHECK(false);
-    return 0;
+    return nullptr;
 }
 
 IResizable *SceneInspector::resizable(const DElement *element, const MDiagram *diagram) const
@@ -102,7 +102,7 @@ IResizable *SceneInspector::resizable(const DElement *element, const MDiagram *d
         }
     }
     QMT_CHECK(false);
-    return 0;
+    return nullptr;
 }
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h
index 9cd964a6d9d..5585dff33f3 100644
--- a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h
+++ b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h
@@ -36,7 +36,7 @@ class DiagramsManager;
 class QMT_EXPORT SceneInspector : public QObject, public ISceneInspector
 {
 public:
-    explicit SceneInspector(QObject *parent = 0);
+    explicit SceneInspector(QObject *parent = nullptr);
     ~SceneInspector() override;
 
     void setDiagramsManager(DiagramsManager *diagramsManager);
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp
index 0ea77f81b73..43cd7a9a8bc 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.cpp
@@ -128,7 +128,7 @@ MDiagram *DiagramsView::diagram(int tabIndex) const
 MDiagram *DiagramsView::diagram(DiagramView *diagramView) const
 {
     if (!diagramView || diagramView->diagramSceneModel())
-        return 0;
+        return nullptr;
     return diagramView->diagramSceneModel()->diagram();
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h
index 6913957b66e..e005df7c60d 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h
@@ -46,7 +46,7 @@ class QMT_EXPORT DiagramsView : public QTabWidget, public DiagramsViewInterface
     Q_OBJECT
 
 public:
-    explicit DiagramsView(QWidget *parent = 0);
+    explicit DiagramsView(QWidget *parent = nullptr);
     ~DiagramsView() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
index ad361c63c13..25ac120ee7b 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.cpp
@@ -60,7 +60,7 @@ DiagramSceneModel *DiagramView::diagramSceneModel() const
 
 void DiagramView::setDiagramSceneModel(DiagramSceneModel *diagramSceneModel)
 {
-    setScene(0);
+    setScene(nullptr);
     m_diagramSceneModel = diagramSceneModel;
     if (diagramSceneModel) {
         setScene(m_diagramSceneModel->graphicsScene());
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
index 36b9d9db2b6..57c0ce1f46d 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
@@ -117,7 +117,7 @@ MDiagram *StackedDiagramsView::diagram(int tabIndex) const
 MDiagram *StackedDiagramsView::diagram(DiagramView *diagramView) const
 {
     if (!diagramView || !diagramView->diagramSceneModel())
-        return 0;
+        return nullptr;
     return diagramView->diagramSceneModel()->diagram();
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h
index d4b9eb1b3f9..495586075c6 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h
@@ -45,7 +45,7 @@ class QMT_EXPORT StackedDiagramsView : public QStackedWidget, public DiagramsVie
     Q_OBJECT
 
 public:
-    explicit StackedDiagramsView(QWidget *parent = 0);
+    explicit StackedDiagramsView(QWidget *parent = nullptr);
     ~StackedDiagramsView() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp b/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp
index 626d490f51b..009e16d2d15 100644
--- a/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp
+++ b/src/libs/modelinglib/qmt/document_controller/documentcontroller.cpp
@@ -273,8 +273,8 @@ MDiagram *DocumentController::findOrCreateRootDiagram()
 void DocumentController::createNewProject(const QString &fileName)
 {
     m_diagramsManager->removeAllDiagrams();
-    m_treeModel->setModelController(0);
-    m_modelController->setRootPackage(0);
+    m_treeModel->setModelController(nullptr);
+    m_modelController->setRootPackage(nullptr);
     m_undoController->reset();
 
     m_projectController->newProject(fileName);
@@ -286,8 +286,8 @@ void DocumentController::createNewProject(const QString &fileName)
 void DocumentController::loadProject(const QString &fileName)
 {
     m_diagramsManager->removeAllDiagrams();
-    m_treeModel->setModelController(0);
-    m_modelController->setRootPackage(0);
+    m_treeModel->setModelController(nullptr);
+    m_modelController->setRootPackage(nullptr);
     m_undoController->reset();
 
     m_projectController->newProject(fileName);
diff --git a/src/libs/modelinglib/qmt/document_controller/documentcontroller.h b/src/libs/modelinglib/qmt/document_controller/documentcontroller.h
index d9a253773f9..43508ab1496 100644
--- a/src/libs/modelinglib/qmt/document_controller/documentcontroller.h
+++ b/src/libs/modelinglib/qmt/document_controller/documentcontroller.h
@@ -56,7 +56,7 @@ class QMT_EXPORT DocumentController : public QObject
 {
     Q_OBJECT
 public:
-    explicit DocumentController(QObject *parent = 0);
+    explicit DocumentController(QObject *parent = nullptr);
     ~DocumentController() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h b/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h
index 2f1402d4d37..eeab0d6f9cb 100644
--- a/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h
+++ b/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h
@@ -33,9 +33,9 @@ namespace qmt {
 class QMT_EXPORT ContextMenuAction : public QAction
 {
 public:
-    ContextMenuAction(const QString &label, const QString &id, QObject *parent = 0);
+    ContextMenuAction(const QString &label, const QString &id, QObject *parent = nullptr);
     ContextMenuAction(const QString &label, const QString &id, const QKeySequence &shortcut,
-                      QObject *parent = 0);
+                      QObject *parent = nullptr);
     ~ContextMenuAction() override;
 
     QString id() const { return m_id; }
diff --git a/src/libs/modelinglib/qmt/infrastructure/geometryutilities.h b/src/libs/modelinglib/qmt/infrastructure/geometryutilities.h
index c0062aa297a..f0b4f697b0b 100644
--- a/src/libs/modelinglib/qmt/infrastructure/geometryutilities.h
+++ b/src/libs/modelinglib/qmt/infrastructure/geometryutilities.h
@@ -52,7 +52,7 @@ public:
 
     static QLineF stretch(const QLineF &line, double p1Extension, double p2Extension);
     static bool intersect(const QPolygonF &polygon, const QLineF &line,
-                          QPointF *intersectionPoint, QLineF *intersectionLine = 0);
+                          QPointF *intersectionPoint, QLineF *intersectionLine = nullptr);
     static bool placeRectAtLine(const QRectF &rect, const QLineF &line, double lineOffset,
                                 double distance, const QLineF &intersectionLine, QPointF *placement,
                                 Side *horizontalAlignedSide);
diff --git a/src/libs/modelinglib/qmt/infrastructure/handle.h b/src/libs/modelinglib/qmt/infrastructure/handle.h
index 261f8c7460a..0c28c3f2287 100644
--- a/src/libs/modelinglib/qmt/infrastructure/handle.h
+++ b/src/libs/modelinglib/qmt/infrastructure/handle.h
@@ -42,13 +42,13 @@ public:
     Handle(const Handle<U> &rhs) : m_uid(rhs.uid()), m_target(rhs.target()) { }
 
     bool isNull() const { return !m_uid.isValid(); }
-    bool hasTarget() const { return m_target != 0; }
+    bool hasTarget() const { return m_target != nullptr; }
     Uid uid() const { return m_uid; }
     T *target() const { return m_target; }
 
     void setUid(const Uid &uid)
     {
-        QMT_CHECK(m_target != 0 ? (m_target->uid() == uid) : true);
+        QMT_CHECK(m_target ? (m_target->uid() == uid) : true);
         m_uid = uid;
     }
 
@@ -61,14 +61,14 @@ public:
     void clear()
     {
         m_uid = Uid();
-        m_target = 0;
+        m_target = nullptr;
     }
 
-    void clearTarget() { m_target = 0; }
+    void clearTarget() { m_target = nullptr; }
 
 private:
     Uid m_uid;
-    T *m_target = 0;
+    T *m_target = nullptr;
 };
 
 template<class T>
diff --git a/src/libs/modelinglib/qmt/infrastructure/handles.h b/src/libs/modelinglib/qmt/infrastructure/handles.h
index 6ed54034ec7..4b1d0e1c934 100644
--- a/src/libs/modelinglib/qmt/infrastructure/handles.h
+++ b/src/libs/modelinglib/qmt/infrastructure/handles.h
@@ -96,7 +96,7 @@ public:
             if (handle.uid() == uid)
                 return handle.target();
         }
-        return 0;
+        return nullptr;
     }
 
     T *at(int index) const
diff --git a/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h b/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h
index dad4f9a5963..efe31b102dd 100644
--- a/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h
+++ b/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h
@@ -35,8 +35,8 @@ class QCompressedDevice : public QIODevice
     Q_OBJECT
 
 public:
-    explicit QCompressedDevice(QObject *parent = 0);
-    explicit QCompressedDevice(QIODevice *targetDevice, QObject *parent = 0);
+    explicit QCompressedDevice(QObject *parent = nullptr);
+    explicit QCompressedDevice(QIODevice *targetDevice, QObject *parent = nullptr);
     ~QCompressedDevice() override;
 
     QIODevice *targetDevice() const { return m_targetDevice; }
@@ -52,7 +52,7 @@ public:
     qint64 flush();
 
 private:
-    QIODevice *m_targetDevice = 0;
+    QIODevice *m_targetDevice = nullptr;
     QByteArray m_buffer;
     qint64 m_bytesInBuffer = 0;
     qint64 m_indexInBuffer = 0;
diff --git a/src/libs/modelinglib/qmt/model/mdiagram.cpp b/src/libs/modelinglib/qmt/model/mdiagram.cpp
index 08dbac11955..7f9d7e87896 100644
--- a/src/libs/modelinglib/qmt/model/mdiagram.cpp
+++ b/src/libs/modelinglib/qmt/model/mdiagram.cpp
@@ -71,7 +71,7 @@ DElement *MDiagram::findDiagramElement(const Uid &key) const
         if (element->uid() == key)
             return element;
     }
-    return 0;
+    return nullptr;
 }
 
 void MDiagram::setDiagramElements(const QList<DElement *> &elements)
diff --git a/src/libs/modelinglib/qmt/model/melement.h b/src/libs/modelinglib/qmt/model/melement.h
index b83b5bd9805..afeec22089f 100644
--- a/src/libs/modelinglib/qmt/model/melement.h
+++ b/src/libs/modelinglib/qmt/model/melement.h
@@ -81,8 +81,8 @@ public:
 
 private:
     Uid m_uid;
-    MObject *m_owner = 0;
-    MExpansion *m_expansion = 0;
+    MObject *m_owner = nullptr;
+    MExpansion *m_expansion = nullptr;
     QList<QString> m_stereotypes;
     Flags m_flags = 0;
 };
diff --git a/src/libs/modelinglib/qmt/model/mobject.cpp b/src/libs/modelinglib/qmt/model/mobject.cpp
index f0e30839bad..1d5f7dc96cc 100644
--- a/src/libs/modelinglib/qmt/model/mobject.cpp
+++ b/src/libs/modelinglib/qmt/model/mobject.cpp
@@ -83,7 +83,7 @@ void MObject::addChild(const Uid &uid)
 void MObject::addChild(MObject *child)
 {
     QMT_ASSERT(child, return);
-    QMT_ASSERT(child->owner() == 0, return);
+    QMT_ASSERT(!child->owner(), return);
     m_children.add(child);
     child->setOwner(this);
 }
@@ -96,7 +96,7 @@ void MObject::insertChild(int beforeIndex, const Uid &uid)
 void MObject::insertChild(int beforeIndex, MObject *child)
 {
     QMT_ASSERT(child, return);
-    QMT_ASSERT(child->owner() == 0, return);
+    QMT_ASSERT(!child->owner(), return);
     m_children.insert(beforeIndex, child);
     child->setOwner(this);
 }
@@ -106,7 +106,7 @@ void MObject::removeChild(const Uid &uid)
     QMT_ASSERT(m_children.contains(uid), return);
     MObject *child = m_children.find(uid);
     if (child)
-        child->setOwner(0);
+        child->setOwner(nullptr);
     m_children.remove(uid);
 }
 
@@ -114,7 +114,7 @@ void MObject::removeChild(MObject *child)
 {
     QMT_ASSERT(child, return);
     QMT_ASSERT(m_children.contains(child), return);
-    child->setOwner(0);
+    child->setOwner(nullptr);
     m_children.remove(child);
 }
 
@@ -123,7 +123,7 @@ void MObject::decontrolChild(const Uid &uid)
     QMT_ASSERT(m_children.contains(uid), return);
     MObject *child = m_children.find(uid);
     if (child)
-        child->setOwner(0);
+        child->setOwner(nullptr);
     m_children.take(uid);
 }
 
@@ -131,7 +131,7 @@ void MObject::decontrolChild(MObject *child)
 {
     QMT_ASSERT(child, return);
     QMT_ASSERT(m_children.contains(child), return);
-    child->setOwner(0);
+    child->setOwner(nullptr);
     m_children.take(child);
 }
 
@@ -152,7 +152,7 @@ void MObject::addRelation(const Uid &uid)
 void MObject::addRelation(MRelation *relation)
 {
     QMT_ASSERT(relation, return);
-    QMT_ASSERT(relation->owner() == 0, return);
+    QMT_ASSERT(!relation->owner(), return);
     relation->setOwner(this);
     m_relations.add(relation);
 }
@@ -160,7 +160,7 @@ void MObject::addRelation(MRelation *relation)
 void MObject::insertRelation(int beforeIndex, MRelation *relation)
 {
     QMT_ASSERT(relation, return);
-    QMT_ASSERT(relation->owner() == 0, return);
+    QMT_ASSERT(!relation->owner(), return);
     relation->setOwner(this);
     m_relations.insert(beforeIndex, relation);
 }
@@ -168,14 +168,14 @@ void MObject::insertRelation(int beforeIndex, MRelation *relation)
 void MObject::removeRelation(MRelation *relation)
 {
     QMT_ASSERT(relation, return);
-    relation->setOwner(0);
+    relation->setOwner(nullptr);
     m_relations.remove(relation);
 }
 
 void MObject::decontrolRelation(MRelation *relation)
 {
     QMT_ASSERT(relation, return);
-    relation->setOwner(0);
+    relation->setOwner(nullptr);
     m_relations.take(relation);
 }
 
diff --git a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp
index 5c753b31734..464c5b77e6d 100644
--- a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp
@@ -45,7 +45,7 @@
 namespace qmt {
 
 MCloneVisitor::MCloneVisitor()
-    : m_cloned(0)
+    : m_cloned(nullptr)
 {
 }
 
@@ -145,7 +145,7 @@ void MCloneVisitor::visitMConnection(const MConnection *connection)
 }
 
 MCloneDeepVisitor::MCloneDeepVisitor()
-    : m_cloned(0)
+    : m_cloned(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
index 614069e0b37..d67cdf09c34 100644
--- a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
@@ -49,7 +49,7 @@ public:
     Uid m_elementKey;
     Uid m_ownerKey;
     int m_indexOfElement = -1;
-    MElement *m_clonedElement = 0;
+    MElement *m_clonedElement = nullptr;
 };
 
 class ModelController::UpdateObjectCommand : public UndoCommand
@@ -121,8 +121,8 @@ private:
         m_modelController->verifyModelIntegrity();
     }
 
-    ModelController *m_modelController = 0;
-    MObject *m_object = 0;
+    ModelController *m_modelController = nullptr;
+    MObject *m_object = nullptr;
 };
 
 class ModelController::UpdateRelationCommand :
@@ -191,8 +191,8 @@ private:
         m_modelController->verifyModelIntegrity();
     }
 
-    ModelController *m_modelController = 0;
-    MRelation *m_relation = 0;
+    ModelController *m_modelController = nullptr;
+    MRelation *m_relation = nullptr;
 };
 
 class ModelController::AddElementsCommand : public UndoCommand
@@ -239,7 +239,7 @@ public:
                     QMT_CHECK(object);
                     m_modelController->mapObject(object);
                     owner->insertChild(clone.m_indexOfElement, object);
-                    clone.m_clonedElement = 0;
+                    clone.m_clonedElement = nullptr;
                     emit m_modelController->endInsertObject(clone.m_indexOfElement, owner);
                     inserted = true;
                     break;
@@ -251,7 +251,7 @@ public:
                     QMT_CHECK(relation);
                     m_modelController->mapRelation(relation);
                     owner->insertRelation(clone.m_indexOfElement, relation);
-                    clone.m_clonedElement = 0;
+                    clone.m_clonedElement = nullptr;
                     emit m_modelController->endInsertRelation(clone.m_indexOfElement, owner);
                     inserted = true;
                     break;
@@ -321,7 +321,7 @@ public:
     }
 
 private:
-    ModelController *m_modelController = 0;
+    ModelController *m_modelController = nullptr;
     QList<ModelController::Clone> m_clonedElements;
 };
 
@@ -435,7 +435,7 @@ public:
                 QMT_CHECK(object);
                 m_modelController->mapObject(object);
                 owner->insertChild(clone.m_indexOfElement, object);
-                clone.m_clonedElement = 0;
+                clone.m_clonedElement = nullptr;
                 emit m_modelController->endInsertObject(clone.m_indexOfElement, owner);
                 inserted = true;
                 break;
@@ -447,7 +447,7 @@ public:
                 QMT_CHECK(relation);
                 m_modelController->mapRelation(relation);
                 owner->insertRelation(clone.m_indexOfElement, relation);
-                clone.m_clonedElement = 0;
+                clone.m_clonedElement = nullptr;
                 emit m_modelController->endInsertRelation(clone.m_indexOfElement, owner);
                 inserted = true;
                 break;
@@ -464,7 +464,7 @@ public:
     }
 
 private:
-    ModelController *m_modelController = 0;
+    ModelController *m_modelController = nullptr;
     QList<ModelController::Clone> m_clonedElements;
 };
 
@@ -518,7 +518,7 @@ private:
         m_modelController->verifyModelIntegrity();
     }
 
-    ModelController *m_modelController = 0;
+    ModelController *m_modelController = nullptr;
     Uid m_objectKey;
     Uid m_ownerKey;
     int m_indexOfElement = -1;
@@ -574,7 +574,7 @@ private:
         m_modelController->verifyModelIntegrity();
     }
 
-    ModelController *m_modelController = 0;
+    ModelController *m_modelController = nullptr;
     Uid m_relationKey;
     Uid m_ownerKey;
     int m_indexOfElement = -1;
@@ -582,8 +582,8 @@ private:
 
 ModelController::ModelController(QObject *parent)
     : QObject(parent),
-      m_rootPackage(0),
-      m_undoController(0),
+      m_rootPackage(nullptr),
+      m_undoController(nullptr),
       m_isResettingModel(false)
 {
 }
@@ -622,7 +622,7 @@ MElement *ModelController::findElement(const Uid &key)
         return object;
     else if (MRelation *relation = findRelation(key))
         return relation;
-    return 0;
+    return nullptr;
 }
 
 void ModelController::startResetModel()
diff --git a/src/libs/modelinglib/qmt/model_controller/modelcontroller.h b/src/libs/modelinglib/qmt/model_controller/modelcontroller.h
index ccc53078a53..1a18d9ee236 100644
--- a/src/libs/modelinglib/qmt/model_controller/modelcontroller.h
+++ b/src/libs/modelinglib/qmt/model_controller/modelcontroller.h
@@ -61,7 +61,7 @@ class QMT_EXPORT ModelController : public QObject
     class MoveRelationCommand;
 
 public:
-    explicit ModelController(QObject *parent = 0);
+    explicit ModelController(QObject *parent = nullptr);
     ~ModelController() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
index 25e3c55ea58..afc3ec0ebf4 100644
--- a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
+++ b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
@@ -39,7 +39,7 @@ class QMT_EXPORT SortedTreeModel : public QSortFilterProxyModel
     Q_OBJECT
 
 public:
-    explicit SortedTreeModel(QObject *parent = 0);
+    explicit SortedTreeModel(QObject *parent = nullptr);
     ~SortedTreeModel() override;
 
     TreeModel *treeModel() const { return m_treeModel; }
diff --git a/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h b/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h
index e7034640dfd..5395adb6cd4 100644
--- a/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h
+++ b/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h
@@ -38,7 +38,7 @@ class QMT_EXPORT StereotypesController : public QObject
     Q_OBJECT
 
 public:
-    explicit StereotypesController(QObject *parent = 0);
+    explicit StereotypesController(QObject *parent = nullptr);
 
 signals:
     void parseError(const QString &stereotypes);
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
index da11e43f0f4..bd0bf56bc11 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
+++ b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
@@ -199,8 +199,8 @@ public:
     }
 
 private:
-    TreeModel *m_treeModel = 0;
-    TreeModel::ModelItem *m_item = 0;
+    TreeModel *m_treeModel = nullptr;
+    TreeModel::ModelItem *m_item = nullptr;
 };
 
 class TreeModel::ItemUpdater : public MConstVisitor
@@ -304,8 +304,8 @@ private:
     void updateObjectLabel(const MObject *object);
     void updateRelationLabel(const MRelation *relation);
 
-    TreeModel *m_treeModel = 0;
-    TreeModel::ModelItem *m_item = 0;
+    TreeModel *m_treeModel = nullptr;
+    TreeModel::ModelItem *m_item = nullptr;
 };
 
 void TreeModel::ItemUpdater::updateObjectLabel(const MObject *object)
@@ -339,7 +339,7 @@ void TreeModel::setModelController(ModelController *modelController)
 {
     if (m_modelController != modelController) {
         if (m_modelController)
-            disconnect(m_modelController, 0, this, 0);
+            disconnect(m_modelController, nullptr, this, nullptr);
         m_modelController = modelController;
         if (m_modelController) {
             connect(m_modelController, &ModelController::beginResetModel,
@@ -401,7 +401,7 @@ MElement *TreeModel::element(const QModelIndex &index) const
 {
     QMT_CHECK(index.isValid());
 
-    MElement *element = 0;
+    MElement *element = nullptr;
     QStandardItem *item = itemFromIndex(index);
     if (item) {
         if (item->parent()) {
@@ -736,7 +736,7 @@ void TreeModel::onModelDataChanged(const QModelIndex &topleft, const QModelIndex
 void TreeModel::clear()
 {
     QStandardItemModel::clear();
-    m_rootItem = 0;
+    m_rootItem = nullptr;
     m_objectToItemMap.clear();
     m_itemToObjectMap.clear();
 }
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.h b/src/libs/modelinglib/qmt/model_ui/treemodel.h
index f3d8e167793..7e9bb0a4fc6 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodel.h
+++ b/src/libs/modelinglib/qmt/model_ui/treemodel.h
@@ -68,7 +68,7 @@ public:
         RoleItemType = Qt::UserRole + 1
     };
 
-    explicit TreeModel(QObject *parent = 0);
+    explicit TreeModel(QObject *parent = nullptr);
     ~TreeModel() override;
 
     ModelController *modelController() const { return m_modelController; }
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp
index 8cbfd485f1a..ffdbfaa3fc4 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp
+++ b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.cpp
@@ -70,7 +70,7 @@ bool TreeModelManager::isRootPackageSelected() const
 
 MObject *TreeModelManager::selectedObject() const
 {
-    MObject *object = 0;
+    MObject *object = nullptr;
     if (m_modelTreeView->currentSourceModelIndex().isValid()) {
         MElement *element = m_treeModel->element(m_modelTreeView->currentSourceModelIndex());
         if (element)
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h
index dfb604cd98d..0fdc158691a 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h
+++ b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h
@@ -41,7 +41,7 @@ class QMT_EXPORT TreeModelManager : public QObject
     Q_OBJECT
 
 public:
-    explicit TreeModelManager(QObject *parent = 0);
+    explicit TreeModelManager(QObject *parent = nullptr);
     ~TreeModelManager() override;
 
     TreeModel *treeModel() const { return m_treeModel; }
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h
index ca23702742c..f20acd96010 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h
@@ -39,7 +39,7 @@ class QMT_EXPORT ClassMembersEdit : public QPlainTextEdit
     class ClassMembersEditPrivate;
 
 public:
-    explicit ClassMembersEdit(QWidget *parent = 0);
+    explicit ClassMembersEdit(QWidget *parent = nullptr);
     ~ClassMembersEdit() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
index bb910bd635b..dcbe916f63e 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h
@@ -41,7 +41,7 @@ class QMT_EXPORT ModelTreeView : public QTreeView, public ModelTreeViewInterface
     Q_OBJECT
 
 public:
-    explicit ModelTreeView(QWidget *parent = 0);
+    explicit ModelTreeView(QWidget *parent = nullptr);
     ~ModelTreeView() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h b/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h
index 501b7ea758a..e664d9a7619 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h
@@ -38,7 +38,7 @@ class QMT_EXPORT PaletteBox : public QWidget
     Q_OBJECT
 
 public:
-    explicit PaletteBox(QWidget *parent = 0);
+    explicit PaletteBox(QWidget *parent = nullptr);
     ~PaletteBox() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp
index f605d7dc2f1..d924c518846 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp
@@ -39,13 +39,13 @@ namespace qmt {
 
 PropertiesView::PropertiesView(QObject *parent)
     : QObject(parent),
-      m_modelController(0),
-      m_diagramController(0),
-      m_stereotypeController(0),
-      m_styleController(0),
+      m_modelController(nullptr),
+      m_diagramController(nullptr),
+      m_stereotypeController(nullptr),
+      m_styleController(nullptr),
       m_viewFactory([=](PropertiesView *propertiesView) { return new MView(propertiesView); }),
-      m_selectedDiagram(0),
-      m_widget(0)
+      m_selectedDiagram(nullptr),
+      m_widget(nullptr)
 {
 }
 
@@ -57,7 +57,7 @@ void PropertiesView::setModelController(ModelController *modelController)
 {
     if (m_modelController != modelController) {
         if (m_modelController)
-            disconnect(m_modelController, 0, this, 0);
+            disconnect(m_modelController, nullptr, this, nullptr);
         m_modelController = modelController;
         if (m_modelController) {
             connect(m_modelController, &ModelController::beginResetModel,
@@ -109,8 +109,8 @@ void PropertiesView::setDiagramController(DiagramController *diagramController)
 {
     if (m_diagramController != diagramController) {
         if (m_diagramController) {
-            disconnect(m_diagramController, 0, this, 0);
-            m_diagramController = 0;
+            disconnect(m_diagramController, nullptr, this, nullptr);
+            m_diagramController = nullptr;
         }
         m_diagramController = diagramController;
         if (diagramController) {
@@ -162,7 +162,7 @@ void PropertiesView::setSelectedModelElements(const QList<MElement *> &modelElem
     if (m_selectedModelElements != modelElements) {
         m_selectedModelElements = modelElements;
         m_selectedDiagramElements.clear();
-        m_selectedDiagram = 0;
+        m_selectedDiagram = nullptr;
         m_mview.reset(m_viewFactory(this));
         m_mview->update(m_selectedModelElements);
         m_widget = m_mview->topLevelWidget();
@@ -188,9 +188,9 @@ void PropertiesView::clearSelection()
 {
     m_selectedModelElements.clear();
     m_selectedDiagramElements.clear();
-    m_selectedDiagram = 0;
+    m_selectedDiagram = nullptr;
     m_mview.reset();
-    m_widget = 0;
+    m_widget = nullptr;
 }
 
 QWidget *PropertiesView::widget() const
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h
index 39c1f817a16..1eeaae307e9 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h
@@ -55,7 +55,7 @@ class QMT_EXPORT PropertiesView : public QObject
 public:
     class MView;
 
-    explicit PropertiesView(QObject *parent = 0);
+    explicit PropertiesView(QObject *parent = nullptr);
     ~PropertiesView() override;
 
     ModelController *modelController() const { return m_modelController; }
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
index 9c3dd9d3629..2cb9017e766 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
@@ -285,50 +285,50 @@ static DAnnotation::VisualRole translateIndexToAnnotationVisualRole(int index)
 
 PropertiesView::MView::MView(PropertiesView *propertiesView)
     : m_propertiesView(propertiesView),
-      m_diagram(0),
+      m_diagram(nullptr),
       m_stereotypesController(new StereotypesController(this)),
-      m_topWidget(0),
-      m_topLayout(0),
+      m_topWidget(nullptr),
+      m_topLayout(nullptr),
       m_stereotypeElement(StereotypeIcon::ElementAny),
-      m_classNameLabel(0),
-      m_stereotypeComboBox(0),
-      m_reverseEngineeredLabel(0),
-      m_elementNameLineEdit(0),
-      m_childrenLabel(0),
-      m_relationsLabel(0),
-      m_namespaceLineEdit(0),
-      m_templateParametersLineEdit(0),
-      m_classMembersStatusLabel(0),
-      m_classMembersParseButton(0),
-      m_classMembersEdit(0),
-      m_diagramsLabel(0),
-      m_itemVarietyEdit(0),
-      m_endALabel(0),
-      m_endBLabel(0),
-      m_directionSelector(0),
-      m_endAEndName(0),
-      m_endACardinality(0),
-      m_endANavigable(0),
-      m_endAKind(0),
-      m_endBEndName(0),
-      m_endBCardinality(0),
-      m_endBNavigable(0),
-      m_endBKind(0),
-      m_separatorLine(0),
+      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(0),
-      m_autoSizedCheckbox(0),
-      m_visualPrimaryRoleSelector(0),
-      m_visualSecondaryRoleSelector(0),
-      m_visualEmphasizedCheckbox(0),
-      m_stereotypeDisplaySelector(0),
-      m_depthLabel(0),
-      m_templateDisplaySelector(0),
-      m_showAllMembersCheckbox(0),
-      m_plainShapeCheckbox(0),
-      m_itemShapeEdit(0),
-      m_annotationAutoWidthCheckbox(0),
-      m_annotationVisualRoleSelector(0)
+      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)
 {
 }
 
@@ -342,7 +342,7 @@ void PropertiesView::MView::update(QList<MElement *> &modelElements)
 
     m_modelElements = modelElements;
     m_diagramElements.clear();
-    m_diagram = 0;
+    m_diagram = nullptr;
     modelElements.at(0)->accept(this);
 }
 
@@ -365,7 +365,7 @@ void PropertiesView::MView::update(QList<DElement *> &diagramElements, MDiagram
         }
         if (!appendedMelement) {
             // ensure that indices within m_diagramElements match indices into m_modelElements
-            m_modelElements.append(0);
+            m_modelElements.append(nullptr);
         }
     }
     diagramElements.at(0)->accept(this);
diff --git a/src/libs/modelinglib/qmt/project_controller/projectcontroller.h b/src/libs/modelinglib/qmt/project_controller/projectcontroller.h
index 73daf2a2ac9..6945fa7322b 100644
--- a/src/libs/modelinglib/qmt/project_controller/projectcontroller.h
+++ b/src/libs/modelinglib/qmt/project_controller/projectcontroller.h
@@ -52,7 +52,7 @@ class QMT_EXPORT ProjectController : public QObject
     Q_OBJECT
 
 public:
-    explicit ProjectController(QObject *parent = 0);
+    explicit ProjectController(QObject *parent = nullptr);
     ~ProjectController() override;
 
 signals:
diff --git a/src/libs/modelinglib/qmt/stereotype/iconshape.cpp b/src/libs/modelinglib/qmt/stereotype/iconshape.cpp
index 2bf1d5fdbdf..f138684b64e 100644
--- a/src/libs/modelinglib/qmt/stereotype/iconshape.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/iconshape.cpp
@@ -38,7 +38,7 @@ QList<T *> cloneAll(const QList<T *> &rhs)
 {
     QList<T *> result;
     foreach (T *t, rhs)
-        result.append(t != 0 ? t->clone() : 0);
+        result.append(t ? t->clone() : nullptr);
     return result;
 }
 
@@ -75,10 +75,10 @@ public:
 
 PathShape *IconShape::IconShapePrivate::activePath()
 {
-    PathShape *pathShape = 0;
+    PathShape *pathShape = nullptr;
     if (m_shapes.count() > 0)
         pathShape = dynamic_cast<PathShape *>(m_shapes.last());
-    if (pathShape == 0) {
+    if (!pathShape) {
         pathShape = new PathShape();
         m_shapes.append(pathShape);
     }
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h
index 37d196d1010..a010352e361 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h
@@ -43,7 +43,7 @@ class QMT_EXPORT StereotypeController : public QObject
     class StereotypeControllerPrivate;
 
 public:
-    explicit StereotypeController(QObject *parent = 0);
+    explicit StereotypeController(QObject *parent = nullptr);
     ~StereotypeController() override;
 
     QList<StereotypeIcon> stereotypeIcons() const;
diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.cpp b/src/libs/modelinglib/qmt/style/stylecontroller.cpp
index 2a194aaf3a5..d539ebec15b 100644
--- a/src/libs/modelinglib/qmt/style/stylecontroller.cpp
+++ b/src/libs/modelinglib/qmt/style/stylecontroller.cpp
@@ -47,7 +47,7 @@ public:
     }
 
 private:
-    StyleController *m_styleController = 0;
+    StyleController *m_styleController = nullptr;
 };
 
 StyleController::StyleController(QObject *parent)
diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.h b/src/libs/modelinglib/qmt/style/stylecontroller.h
index 9163a6b0b6a..789eb16226d 100644
--- a/src/libs/modelinglib/qmt/style/stylecontroller.h
+++ b/src/libs/modelinglib/qmt/style/stylecontroller.h
@@ -47,7 +47,7 @@ class QMT_EXPORT StyleController : public QObject
     class Parameters;
 
 public:
-    explicit StyleController(QObject *parent = 0);
+    explicit StyleController(QObject *parent = nullptr);
     ~StyleController() override;
 
     bool suppressGradients() const { return m_suppressGradients; }
diff --git a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp
index f02646dbd91..f0f75863ae7 100644
--- a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp
+++ b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp
@@ -49,9 +49,9 @@
 namespace qmt {
 
 AlignOnRasterVisitor::AlignOnRasterVisitor()
-    : m_diagramController(0),
-      m_sceneInspector(0),
-      m_diagram(0)
+    : m_diagramController(nullptr),
+      m_sceneInspector(nullptr),
+      m_diagram(nullptr)
 {
 }
 
diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
index 85fa4b84ce5..3ae964bbcfb 100644
--- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
+++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
@@ -144,8 +144,8 @@ void DiagramSceneController::setModelController(ModelController *modelController
     if (m_modelController == modelController)
         return;
     if (m_modelController) {
-        disconnect(m_modelController, 0, this, 0);
-        m_modelController = 0;
+        disconnect(m_modelController, nullptr, this, nullptr);
+        m_modelController = nullptr;
     }
     if (modelController)
         m_modelController = modelController;
@@ -156,8 +156,8 @@ void DiagramSceneController::setDiagramController(DiagramController *diagramCont
     if (m_diagramController == diagramController)
         return;
     if (m_diagramController) {
-        disconnect(m_diagramController, 0, this, 0);
-        m_diagramController = 0;
+        disconnect(m_diagramController, nullptr, this, nullptr);
+        m_diagramController = nullptr;
     }
     if (diagramController)
         m_diagramController = diagramController;
@@ -396,7 +396,7 @@ void DiagramSceneController::dropNewElement(const QString &newElementId, const Q
         emit newElementCreated(swimlane, diagram);
     } else {
         MPackage *parentPackage = findSuitableParentPackage(topMostElementAtPos, diagram);
-        MObject *newObject = 0;
+        MObject *newObject = nullptr;
         QString newName;
         if (newElementId == QLatin1String(ELEMENT_TYPE_PACKAGE)) {
             auto package = new MPackage();
@@ -447,7 +447,7 @@ void DiagramSceneController::dropNewModelElement(MObject *modelObject, MPackage
 
 MPackage *DiagramSceneController::findSuitableParentPackage(DElement *topmostDiagramElement, MDiagram *diagram)
 {
-    MPackage *parentPackage = 0;
+    MPackage *parentPackage = nullptr;
     if (auto diagramPackage = dynamic_cast<DPackage *>(topmostDiagramElement)) {
         parentPackage = m_modelController->findObject<MPackage>(diagramPackage->modelUid());
     } else if (auto diagramObject = dynamic_cast<DObject *>(topmostDiagramElement)) {
@@ -455,9 +455,9 @@ MPackage *DiagramSceneController::findSuitableParentPackage(DElement *topmostDia
         if (modelObject)
             parentPackage = dynamic_cast<MPackage *>(modelObject->owner());
     }
-    if (parentPackage == 0 && diagram != 0)
+    if (!parentPackage && diagram)
         parentPackage = dynamic_cast<MPackage *>(diagram->owner());
-    if (parentPackage == 0)
+    if (!parentPackage)
         parentPackage = m_modelController->rootPackage();
     return parentPackage;
 }
@@ -473,7 +473,7 @@ MDiagram *DiagramSceneController::findDiagramBySearchId(MPackage *package, const
             }
         }
     }
-    return 0;
+    return nullptr;
 }
 
 namespace {
@@ -671,7 +671,7 @@ void DiagramSceneController::alignOnRaster(DElement *element, MDiagram *diagram)
 
 DElement *DiagramSceneController::addModelElement(const Uid &modelElementKey, const QPointF &pos, MDiagram *diagram)
 {
-    DElement *element = 0;
+    DElement *element = nullptr;
     if (MObject *modelObject = m_modelController->findObject(modelElementKey)) {
         element = addObject(modelObject, pos, diagram);
     } else if (MRelation *modelRelation = m_modelController->findRelation(modelElementKey)) {
@@ -687,7 +687,7 @@ DObject *DiagramSceneController::addObject(MObject *modelObject, const QPointF &
     QMT_ASSERT(modelObject, return nullptr);
 
     if (m_diagramController->hasDelegate(modelObject, diagram))
-        return 0;
+        return nullptr;
 
     m_diagramController->undoController()->beginMergeSequence(tr("Add Element"));
 
@@ -749,7 +749,7 @@ DRelation *DiagramSceneController::addRelation(MRelation *modelRelation, const Q
     QMT_ASSERT(modelRelation, return nullptr);
 
     if (m_diagramController->hasDelegate(modelRelation, diagram))
-        return 0;
+        return nullptr;
 
     DFactory factory;
     modelRelation->accept(&factory);
diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
index 4293557c92b..d0483a03012 100644
--- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
+++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
@@ -68,7 +68,7 @@ class QMT_EXPORT DiagramSceneController : public QObject
     };
 
 public:
-    explicit DiagramSceneController(QObject *parent = 0);
+    explicit DiagramSceneController(QObject *parent = nullptr);
     ~DiagramSceneController() override;
 
 signals:
@@ -95,10 +95,10 @@ public:
                            const QList<QPointF> &intermediatePoints, MDiagram *diagram);
     void createAssociation(DClass *endAClass, DClass *endBClass,
                            const QList<QPointF> &intermediatePoints, MDiagram *diagram,
-                           std::function<void (MAssociation*, DAssociation*)> custom = 0);
+                           std::function<void (MAssociation*, DAssociation*)> custom = nullptr);
     void createConnection(const QString &customRelationId, DObject *endAObject, DObject *endBObject,
                           const QList<QPointF> &intermediatePoints, MDiagram *diagram,
-                          std::function<void (MConnection*, DConnection*)> custom = 0);
+                          std::function<void (MConnection*, DConnection*)> custom = nullptr);
     bool relocateRelationEndA(DRelation *relation, DObject *targetObject);
     bool relocateRelationEndB(DRelation *relation, DObject *targetObject);
 
diff --git a/src/libs/modelinglib/qstringparser/qstringparser.h b/src/libs/modelinglib/qstringparser/qstringparser.h
index 8735e9b60ba..76b5a9fa7ce 100644
--- a/src/libs/modelinglib/qstringparser/qstringparser.h
+++ b/src/libs/modelinglib/qstringparser/qstringparser.h
@@ -62,7 +62,7 @@ private:
             void (U::*setter() const)(V) { return m_setter; }
         private:
             U &m_object;
-            void (U::*m_setter)(V) = 0;
+            void (U::*m_setter)(V) = nullptr;
         };
 
     public:
@@ -92,7 +92,7 @@ private:
         template<typename V>
         bool visit(RefNode<V> *node, int *index)
         {
-            V v = 0;
+            V v = nullptr;
             if (!scan(&v, index))
                 return false;
             node->ref() = v;
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/attribute.h b/src/libs/modelinglib/qtserialization/inc/qark/attribute.h
index 7070964d6fb..4e90427e0dd 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/attribute.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/attribute.h
@@ -54,7 +54,7 @@ public:
 
 private:
     QString m_qualifiedName;
-    T *m_value = 0;
+    T *m_value = nullptr;
     Parameters m_parameters;
 };
 
@@ -110,7 +110,7 @@ public:
 private:
     QString m_qualifiedName;
     const U &m_u;
-    T (U::*m_getter)() const = 0;
+    T (U::*m_getter)() const = nullptr;
     Parameters m_parameters;
 };
 
@@ -155,7 +155,7 @@ public:
 private:
     QString m_qualifiedName;
     U &m_u;
-    void (U::*m_setter)(T) = 0;
+    void (U::*m_setter)(T) = nullptr;
     Parameters m_parameters;
 };
 
@@ -205,8 +205,8 @@ public:
 private:
     QString m_qualifiedName;
     U &m_u;
-    T (U::*m_getter)() const = 0;
-    void (U::*m_setter)(V) = 0;
+    T (U::*m_getter)() const = nullptr;
+    void (U::*m_setter)(V) = nullptr;
     Parameters m_parameters;
 };
 
@@ -253,7 +253,7 @@ public:
 private:
     QString m_qualifiedName;
     U &m_u;
-    T (*m_getFunc)(const U &) = 0;
+    T (*m_getFunc)(const U &) = nullptr;
     Parameters m_parameters;
 };
 
@@ -298,7 +298,7 @@ public:
 private:
     QString m_qualifiedName;
     U &m_u;
-    void (*m_setFunc)(U &, T) = 0;
+    void (*m_setFunc)(U &, T) = nullptr;
     Parameters m_parameters;
 };
 
@@ -347,8 +347,8 @@ public:
 private:
     QString m_qualifiedName;
     U &m_u;
-    T (*m_getFunc)(const U &) = 0;
-    void (*m_setFunc)(U &, V) = 0;
+    T (*m_getFunc)(const U &) = nullptr;
+    void (*m_setFunc)(U &, V) = nullptr;
     Parameters m_parameters;
 };
 
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h
index b11a4db04b2..6a52047dd57 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h
@@ -298,7 +298,7 @@ public:
     explicit QXmlInArchive(QXmlStreamReader &stream)
         : m_stream(stream),
           m_endTagWasRead(false),
-          m_currentRefNode(0)
+          m_currentRefNode(nullptr)
     {
     }
 
@@ -587,7 +587,7 @@ private:
     template<class T>
     void visit(ObjectNode<T> *node, const XmlTag &tag)
     {
-        if (tag.m_id.isValid() && node->object().object() != 0)
+        if (tag.m_id.isValid() && node->object().object() != nullptr)
             m_loadingRefMap.addObject(tag.m_id, node->object().object());
         readChildren(node);
     }
@@ -704,9 +704,9 @@ private:
         m_currentRefNode = node;
         T value = T();
         load(*this, value, node->reference().parameters());
-        if (m_currentRefNode != 0) { // ref node was not consumed by forward reference
+        if (m_currentRefNode) { // ref node was not consumed by forward reference
             *node->reference().value() = value;
-            m_currentRefNode = 0;
+            m_currentRefNode = nullptr;
         }
         XmlTag xmlTag = readTag();
         if (!xmlTag.m_isEndTag || xmlTag.m_tagName != node->reference().qualifiedName())
@@ -719,9 +719,9 @@ private:
         m_currentRefNode = node;
         T value;
         load(*this, value, node->reference().parameters());
-        if (m_currentRefNode != 0) { // ref node was not consumed by forward reference
+        if (m_currentRefNode) { // ref node was not consumed by forward reference
             (node->reference().object().*(node->reference().setter()))(value);
-            m_currentRefNode = 0;
+            m_currentRefNode = nullptr;
         }
         XmlTag xmlTag = readTag();
         if (!xmlTag.m_isEndTag || xmlTag.m_tagName != node->reference().qualifiedName())
@@ -734,9 +734,9 @@ private:
         m_currentRefNode = node;
         T value;
         load(*this, value, node->reference().parameters());
-        if (m_currentRefNode != 0) { // ref node was not consumed by forward reference
+        if (m_currentRefNode) { // ref node was not consumed by forward reference
             (node->reference().object().*(node->reference().setter()))(value);
-            m_currentRefNode = 0;
+            m_currentRefNode = nullptr;
         }
         XmlTag xmlTag = readTag();
         if (!xmlTag.m_isEndTag || xmlTag.m_tagName != node->reference().qualifiedName())
@@ -749,9 +749,9 @@ private:
         m_currentRefNode = node;
         V value;
         load(*this, value, node->reference().parameters());
-        if (m_currentRefNode != 0) { // ref node was not consumed by forward reference
+        if (m_currentRefNode) { // ref node was not consumed by forward reference
             (node->reference().object().*(node->reference().setter()))(value);
-            m_currentRefNode = 0;
+            m_currentRefNode = nullptr;
         }
         XmlTag xmlTag = readTag();
         if (!xmlTag.m_isEndTag || xmlTag.m_tagName != node->reference().qualifiedName())
@@ -764,9 +764,9 @@ private:
         m_currentRefNode = node;
         V value;
         load(*this, value, node->reference().parameters());
-        if (m_currentRefNode != 0) { // ref node was not consumed by forward reference
+        if (m_currentRefNode) { // ref node was not consumed by forward reference
             (node->reference().object().*(node->reference().setter()))(value);
-            m_currentRefNode = 0;
+            m_currentRefNode = nullptr;
         }
         XmlTag xmlTag = readTag();
         if (!xmlTag.m_isEndTag || xmlTag.m_tagName != node->reference().qualifiedName())
@@ -779,9 +779,9 @@ private:
         m_currentRefNode = node;
         T value;
         load(*this, value, node->reference().parameters());
-        if (m_currentRefNode != 0) { // ref node was not consumed by forward reference
+        if (m_currentRefNode) { // ref node was not consumed by forward reference
             (node->reference().setterFunc())(node->reference().object(), value);
-            m_currentRefNode = 0;
+            m_currentRefNode = nullptr;
         }
         XmlTag xmlTag = readTag();
         if (!xmlTag.m_isEndTag || xmlTag.m_tagName != node->reference().qualifiedName())
@@ -794,9 +794,9 @@ private:
         m_currentRefNode = node;
         T value;
         load(*this, value, node->reference().parameters());
-        if (m_currentRefNode != 0) { // ref node was not consumed by forward reference
+        if (m_currentRefNode) { // ref node was not consumed by forward reference
             (node->reference().setterFunc())(node->reference().object(), value);
-            m_currentRefNode = 0;
+            m_currentRefNode = nullptr;
         }
         XmlTag xmlTag = readTag();
         if (!xmlTag.m_isEndTag || xmlTag.m_tagName != node->reference().qualifiedName())
@@ -809,9 +809,9 @@ private:
         m_currentRefNode = node;
         V value;
         load(*this, value, node->reference().parameters());
-        if (m_currentRefNode != 0) { // ref node was not consumed by forward reference
+        if (m_currentRefNode) { // ref node was not consumed by forward reference
             (node->reference().setterFunc())(node->reference().object(), value);
-            m_currentRefNode = 0;
+            m_currentRefNode = nullptr;
         }
         XmlTag xmlTag = readTag();
         if (!xmlTag.m_isEndTag || xmlTag.m_tagName != node->reference().qualifiedName())
@@ -824,9 +824,9 @@ private:
         m_currentRefNode = node;
         V value;
         load(*this, value, node->reference().parameters());
-        if (m_currentRefNode != 0) { // ref node was not consumed by forward reference
+        if (m_currentRefNode) { // ref node was not consumed by forward reference
             (node->reference().setterFunc())(node->reference().object(), value);
-            m_currentRefNode = 0;
+            m_currentRefNode = nullptr;
         }
         XmlTag xmlTag = readTag();
         if (!xmlTag.m_isEndTag || xmlTag.m_tagName != node->reference().qualifiedName())
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/reference.h b/src/libs/modelinglib/qtserialization/inc/qark/reference.h
index c00c6b66641..0c5c9ba3783 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/reference.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/reference.h
@@ -54,7 +54,7 @@ public:
 
 private:
     QString m_qualifiedName;
-    T *m_value = 0;
+    T *m_value = nullptr;
     Parameters m_parameters;
 };
 
@@ -110,7 +110,7 @@ public:
 private:
     QString m_qualifiedName;
     const U &m_u;
-    T (U::*m_getter)() const = 0;
+    T (U::*m_getter)() const = nullptr;
     Parameters m_parameters;
 };
 
@@ -155,7 +155,7 @@ public:
 private:
     QString m_qualifiedName;
     U &m_u;
-    void (U::*m_setter)(T) = 0;
+    void (U::*m_setter)(T) = nullptr;
     Parameters m_parameters;
 };
 
@@ -217,8 +217,8 @@ public:
 private:
     QString m_qualifiedName;
     U &m_u;
-    T (U::*m_getter)() const = 0;
-    void (U::*m_setter)(V) = 0;
+    T (U::*m_getter)() const = nullptr;
+    void (U::*m_setter)(V) = nullptr;
     Parameters m_parameters;
 };
 
@@ -279,7 +279,7 @@ public:
 private:
     QString m_qualifiedName;
     const U &m_u;
-    T (*m_getFunc)(const U &) = 0;
+    T (*m_getFunc)(const U &) = nullptr;
     Parameters m_parameters;
 };
 
@@ -324,7 +324,7 @@ public:
 private:
     QString m_qualifiedName;
     U &m_u;
-    void (*m_setFunc)(U &, T) = 0;
+    void (*m_setFunc)(U &, T) = nullptr;
     Parameters m_parameters;
 };
 
@@ -386,8 +386,8 @@ public:
 private:
     QString m_qualifiedName;
     U &m_u;
-    T (*m_getFunc)(const U &) = 0;
-    void (*m_setFunc)(U &, V) = 0;
+    T (*m_getFunc)(const U &) = nullptr;
+    void (*m_setFunc)(U &, V) = nullptr;
     Parameters m_parameters;
 };
 
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h
index 876609643d3..246f1eca84e 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h
@@ -45,7 +45,7 @@ inline void save(Archive &archive, T *p, const Parameters &)
             } else {
                 archive.beginInstance(typeUid(*p));
                 typename registry::TypeRegistry<Archive, T>::TypeInfo typeData = typeInfo<Archive, T>(*p);
-                if (typeData.m_saveFunc == 0)
+                if (!typeData.m_saveFunc)
                     throw UnregisteredType();
                 else
                     typeData.m_saveFunc(archive, p);
@@ -64,7 +64,7 @@ void load(Archive &archive, T *&p, const Parameters &)
     typename Archive::ReferenceTag refTag = archive.readReferenceTag();
     switch (refTag.kind) {
     case Archive::Nullpointer:
-        p = 0;
+        p = nullptr;
         break;
     case Archive::Pointer:
         archive.read(p);
@@ -74,7 +74,7 @@ void load(Archive &archive, T *&p, const Parameters &)
             registry::loadNonVirtualPointer<Archive,T>(archive, p);
         } else {
             typename registry::TypeRegistry<Archive, T>::TypeInfo typeData = typeInfo<Archive, T>(refTag.typeName);
-            if (typeData.m_loadFunc == 0)
+            if (!typeData.m_loadFunc)
                 throw UnregisteredType();
             else
                 typeData.m_loadFunc(archive, p);
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/tag.h b/src/libs/modelinglib/qtserialization/inc/qark/tag.h
index 24f81e5d920..9216e0cf667 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/tag.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/tag.h
@@ -73,7 +73,7 @@ public:
     T *object() const { return m_object; }
 
 private:
-    T *m_object = 0;
+    T *m_object = nullptr;
 };
 
 inline Tag tag(const QString &qualifiedName)
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
index aa0750cfdbe..4e631d94f53 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
@@ -59,8 +59,8 @@ public:
     static MapType &uidToNameMap() { return *typeidUidToNameMap; }
 
 #if !defined(QT_NO_DEBUG)
-    static bool hasNameToUidMap() { return typeidNameToUidMap != 0; }
-    static bool hasUidToNameMap() { return typeidUidToNameMap != 0; }
+    static bool hasNameToUidMap() { return typeidNameToUidMap != nullptr; }
+    static bool hasUidToNameMap() { return typeidUidToNameMap != nullptr; }
 #endif
 
 protected:
@@ -119,8 +119,8 @@ public:
         typedef Archive &(*LoadFuncType)(Archive &, BASE * &p);
 
         explicit TypeInfo()
-            : m_saveFunc(0),
-              m_loadFunc(0)
+            : m_saveFunc(nullptr),
+              m_loadFunc(nullptr)
         {
         }
 
@@ -144,7 +144,7 @@ public:
     static MapType &map() { return *m_map; }
 
 #if !defined(QT_NO_DEBUG)
-    static bool hasMap() { return m_map != 0; }
+    static bool hasMap() { return m_map != nullptr; }
 #endif
 
 protected: