diff --git a/src/plugins/modeleditor/actionhandler.cpp b/src/plugins/modeleditor/actionhandler.cpp
index ecb852a2475..016a0ad027f 100644
--- a/src/plugins/modeleditor/actionhandler.cpp
+++ b/src/plugins/modeleditor/actionhandler.cpp
@@ -46,20 +46,20 @@ namespace Internal {
 class ActionHandler::ActionHandlerPrivate {
 public:
     Core::Context context;
-    QAction *undoAction = 0;
-    QAction *redoAction = 0;
-    QAction *cutAction = 0;
-    QAction *copyAction = 0;
-    QAction *pasteAction = 0;
-    QAction *removeAction = 0;
-    QAction *deleteAction = 0;
-    QAction *selectAllAction = 0;
-    QAction *openParentDiagramAction = 0;
-    QAction *synchronizeBrowserAction = 0;
-    QAction *exportDiagramAction = 0;
-    QAction *zoomInAction = 0;
-    QAction *zoomOutAction = 0;
-    QAction *resetZoomAction = 0;
+    QAction *undoAction = nullptr;
+    QAction *redoAction = nullptr;
+    QAction *cutAction = nullptr;
+    QAction *copyAction = nullptr;
+    QAction *pasteAction = nullptr;
+    QAction *removeAction = nullptr;
+    QAction *deleteAction = nullptr;
+    QAction *selectAllAction = nullptr;
+    QAction *openParentDiagramAction = nullptr;
+    QAction *synchronizeBrowserAction = nullptr;
+    QAction *exportDiagramAction = nullptr;
+    QAction *zoomInAction = nullptr;
+    QAction *zoomOutAction = nullptr;
+    QAction *resetZoomAction = nullptr;
 };
 
 ActionHandler::ActionHandler(const Core::Context &context, QObject *parent)
diff --git a/src/plugins/modeleditor/actionhandler.h b/src/plugins/modeleditor/actionhandler.h
index af2793d3fe8..e2ad8f7e02d 100644
--- a/src/plugins/modeleditor/actionhandler.h
+++ b/src/plugins/modeleditor/actionhandler.h
@@ -50,7 +50,7 @@ class ActionHandler :
     class ActionHandlerPrivate;
 
 public:
-    ActionHandler(const Core::Context &context, QObject *parent = 0);
+    ActionHandler(const Core::Context &context, QObject *parent = nullptr);
     ~ActionHandler();
 
 public:
diff --git a/src/plugins/modeleditor/classviewcontroller.h b/src/plugins/modeleditor/classviewcontroller.h
index 4bf67d480e5..f9534204523 100644
--- a/src/plugins/modeleditor/classviewcontroller.h
+++ b/src/plugins/modeleditor/classviewcontroller.h
@@ -38,7 +38,7 @@ class ClassViewController :
     Q_OBJECT
 
 public:
-    explicit ClassViewController(QObject *parent = 0);
+    explicit ClassViewController(QObject *parent = nullptr);
     ~ClassViewController() = default;
 
     QSet<QString> findClassDeclarations(const QString &fileName);
diff --git a/src/plugins/modeleditor/componentviewcontroller.cpp b/src/plugins/modeleditor/componentviewcontroller.cpp
index 873b4d0615a..b9fadc2bd1f 100644
--- a/src/plugins/modeleditor/componentviewcontroller.cpp
+++ b/src/plugins/modeleditor/componentviewcontroller.cpp
@@ -64,7 +64,7 @@ private:
     QString m_elementName;
     QStringList m_elementsPath;
     int m_maxPathLength = 0;
-    qmt::MComponent *m_bestComponent = 0;
+    qmt::MComponent *m_bestComponent = nullptr;
 };
 
 void FindComponentFromFilePath::setFilePath(const QString &filePath)
@@ -131,7 +131,7 @@ private:
     bool haveDependency(const qmt::MObject *source, const QList<qmt::MPackage *> &targets);
 
 private:
-    qmt::ModelController *m_modelController = 0;
+    qmt::ModelController *m_modelController = nullptr;
     QMultiHash<QString, Node> m_filePaths;
 };
 
