8 files changed, 49 insertions, 25 deletions
diff --git a/src/plugins/modeleditor/CMakeLists.txt b/src/plugins/modeleditor/CMakeLists.txt
new file mode 100644
index 0000000000..69ff243b5c
--- /dev/null
+++ b/src/plugins/modeleditor/CMakeLists.txt
@@ -0,0 +1,36 @@
+add_qtc_plugin(ModelEditor
+  DEFINES MODELEDITOR_LIBRARY
+  DEPENDS Modeling Qt5::Core Qt5::Gui Qt5::Widgets
+  PLUGIN_DEPENDS Core CppTools ProjectExplorer
+  SOURCES
+    actionhandler.cpp actionhandler.h
+    classviewcontroller.cpp classviewcontroller.h
+    componentviewcontroller.cpp componentviewcontroller.h
+    diagramsviewmanager.cpp diagramsviewmanager.h
+    dragtool.cpp dragtool.h
+    editordiagramview.cpp editordiagramview.h
+    elementtasks.cpp elementtasks.h
+    extdocumentcontroller.cpp extdocumentcontroller.h
+    extpropertiesmview.cpp extpropertiesmview.h
+    jsextension.cpp jsextension.h
+    modeldocument.cpp modeldocument.h
+    modeleditor.cpp modeleditor.h
+    modeleditor_constants.h
+    modeleditor_global.h
+    modeleditor_plugin.cpp modeleditor_plugin.h
+    modeleditorfactory.cpp modeleditorfactory.h
+    modelindexer.cpp modelindexer.h
+    modelsmanager.cpp modelsmanager.h
+    modelutilities.cpp modelutilities.h
+    openelementvisitor.cpp openelementvisitor.h
+    packageviewcontroller.cpp packageviewcontroller.h
+    pxnodecontroller.cpp pxnodecontroller.h
+    pxnodeutilities.cpp pxnodeutilities.h
+    resources/modeleditor.qrc
+    settingscontroller.cpp settingscontroller.h
+    uicontroller.cpp uicontroller.h
+  EXPLICIT_MOC
+    actionhandler.h
+    modeleditor.h
+    modeleditorfactory.h
+)
diff --git a/src/plugins/modeleditor/jsextension.h b/src/plugins/modeleditor/jsextension.h
index 74c7cbc892..6192636e3b 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 = nullptr) : QObject(parent) { }
+    JsExtension() {}
 
     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 e47c0d1a97..875a8bc5c3 100644
--- a/src/plugins/modeleditor/modeldocument.cpp
+++ b/src/plugins/modeleditor/modeldocument.cpp
@@ -96,7 +96,7 @@ bool ModelDocument::save(QString *errorString, const QString &name, bool autoSav
     if (autoSave) {
         d->documentController->projectController()->setModified();
     } else {
-        setFilePath(Utils::FileName::fromString(d->documentController->projectController()->project()->fileName()));
+        setFilePath(Utils::FilePath::fromString(d->documentController->projectController()->project()->fileName()));
         emit changed();
     }
 
@@ -152,7 +152,7 @@ Core::IDocument::OpenResult ModelDocument::load(QString *errorString, const QStr
 
     try {
         d->documentController->loadProject(fileName);
-        setFilePath(Utils::FileName::fromString(d->documentController->projectController()->project()->fileName()));
+        setFilePath(Utils::FilePath::fromString(d->documentController->projectController()->project()->fileName()));
     } catch (const qmt::FileNotFoundException &ex) {
         *errorString = ex.errorMessage();
         return OpenResult::ReadError;
diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp
index 56c03ba9a1..67ee3a6294 100644
--- a/src/plugins/modeleditor/modeleditor.cpp
+++ b/src/plugins/modeleditor/modeleditor.cpp
@@ -321,7 +321,7 @@ void ModelEditor::init(QWidget *parent)
     toolbarLayout->addWidget(openParentButton);
 
     d->diagramSelector = new QComboBox(d->toolbar);
-    connect(d->diagramSelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(d->diagramSelector, QOverload<int>::of(&QComboBox::activated),
             this, &ModelEditor::onDiagramSelectorSelected);
     toolbarLayout->addWidget(d->diagramSelector, 1);
     toolbarLayout->addStretch(1);
diff --git a/src/plugins/modeleditor/modeleditor_plugin.cpp b/src/plugins/modeleditor/modeleditor_plugin.cpp
index 7571703cbb..8e08854f4d 100644
--- a/src/plugins/modeleditor/modeleditor_plugin.cpp
+++ b/src/plugins/modeleditor/modeleditor_plugin.cpp
@@ -92,7 +92,7 @@ bool ModelEditorPlugin::initialize(const QStringList &arguments, QString *errorS
     d->modelFactory = new ModelEditorFactory(d->uiController, this);
     d->settingsController = new SettingsController(this);
 
-    Core::JsExpander::registerQObjectForJs(QLatin1String("Modeling"), new JsExtension(this));
+    Core::JsExpander::registerGlobalObject<JsExtension>("Modeling");
 
     connect(d->settingsController, &SettingsController::saveSettings,
             d->uiController, &UiController::saveSettings);
diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp
index 3fa1703ea9..e03fb4eb03 100644
--- a/src/plugins/modeleditor/modelindexer.cpp
+++ b/src/plugins/modeleditor/modelindexer.cpp
@@ -392,11 +392,11 @@ void ModelIndexer::scanProject(ProjectExplorer::Project *project)
         return;
 
     // TODO harmonize following code with findFirstModel()?
-    const Utils::FileNameList files = project->files(ProjectExplorer::Project::SourceFiles);
+    const Utils::FilePathList files = project->files(ProjectExplorer::Project::SourceFiles);
     QQueue<QueuedFile> filesQueue;
     QSet<QueuedFile> filesSet;
 
-    for (const Utils::FileName &file : files) {
+    for (const Utils::FilePath &file : files) {
         QFileInfo fileInfo = file.toFileInfo();
         Utils::MimeType mimeType = Utils::mimeTypeForFile(fileInfo);
         if (mimeType.name() == QLatin1String(Constants::MIME_TYPE_MODEL)) {
@@ -474,10 +474,10 @@ QString ModelIndexer::findFirstModel(ProjectExplorer::FolderNode *folderNode)
 
 void ModelIndexer::forgetProject(ProjectExplorer::Project *project)
 {
-    const Utils::FileNameList files = project->files(ProjectExplorer::Project::SourceFiles);
+    const Utils::FilePathList files = project->files(ProjectExplorer::Project::SourceFiles);
 
     QMutexLocker locker(&d->indexerMutex);
-    for (const Utils::FileName &file : files) {
+    for (const Utils::FilePath &file : files) {
         const QString fileString = file.toString();
         // remove file from queue
         QueuedFile queuedFile(fileString, project);
diff --git a/src/plugins/modeleditor/modelsmanager.cpp b/src/plugins/modeleditor/modelsmanager.cpp
index 683006817d..768d65b2b3 100644
--- a/src/plugins/modeleditor/modelsmanager.cpp
+++ b/src/plugins/modeleditor/modelsmanager.cpp
@@ -250,7 +250,7 @@ void ModelsManager::onAboutToShowContextMenu(ProjectExplorer::Project *project,
 
 void ModelsManager::onOpenDiagramFromProjectExplorer()
 {
-    if (ProjectExplorer::ProjectTree::findCurrentNode() == d->contextMenuOwnerNode) {
+    if (ProjectExplorer::ProjectTree::currentNode() == d->contextMenuOwnerNode) {
         qmt::MDiagram *diagram = nullptr;
         foreach (const ManagedModel &managedModel, d->managedModels) {
             if ((diagram = managedModel.m_documentController->pxNodeController()->findDiagramForExplorerNode(d->contextMenuOwnerNode))) {
diff --git a/src/plugins/modeleditor/pxnodeutilities.cpp b/src/plugins/modeleditor/pxnodeutilities.cpp
index 7e6c986a50..cfd071aac7 100644
--- a/src/plugins/modeleditor/pxnodeutilities.cpp
+++ b/src/plugins/modeleditor/pxnodeutilities.cpp
@@ -66,21 +66,9 @@ void PxNodeUtilities::setDiagramSceneController(qmt::DiagramSceneController *dia
 QString PxNodeUtilities::calcRelativePath(const ProjectExplorer::Node *node,
                                           const QString &anchorFolder)
 {
-    QString nodePath;
-
-    switch (node->nodeType()) {
-    case ProjectExplorer::NodeType::File:
-    {
-        QFileInfo fileInfo = node->filePath().toFileInfo();
-        nodePath = fileInfo.path();
-        break;
-    }
-    case ProjectExplorer::NodeType::Folder:
-    case ProjectExplorer::NodeType::VirtualFolder:
-    case ProjectExplorer::NodeType::Project:
-        nodePath = node->filePath().toString();
-        break;
-    }
+    const QString nodePath = node->asFileNode()
+            ? node->filePath().toFileInfo().path()
+            : node->filePath().toString();
 
     return qmt::NameController::calcRelativePath(nodePath, anchorFolder);
 }