@@ -360,8 +360,8 @@ bool UpdateIncludeDependenciesVisitor::haveDependency(const qmt::MObject *source
 
 class ComponentViewController::ComponentViewControllerPrivate {
 public:
-    PxNodeUtilities *pxnodeUtilities = 0;
-    qmt::DiagramSceneController *diagramSceneController = 0;
+    PxNodeUtilities *pxnodeUtilities = nullptr;
+    qmt::DiagramSceneController *diagramSceneController = nullptr;
 };
 
 ComponentViewController::ComponentViewController(QObject *parent)
@@ -408,7 +408,7 @@ void ComponentViewController::doCreateComponentModel(const ProjectExplorer::Fold
 {
     foreach (const ProjectExplorer::FileNode *fileNode, folderNode->fileNodes()) {
         QString componentName = qmt::NameController::convertFileNameToElementName(fileNode->filePath().toString());
-        qmt::MComponent *component = 0;
+        qmt::MComponent *component = nullptr;
         bool isSource = false;
         CppTools::ProjectFile::Kind kind = CppTools::ProjectFile::classify(fileNode->filePath().toString());
         switch (kind) {
@@ -441,7 +441,7 @@ void ComponentViewController::doCreateComponentModel(const ProjectExplorer::Fold
             if (d->pxnodeUtilities->findSameObject(relativeElements, component)) {
                 delete component;
             } else {
-                qmt::MPackage *requestedRootPackage = d->diagramSceneController->findSuitableParentPackage(0, diagram);
+                qmt::MPackage *requestedRootPackage = d->diagramSceneController->findSuitableParentPackage(nullptr, diagram);
                 qmt::MPackage *bestParentPackage = d->pxnodeUtilities->createBestMatchingPackagePath(requestedRootPackage, relativeElements);
                 d->diagramSceneController->modelController()->addObject(bestParentPackage, component);
             }
diff --git a/src/plugins/modeleditor/componentviewcontroller.h b/src/plugins/modeleditor/componentviewcontroller.h
index 321805ab408..a0a70b73b8b 100644
--- a/src/plugins/modeleditor/componentviewcontroller.h
+++ b/src/plugins/modeleditor/componentviewcontroller.h
@@ -47,7 +47,7 @@ class ComponentViewController :
     class ComponentViewControllerPrivate;
 
 public:
-    explicit ComponentViewController(QObject *parent = 0);
+    explicit ComponentViewController(QObject *parent = nullptr);
     ~ComponentViewController();
 
     void setPxNodeUtilties(PxNodeUtilities *pxnodeUtilities);
diff --git a/src/plugins/modeleditor/diagramsviewmanager.h b/src/plugins/modeleditor/diagramsviewmanager.h
index 0811d6cd70e..62ecff23cc2 100644
--- a/src/plugins/modeleditor/diagramsviewmanager.h
+++ b/src/plugins/modeleditor/diagramsviewmanager.h
@@ -46,7 +46,7 @@ class DiagramsViewManager :
     Q_OBJECT
 
 public:
-    explicit DiagramsViewManager(QObject *parent = 0);
+    explicit DiagramsViewManager(QObject *parent = nullptr);
     ~DiagramsViewManager() = default;
 
 signals:
diff --git a/src/plugins/modeleditor/dragtool.h b/src/plugins/modeleditor/dragtool.h
index 5764f97ec6d..844b8189c2b 100644
--- a/src/plugins/modeleditor/dragtool.h
+++ b/src/plugins/modeleditor/dragtool.h
@@ -39,7 +39,7 @@ class DragTool :
 
 public:
     DragTool(const QIcon &icon, const QString &title, const QString &newElementId,
-             const QString &stereotype, QWidget *parent = 0);
+             const QString &stereotype, QWidget *parent = nullptr);
     ~DragTool();
 
     QSize sizeHint() const override;
diff --git a/src/plugins/modeleditor/editordiagramview.cpp b/src/plugins/modeleditor/editordiagramview.cpp
index 09621c2335c..9a42e05364b 100644
--- a/src/plugins/modeleditor/editordiagramview.cpp
+++ b/src/plugins/modeleditor/editordiagramview.cpp
@@ -40,7 +40,7 @@ namespace Internal {
 
 class EditorDiagramView::EditorDiagramViewPrivate {
 public:
-    PxNodeController *pxNodeController = 0;
+    PxNodeController *pxNodeController = nullptr;
 };
 
 EditorDiagramView::EditorDiagramView(QWidget *parent)
diff --git a/src/plugins/modeleditor/editordiagramview.h b/src/plugins/modeleditor/editordiagramview.h
index 0a90af01617..984445d68f0 100644
--- a/src/plugins/modeleditor/editordiagramview.h
+++ b/src/plugins/modeleditor/editordiagramview.h
@@ -39,7 +39,7 @@ class EditorDiagramView :
     class EditorDiagramViewPrivate;
 
 public:
-    explicit EditorDiagramView(QWidget *parent = 0);
+    explicit EditorDiagramView(QWidget *parent = nullptr);
     ~EditorDiagramView() override;
 
 signals:
diff --git a/src/plugins/modeleditor/elementtasks.cpp b/src/plugins/modeleditor/elementtasks.cpp
index 6e1b327348b..3ace1bec41c 100644
--- a/src/plugins/modeleditor/elementtasks.cpp
+++ b/src/plugins/modeleditor/elementtasks.cpp
@@ -59,8 +59,8 @@ namespace Internal {
 
 class ElementTasks::ElementTasksPrivate {
 public:
-    qmt::DocumentController *documentController = 0;
-    ComponentViewController *componentViewController = 0;
+    qmt::DocumentController *documentController = nullptr;
+    ComponentViewController *componentViewController = nullptr;
 };
 
 ElementTasks::ElementTasks(QObject *parent)
@@ -274,7 +274,7 @@ bool ElementTasks::hasDiagram(const qmt::MElement *element) const
     qmt::FindDiagramVisitor visitor;
     element->accept(&visitor);
     const qmt::MDiagram *diagram = visitor.diagram();
-    return diagram != 0;
+    return diagram != nullptr;
 }
 
 bool ElementTasks::hasDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) const
@@ -373,7 +373,7 @@ void ElementTasks::openParentDiagram(const qmt::DElement *element, const qmt::ME
 
 bool ElementTasks::mayCreateDiagram(const qmt::MElement *element) const
 {
-    return dynamic_cast<const qmt::MPackage *>(element) != 0;
+    return dynamic_cast<const qmt::MPackage *>(element) != nullptr;
 }
 
 bool ElementTasks::mayCreateDiagram(const qmt::DElement *element,
diff --git a/src/plugins/modeleditor/elementtasks.h b/src/plugins/modeleditor/elementtasks.h
index fa2fc53cdc6..458c31e54bd 100644
--- a/src/plugins/modeleditor/elementtasks.h
+++ b/src/plugins/modeleditor/elementtasks.h
@@ -43,7 +43,7 @@ class ElementTasks :
     class ElementTasksPrivate;
 
 public:
-    ElementTasks(QObject *parent = 0);
+    ElementTasks(QObject *parent = nullptr);
     ~ElementTasks();
 
     void setDocumentController(qmt::DocumentController *documentController);
diff --git a/src/plugins/modeleditor/extdocumentcontroller.cpp b/src/plugins/modeleditor/extdocumentcontroller.cpp
index 72e960461bf..e9c125215d5 100644
--- a/src/plugins/modeleditor/extdocumentcontroller.cpp
+++ b/src/plugins/modeleditor/extdocumentcontroller.cpp
@@ -38,8 +38,8 @@ namespace Internal {
 
 class ExtDocumentController::ExtDocumentControllerPrivate {
 public:
-    ElementTasks *elementTasks = 0;
-    PxNodeController *pxNodeController = 0;
+    ElementTasks *elementTasks = nullptr;
+    PxNodeController *pxNodeController = nullptr;
 };
 
 ExtDocumentController::ExtDocumentController(QObject *parent)
diff --git a/src/plugins/modeleditor/extdocumentcontroller.h b/src/plugins/modeleditor/extdocumentcontroller.h
index 667403b82e0..44a3fc716a6 100644
--- a/src/plugins/modeleditor/extdocumentcontroller.h
+++ b/src/plugins/modeleditor/extdocumentcontroller.h
@@ -40,7 +40,7 @@ class ExtDocumentController :
     class ExtDocumentControllerPrivate;
 
 public:
-    explicit ExtDocumentController(QObject *parent = 0);
+    explicit ExtDocumentController(QObject *parent = nullptr);
     ~ExtDocumentController();
 
     ElementTasks *elementTasks() const;
diff --git a/src/plugins/modeleditor/extpropertiesmview.cpp b/src/plugins/modeleditor/extpropertiesmview.cpp
index 529f251dca2..a0c19b71418 100644
--- a/src/plugins/modeleditor/extpropertiesmview.cpp
+++ b/src/plugins/modeleditor/extpropertiesmview.cpp
@@ -57,7 +57,7 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
     qmt::PropertiesView::MView::visitMPackage(package);
     if (m_modelElements.size() == 1 && !package->owner()) {
         qmt::Project *project = m_projectController->project();
-        if (m_configPath == 0) {
+        if (!m_configPath) {
             m_configPath = new Utils::PathChooser(m_topWidget);
             m_configPath->setPromptDialogTitle(tr("Select Custom Configuration Folder"));
             m_configPath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
@@ -78,7 +78,7 @@ void ExtPropertiesMView::visitMPackage(const qmt::MPackage *package)
                 m_configPath->setPath(QFileInfo(projectDir, project->configPath()).canonicalFilePath());
             }
         }
-        if (m_configPathInfo == 0) {
+        if (!m_configPathInfo) {
             m_configPathInfo = new QLabel(m_topWidget);
             addRow(QString(), m_configPathInfo, "configpathinfo");
         }
diff --git a/src/plugins/modeleditor/extpropertiesmview.h b/src/plugins/modeleditor/extpropertiesmview.h
index 673fcd9d396..f9f2564ce2e 100644
--- a/src/plugins/modeleditor/extpropertiesmview.h
+++ b/src/plugins/modeleditor/extpropertiesmview.h
@@ -49,9 +49,9 @@ private:
     void onConfigPathChanged(const QString &path);
 
 private:
-    qmt::ProjectController *m_projectController = 0;
-    Utils::PathChooser *m_configPath = 0;
-    QLabel *m_configPathInfo = 0;
+    qmt::ProjectController *m_projectController = nullptr;
+    Utils::PathChooser *m_configPath = nullptr;
+    QLabel *m_configPathInfo = nullptr;
 };
 
 } // namespace Interal
diff --git a/src/plugins/modeleditor/jsextension.h b/src/plugins/modeleditor/jsextension.h
index be2479fd683..74c7cbc892c 100644
--- a/src/plugins/modeleditor/jsextension.h
+++ b/src/plugins/modeleditor/jsextension.h
@@ -35,7 +35,7 @@ class JsExtension : public QObject
     Q_OBJECT
 
 public:
-    JsExtension(QObject *parent = 0) : QObject(parent) { }
+    JsExtension(QObject *parent = nullptr) : QObject(parent) { }
 
     Q_INVOKABLE QString fileNameToElementName(const QString &file);
     Q_INVOKABLE QString elementNameToFileName(const QString &element);
diff --git a/src/plugins/modeleditor/modeldocument.cpp b/src/plugins/modeleditor/modeldocument.cpp
index e75ff0760e1..eef5ce60dcc 100644
--- a/src/plugins/modeleditor/modeldocument.cpp
+++ b/src/plugins/modeleditor/modeldocument.cpp
@@ -48,7 +48,7 @@ namespace Internal {
 
 class ModelDocument::ModelDocumentPrivate {
 public:
-    ExtDocumentController *documentController = 0;
+    ExtDocumentController *documentController = nullptr;
 };
 
 ModelDocument::ModelDocument(QObject *parent)
diff --git a/src/plugins/modeleditor/modeldocument.h b/src/plugins/modeleditor/modeldocument.h
index f83085866ab..5f7a99cd56c 100644
--- a/src/plugins/modeleditor/modeldocument.h
+++ b/src/plugins/modeleditor/modeldocument.h
@@ -41,7 +41,7 @@ class ModelDocument :
     class ModelDocumentPrivate;
 
 public:
-    explicit ModelDocument(QObject *parent = 0);
+    explicit ModelDocument(QObject *parent = nullptr);
     ~ModelDocument();
 
 signals:
diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp
index ddba2804ea9..9602c72c153 100644
--- a/src/plugins/modeleditor/modeleditor.cpp
+++ b/src/plugins/modeleditor/modeleditor.cpp
@@ -107,30 +107,30 @@ static const double ZOOM_FACTOR = 1.05;
 class ModelEditor::ModelEditorPrivate
 {
 public:
-    UiController *uiController = 0;
-    ActionHandler *actionHandler = 0;
-    ModelDocument *document = 0;
-    qmt::PropertiesView *propertiesView = 0;
-    Core::MiniSplitter *rightSplitter = 0;
-    QWidget *leftGroup = 0;
-    QHBoxLayout *leftGroupLayout = 0;
-    QToolBox *leftToolBox = 0;
-    QStackedWidget *diagramStack = 0;
-    EditorDiagramView *diagramView = 0;
-    QLabel *noDiagramLabel = 0;
-    DiagramsViewManager *diagramsViewManager = 0;
-    Core::MiniSplitter *rightHorizSplitter = 0;
-    qmt::ModelTreeView *modelTreeView = 0;
-    qmt::TreeModelManager *modelTreeViewServant = 0;
-    QScrollArea *propertiesScrollArea = 0;
-    QWidget *propertiesGroupWidget = 0;
-    QWidget *toolbar = 0;
-    QComboBox *diagramSelector = 0;
+    UiController *uiController = nullptr;
+    ActionHandler *actionHandler = nullptr;
+    ModelDocument *document = nullptr;
+    qmt::PropertiesView *propertiesView = nullptr;
+    Core::MiniSplitter *rightSplitter = nullptr;
+    QWidget *leftGroup = nullptr;
+    QHBoxLayout *leftGroupLayout = nullptr;
+    QToolBox *leftToolBox = nullptr;
+    QStackedWidget *diagramStack = nullptr;
+    EditorDiagramView *diagramView = nullptr;
+    QLabel *noDiagramLabel = nullptr;
+    DiagramsViewManager *diagramsViewManager = nullptr;
+    Core::MiniSplitter *rightHorizSplitter = nullptr;
+    qmt::ModelTreeView *modelTreeView = nullptr;
+    qmt::TreeModelManager *modelTreeViewServant = nullptr;
+    QScrollArea *propertiesScrollArea = nullptr;
+    QWidget *propertiesGroupWidget = nullptr;
+    QWidget *toolbar = nullptr;
+    QComboBox *diagramSelector = nullptr;
     SelectedArea selectedArea = SelectedArea::Nothing;
     QString lastExportDirPath;
-    QAction *syncBrowserWithDiagramAction = 0;
-    QAction *syncDiagramWithBrowserAction = 0;
-    QAction *syncEachOtherAction = 0;
+    QAction *syncBrowserWithDiagramAction = nullptr;
+    QAction *syncDiagramWithBrowserAction = nullptr;
+    QAction *syncEachOtherAction = nullptr;
 };
 
 ModelEditor::ModelEditor(UiController *uiController, ActionHandler *actionHandler, QWidget *parent)
@@ -622,7 +622,7 @@ void ModelEditor::resetZoom()
 
 qmt::MPackage *ModelEditor::guessSelectedPackage() const
 {
-    qmt::MPackage *package = 0;
+    qmt::MPackage *package = nullptr;
     switch (d->selectedArea) {
     case SelectedArea::Nothing:
         package = d->modelTreeViewServant->selectedPackage();
@@ -661,13 +661,13 @@ void ModelEditor::updateSelectedArea(SelectedArea selectedArea)
     bool canExportDiagram = false;
     QList<qmt::MElement *> propertiesModelElements;
     QList<qmt::DElement *> propertiesDiagramElements;
-    qmt::MDiagram *propertiesDiagram = 0;
+    qmt::MDiagram *propertiesDiagram = nullptr;
 
     qmt::MDiagram *activeDiagram = currentDiagram();
     switch (d->selectedArea) {
     case SelectedArea::Nothing:
         canSelectAll = activeDiagram && !activeDiagram->diagramElements().isEmpty();
-        canExportDiagram = activeDiagram != 0;
+        canExportDiagram = activeDiagram != nullptr;
         break;
     case SelectedArea::Diagram:
     {
@@ -696,7 +696,7 @@ void ModelEditor::updateSelectedArea(SelectedArea selectedArea)
     }
     case SelectedArea::TreeView:
     {
-        canExportDiagram = activeDiagram != 0;
+        canExportDiagram = activeDiagram != nullptr;
         bool hasSelection = !d->modelTreeViewServant->selectedObjects().isEmpty();
         bool hasSingleSelection = d->modelTreeViewServant->selectedObjects().indices().size() == 1;
         canCutCopyDelete = hasSelection && !d->modelTreeViewServant->isRootPackageSelected();
@@ -769,7 +769,7 @@ void ModelEditor::clearProperties()
         Q_UNUSED(scrollWidget); // avoid warning in release mode
         QMT_CHECK(scrollWidget == d->propertiesGroupWidget);
         d->propertiesGroupWidget->deleteLater();
-        d->propertiesGroupWidget = 0;
+        d->propertiesGroupWidget = nullptr;
     }
 }
 
@@ -1003,7 +1003,7 @@ void ModelEditor::initToolbars()
                      [=](const qmt::Toolbar &lhs, const qmt::Toolbar &rhs) { return lhs.priority() > rhs.priority(); });
     foreach (const qmt::Toolbar &toolbar, toolbars) {
         QWidget *toolBar = toolBars.value(toolbar.id());
-        QLayout *toolBarLayout = 0;
+        QLayout *toolBarLayout = nullptr;
         if (!toolBar) {
             toolBar = new QWidget(d->leftToolBox);
             toolBar->setProperty(PROPERTYNAME_TOOLBARID, toolbar.id());
diff --git a/src/plugins/modeleditor/modeleditor.h b/src/plugins/modeleditor/modeleditor.h
index 7c51751a90c..2d4aaa26d70 100644
--- a/src/plugins/modeleditor/modeleditor.h
+++ b/src/plugins/modeleditor/modeleditor.h
@@ -65,7 +65,7 @@ class ModelEditor :
 
 public:
     explicit ModelEditor(UiController *uiController, ActionHandler *actionHandler,
-                         QWidget *parent = 0);
+                         QWidget *parent = nullptr);
     ~ModelEditor();
 
     Core::IDocument *document() override;
diff --git a/src/plugins/modeleditor/modeleditor_plugin.cpp b/src/plugins/modeleditor/modeleditor_plugin.cpp
index 756809f9078..acaa8f24dce 100644
--- a/src/plugins/modeleditor/modeleditor_plugin.cpp
+++ b/src/plugins/modeleditor/modeleditor_plugin.cpp
@@ -57,15 +57,15 @@
 namespace ModelEditor {
 namespace Internal {
 
-ModelEditorPlugin *pluginInstance = 0;
+ModelEditorPlugin *pluginInstance = nullptr;
 
 class ModelEditorPlugin::ModelEditorPluginPrivate
 {
 public:
-    ModelsManager *modelsManager = 0;
-    UiController *uiController = 0;
-    ModelEditorFactory *modelFactory = 0;
-    SettingsController *settingsController = 0;
+    ModelsManager *modelsManager = nullptr;
+    UiController *uiController = nullptr;
+    ModelEditorFactory *modelFactory = nullptr;
+    SettingsController *settingsController = nullptr;
 };
 
 ModelEditorPlugin::ModelEditorPlugin()
diff --git a/src/plugins/modeleditor/modeleditorfactory.cpp b/src/plugins/modeleditor/modeleditorfactory.cpp
index ab6bf6746ea..da20bd8679c 100644
--- a/src/plugins/modeleditor/modeleditorfactory.cpp
+++ b/src/plugins/modeleditor/modeleditorfactory.cpp
@@ -37,8 +37,8 @@ namespace Internal {
 class ModelEditorFactory::ModelEditorFactoryPrivate
 {
 public:
-    UiController *uiController = 0;
-    ActionHandler *actionHandler = 0;
+    UiController *uiController = nullptr;
+    ActionHandler *actionHandler = nullptr;
 };
 
 ModelEditorFactory::ModelEditorFactory(UiController *uiController, QObject *parent)
diff --git a/src/plugins/modeleditor/modeleditorfactory.h b/src/plugins/modeleditor/modeleditorfactory.h
index 972a1ae44e6..ca06f7da408 100644
--- a/src/plugins/modeleditor/modeleditorfactory.h
+++ b/src/plugins/modeleditor/modeleditorfactory.h
@@ -40,7 +40,7 @@ class ModelEditorFactory :
     class ModelEditorFactoryPrivate;
 
 public:
-    explicit ModelEditorFactory(UiController *uiController, QObject *parent = 0);
+    explicit ModelEditorFactory(UiController *uiController, QObject *parent = nullptr);
     ~ModelEditorFactory();
 
     Core::IEditor *createEditor() override;
diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp
index 4afbfacb341..476edaae262 100644
--- a/src/plugins/modeleditor/modelindexer.cpp
+++ b/src/plugins/modeleditor/modelindexer.cpp
@@ -89,7 +89,7 @@ public:
 
 private:
     QString m_file;
-    ProjectExplorer::Project *m_project = 0;
+    ProjectExplorer::Project *m_project = nullptr;
     QDateTime m_lastModified;
 };
 
@@ -255,7 +255,7 @@ public:
     QHash<QString, ModelIndexer::IndexedDiagramReference *> indexedDiagramReferences;
     QHash<qmt::Uid, QSet<ModelIndexer::IndexedDiagramReference *> > indexedDiagramReferencesByDiagramUid;
 
-    ModelIndexer::IndexerThread *indexerThread = 0;
+    ModelIndexer::IndexerThread *indexerThread = nullptr;
 };
 
 void ModelIndexer::IndexerThread::onQuitIndexerThread()
@@ -377,7 +377,7 @@ void ModelIndexer::onProjectAdded(ProjectExplorer::Project *project)
 
 void ModelIndexer::onAboutToRemoveProject(ProjectExplorer::Project *project)
 {
-    disconnect(project, &ProjectExplorer::Project::fileListChanged, this, 0);
+    disconnect(project, &ProjectExplorer::Project::fileListChanged, this, nullptr);
     forgetProject(project);
 }
 
diff --git a/src/plugins/modeleditor/modelindexer.h b/src/plugins/modeleditor/modelindexer.h
index d392f386ea1..da925977b6a 100644
--- a/src/plugins/modeleditor/modelindexer.h
+++ b/src/plugins/modeleditor/modelindexer.h
@@ -53,7 +53,7 @@ class ModelIndexer :
                            const ModelIndexer::QueuedFile &rhs);
 
 public:
-    ModelIndexer(QObject *parent = 0);
+    ModelIndexer(QObject *parent = nullptr);
     ~ModelIndexer();
 
 signals:
diff --git a/src/plugins/modeleditor/modelsmanager.cpp b/src/plugins/modeleditor/modelsmanager.cpp
index b49c9ff2305..89d691ddc6e 100644
--- a/src/plugins/modeleditor/modelsmanager.cpp
+++ b/src/plugins/modeleditor/modelsmanager.cpp
@@ -69,8 +69,8 @@ public:
     ManagedModel() = default;
     ManagedModel(ExtDocumentController *m_documentController,ModelDocument *m_modelDocument);
 
-    ExtDocumentController *m_documentController = 0;
-    ModelDocument *m_modelDocument = 0;
+    ExtDocumentController *m_documentController = nullptr;
+    ModelDocument *m_modelDocument = nullptr;
 };
 
 ModelsManager::ManagedModel::ManagedModel(ExtDocumentController *documentController,
@@ -88,11 +88,11 @@ public:
     }
 
     QList<ModelsManager::ManagedModel> managedModels;
-    ModelIndexer *modelIndexer = 0;
+    ModelIndexer *modelIndexer = nullptr;
     QList<Core::IDocument *> documentsToBeClosed;
 
-    QAction *openDiagramContextMenuItem = 0;
-    ProjectExplorer::Node *contextMenuOwnerNode = 0;
+    QAction *openDiagramContextMenuItem = nullptr;
+    ProjectExplorer::Node *contextMenuOwnerNode = nullptr;
 };
 
 ModelsManager::ModelsManager(QObject *parent)
@@ -182,14 +182,14 @@ void ModelsManager::onAboutToShowContextMenu(ProjectExplorer::Project *project,
     if (canOpenDiagram)
         d->contextMenuOwnerNode = node;
     else
-        d->contextMenuOwnerNode = 0;
+        d->contextMenuOwnerNode = nullptr;
     d->openDiagramContextMenuItem->setVisible(canOpenDiagram);
 }
 
 void ModelsManager::onOpenDiagramFromProjectExplorer()
 {
     if (ProjectExplorer::ProjectTree::findCurrentNode() == d->contextMenuOwnerNode) {
-        qmt::MDiagram *diagram = 0;
+        qmt::MDiagram *diagram = nullptr;
         foreach (const ManagedModel &managedModel, d->managedModels) {
             if ((diagram = managedModel.m_documentController->pxNodeController()->findDiagramForExplorerNode(d->contextMenuOwnerNode))) {
                 openDiagram(managedModel.m_documentController, diagram);
diff --git a/src/plugins/modeleditor/modelsmanager.h b/src/plugins/modeleditor/modelsmanager.h
index 743a0f3a578..09b1e290551 100644
--- a/src/plugins/modeleditor/modelsmanager.h
+++ b/src/plugins/modeleditor/modelsmanager.h
@@ -53,7 +53,7 @@ class ModelsManager :
     class ModelsManagerPrivate;
 
 public:
-    explicit ModelsManager(QObject *parent = 0);
+    explicit ModelsManager(QObject *parent = nullptr);
     ~ModelsManager();
 
     ExtDocumentController *createModel(ModelDocument *modelDocument);
diff --git a/src/plugins/modeleditor/openelementvisitor.h b/src/plugins/modeleditor/openelementvisitor.h
index 5c07e07c317..de13828b890 100644
--- a/src/plugins/modeleditor/openelementvisitor.h
+++ b/src/plugins/modeleditor/openelementvisitor.h
@@ -59,8 +59,8 @@ public:
     void visitDSwimlane(const qmt::DSwimlane *swimlane) override;
 
 private:
-    qmt::ModelController *m_modelController = 0;
-    ElementTasks *m_elementTasks = 0;
+    qmt::ModelController *m_modelController = nullptr;
+    ElementTasks *m_elementTasks = nullptr;
 };
 
 class OpenModelElementVisitor :
@@ -84,7 +84,7 @@ public:
     void visitMConnection(const qmt::MConnection *connection) override;
 
 private:
-    ElementTasks *m_elementTasks = 0;
+    ElementTasks *m_elementTasks = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/modeleditor/pxnodecontroller.cpp b/src/plugins/modeleditor/pxnodecontroller.cpp
index 652c0d86843..61e2f36541b 100644
--- a/src/plugins/modeleditor/pxnodecontroller.cpp
+++ b/src/plugins/modeleditor/pxnodecontroller.cpp
@@ -91,10 +91,10 @@ public:
 class PxNodeController::PxNodeControllerPrivate
 {
 public:
-    PxNodeUtilities *pxnodeUtilities = 0;
-    ComponentViewController *componentViewController = 0;
-    ClassViewController *classViewController = 0;
-    qmt::DiagramSceneController *diagramSceneController = 0;
+    PxNodeUtilities *pxnodeUtilities = nullptr;
+    ComponentViewController *componentViewController = nullptr;
+    ClassViewController *classViewController = nullptr;
+    qmt::DiagramSceneController *diagramSceneController = nullptr;
     QString anchorFolder;
 };
 
@@ -208,7 +208,7 @@ void PxNodeController::addExplorerNode(const ProjectExplorer::Node *node,
 
 bool PxNodeController::hasDiagramForExplorerNode(const ProjectExplorer::Node *node)
 {
-    return findDiagramForExplorerNode(node) != 0;
+    return findDiagramForExplorerNode(node) != nullptr;
 }
 
 qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplorer::Node *node)
@@ -252,7 +252,7 @@ qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplore
         }
 
         if (found) {
-            QMT_ASSERT(relativeIndex >= relativeElements.size(), return 0);
+            QMT_ASSERT(relativeIndex >= relativeElements.size(), return nullptr);
             // complete package chain found so check for appropriate diagram within deepest package
             qmt::MDiagram *diagram = d->diagramSceneController->findDiagramBySearchId(
                         package, package->name());
@@ -269,7 +269,7 @@ qmt::MDiagram *PxNodeController::findDiagramForExplorerNode(const ProjectExplore
     }
 
     // complete sub-package structure scanned but did not found the desired object
-    return 0;
+    return nullptr;
 }
 
 void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *action,
@@ -277,8 +277,8 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
                                              qmt::DElement *topMostElementAtPos,
                                              const QPointF &pos, qmt::MDiagram *diagram)
 {
-    qmt::MObject *newObject = 0;
-    qmt::MDiagram *newDiagramInObject = 0;
+    qmt::MObject *newObject = nullptr;
+    qmt::MDiagram *newDiagramInObject = nullptr;
 
     switch (action->type) {
     case MenuAction::TYPE_ADD_COMPONENT:
@@ -348,13 +348,13 @@ void PxNodeController::onMenuActionTriggered(PxNodeController::MenuAction *actio
 
     if (newObject) {
         d->diagramSceneController->modelController()->undoController()->beginMergeSequence(tr("Drop Node"));
-        qmt::MObject *parentForDiagram = 0;
+        qmt::MObject *parentForDiagram = nullptr;
         QStringList relativeElements = qmt::NameController::buildElementsPath(
                     d->pxnodeUtilities->calcRelativePath(node, d->anchorFolder),
-                    dynamic_cast<qmt::MPackage *>(newObject) != 0);
+                    dynamic_cast<qmt::MPackage *>(newObject) != nullptr);
         if (qmt::MObject *existingObject = d->pxnodeUtilities->findSameObject(relativeElements, newObject)) {
             delete newObject;
-            newObject = 0;
+            newObject = nullptr;
             d->diagramSceneController->addExistingModelElement(existingObject->uid(), pos, diagram);
             parentForDiagram = existingObject;
         } else {
diff --git a/src/plugins/modeleditor/pxnodecontroller.h b/src/plugins/modeleditor/pxnodecontroller.h
index 7eee19e66af..7f5d570a9ba 100644
--- a/src/plugins/modeleditor/pxnodecontroller.h
+++ b/src/plugins/modeleditor/pxnodecontroller.h
@@ -49,7 +49,7 @@ class PxNodeController :
     class MenuAction;
 
 public:
-    explicit PxNodeController(QObject *parent = 0);
+    explicit PxNodeController(QObject *parent = nullptr);
     ~PxNodeController();
 
     ComponentViewController *componentViewController() const;
diff --git a/src/plugins/modeleditor/pxnodeutilities.cpp b/src/plugins/modeleditor/pxnodeutilities.cpp
index 035d0ae7be1..34f830fb417 100644
--- a/src/plugins/modeleditor/pxnodeutilities.cpp
+++ b/src/plugins/modeleditor/pxnodeutilities.cpp
@@ -44,7 +44,7 @@ namespace Internal {
 
 class PxNodeUtilities::PxNodeUtilitiesPrivate {
 public:
-    qmt::DiagramSceneController *diagramSceneController = 0;
+    qmt::DiagramSceneController *diagramSceneController = nullptr;
 };
 
 PxNodeUtilities::PxNodeUtilities(QObject *parent)
@@ -100,7 +100,7 @@ qmt::MPackage *PxNodeUtilities::createBestMatchingPackagePath(
 
     int maxChainLength = -1;
     int minChainDepth = -1;
-    qmt::MPackage *bestParentPackage = 0;
+    qmt::MPackage *bestParentPackage = nullptr;
 
     while (!roots.isEmpty()) {
         qmt::MPackage *package = roots.first().first;
@@ -231,7 +231,7 @@ qmt::MObject *PxNodeUtilities::findSameObject(const QStringList &relativeElement
     }
 
     // complete sub-package structure scanned but did not found the desired object
-    return 0;
+    return nullptr;
 }
 
 } // namespace Internal
diff --git a/src/plugins/modeleditor/pxnodeutilities.h b/src/plugins/modeleditor/pxnodeutilities.h
index 1aea2f1b9ad..fd620de63e9 100644
--- a/src/plugins/modeleditor/pxnodeutilities.h
+++ b/src/plugins/modeleditor/pxnodeutilities.h
@@ -45,7 +45,7 @@ class PxNodeUtilities :
     class PxNodeUtilitiesPrivate;
 
 public:
-    explicit PxNodeUtilities(QObject *parent = 0);
+    explicit PxNodeUtilities(QObject *parent = nullptr);
     ~PxNodeUtilities();
 
     void setDiagramSceneController(qmt::DiagramSceneController *diagramSceneController);
diff --git a/src/plugins/modeleditor/settingscontroller.h b/src/plugins/modeleditor/settingscontroller.h
index 9400cd6282d..90371b66a76 100644
--- a/src/plugins/modeleditor/settingscontroller.h
+++ b/src/plugins/modeleditor/settingscontroller.h
@@ -40,7 +40,7 @@ class SettingsController :
     Q_OBJECT
 
 public:
-    explicit SettingsController(QObject *parent = 0);
+    explicit SettingsController(QObject *parent = nullptr);
 
 signals:
     void resetSettings();
diff --git a/src/plugins/modeleditor/uicontroller.h b/src/plugins/modeleditor/uicontroller.h
index c31f630bca7..9dacf6d0690 100644
--- a/src/plugins/modeleditor/uicontroller.h
+++ b/src/plugins/modeleditor/uicontroller.h
@@ -41,7 +41,7 @@ class UiController :
     class UiControllerPrivate;
 
 public:
-    explicit UiController(QObject *parent = 0);
+    explicit UiController(QObject *parent = nullptr);
     ~UiController();
 
 signals: