Move further design space functionality from core to plugin

Change-Id: I011d6174063a479122a920eb27ba52a54623e65a
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

13 files changed, 189 insertions, 153 deletions

diff --git a/examples/uml/duse-mt/src/app/app.pro b/examples/uml/duse-mt/src/app/app.pro
index dcaffe5b..2f2cad37 100644
--- a/examples/uml/duse-mt/src/app/app.pro
+++ b/examples/uml/duse-mt/src/app/app.pro
@@ -18,7 +18,6 @@ include(../rpath.pri)
 LIBS *= -lduseinterfaces
 
 SOURCES += main.cpp \
-    newdusedesign.cpp \
     shell/core.cpp \
     shell/uicontroller.cpp \
     shell/projectcontroller.cpp \
@@ -26,7 +25,6 @@ SOURCES += main.cpp \
     shell/mainwindow.cpp
 
 HEADERS  += \
-    newdusedesign.h \
     shell/core.h \
     shell/uicontroller.h \
     shell/projectcontroller.h \
@@ -36,8 +34,7 @@ HEADERS  += \
 FORMS    += mainwindow.ui \
             aboutplugins.ui \
     newmodel.ui \
-    aboutdusemt.ui \
-    newdusedesign.ui
+    aboutdusemt.ui
 
 RESOURCES += \
     duse-mt.qrc
diff --git a/examples/uml/duse-mt/src/app/mainwindow.ui b/examples/uml/duse-mt/src/app/mainwindow.ui
index 185f60c2..5806ba2f 100644
--- a/examples/uml/duse-mt/src/app/mainwindow.ui
+++ b/examples/uml/duse-mt/src/app/mainwindow.ui
@@ -73,9 +73,6 @@
     <addaction name="actionFileNewModel"/>
     <addaction name="actionFileOpenModel"/>
     <addaction name="separator"/>
-    <addaction name="actionFileNewDuseDesign"/>
-    <addaction name="actionFileOpenDuseDesign"/>
-    <addaction name="separator"/>
     <addaction name="actionFileSave"/>
     <addaction name="actionFileSaveAs"/>
     <addaction name="separator"/>
@@ -187,32 +184,6 @@
     <string>About DuSE-MT</string>
    </property>
   </action>
-  <action name="actionFileNewDuseDesign">
-   <property name="icon">
-    <iconset theme="document-new">
-     <normaloff/>
-    </iconset>
-   </property>
-   <property name="text">
-    <string>New &amp;DuSE Design ...</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+D</string>
-   </property>
-  </action>
-  <action name="actionFileOpenDuseDesign">
-   <property name="icon">
-    <iconset theme="document-open">
-     <normaloff/>
-    </iconset>
-   </property>
-   <property name="text">
-    <string>Open DuSE Design ...</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+U</string>
-   </property>
-  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
diff --git a/examples/uml/duse-mt/src/app/shell/mainwindow.cpp b/examples/uml/duse-mt/src/app/shell/mainwindow.cpp
index fac1a56c..fc480935 100644
--- a/examples/uml/duse-mt/src/app/shell/mainwindow.cpp
+++ b/examples/uml/duse-mt/src/app/shell/mainwindow.cpp
@@ -79,8 +79,6 @@
 #include <interfaces/iplugincontroller.h>
 #include <interfaces/iprojectcontroller.h>
 
-#include "newdusedesign.h"
-
 namespace DuSE
 {
 
@@ -92,8 +90,7 @@ MainWindow::MainWindow(QWidget *parent) :
     _aboutDuSEMTDialog(new QDialog(this)),
     _aboutDuSEMT(new Ui::AboutDuSEMT),
     _newModelDialog(new QDialog(this)),
-    _newModel(new Ui::NewModel),
-    _newDuseDesign(new NewDuseDesign(this))
+    _newModel(new Ui::NewModel)
 {
     ui->setupUi(this);
 
@@ -163,80 +160,6 @@ void MainWindow::on_actionFileOpenModel_triggered()
     }
 }
 
-void MainWindow::on_actionFileNewDuseDesign_triggered()
-{
-    do {
-        if (_newDuseDesign->exec() == QDialog::Accepted) {
-            if (_newDuseDesign->_inputModelFileName.isEmpty() || _newDuseDesign->_duseInstanceModelFileName.isEmpty()) {
-                QMessageBox::critical(this, tr("Create new DuSE design"), tr("You should select an input model and a DuSE instance model !"));
-            }
-            else {
-                setCursor(Qt::WaitCursor);
-
-                QFile file(_newDuseDesign->_duseInstanceModelFileName);
-                if (!file.open(QFile::ReadOnly | QFile::Text)) {
-                    QMessageBox::critical(this, tr("Create new DuSE design"), tr("Cannot read DuSE instance file !"));
-                    setCursor(Qt::ArrowCursor);
-                    return;
-                }
-                QXmiReader reader;
-                QList<QModelingElement *> modelingObjectList = reader.readFile(&file);
-                if (QString::fromLatin1(modelingObjectList.first()->asQModelingObject()->metaObject()->className()) != QString::fromLatin1("QDuseDesignSpace")) {
-                    QMessageBox::critical(this, tr("Create new DuSE design"), QString::fromLatin1("%1 is not a valid DuSE instance !").arg(QFileInfo(file).fileName()));
-                    setCursor(Qt::ArrowCursor);
-                    return;
-                }
-
-//                _currentFileName = _newDuseDesign->_inputModelFileName;
-//                foreach (QWrappedObject *object, _inputModel)
-//                    delete object;
-//                _inputModel = loadXmi(_currentFileName);
-
-                addToView(_inputModel[0]);
-
-//                QScriptValue value = _engine.evaluate("function checkProfile() \
-//                                                       { \
-//                                                           var length = input[0].profileApplications.length; \
-//                                                           for (var i = 0; i < length; ++i) \
-//                                                               if (input[0].profileApplications[0].appliedProfile.name == '" + modelingObjectList.first()->asQModelingObject()->objectName() + "Profile') \
-//                                                                   return true; \
-//                                                           return false; \
-//                                                       } \
-//                                                       checkProfile();");
-//                if (!value.toBool()) {
-//                    QMessageBox::critical(this, tr("Create new DuSE design"), QString::fromLatin1("Input model does not contain the required %1Profile profile application !").arg(modelingObjectList.first()->asQModelingObject()->objectName()));
-//                    setCursor(Qt::ArrowCursor);
-//                    return;
-//                }
-
-                //modelingObjectList.first()->setQmlContextProperties(_metricsQuickView->engine()->rootContext());
-
-//                _engine.globalObject().setProperty("designspace", _engine.newQObject(modelingObjectList.at(0)->asQModelingObject()));
-//                _engine.evaluate("var dimensionsLength = designspace.designDimensions.length; \
-//                                 for (var dimensionCounter = 0; dimensionCounter < dimensionsLength; ++dimensionCounter) { \
-//                                     if (designspace.designDimensions[dimensionCounter].instanceSelectionRule) { \
-//                                         var selected = eval(designspace.designDimensions[dimensionCounter].instanceSelectionRule); \
-//                                         var selectedLength = selected.length; \
-//                                         for (var selectedCounter = 0; selectedCounter < selectedLength; ++selectedCounter) { \
-//                                             var dimensionInstance = new QDuseDesignDimensionInstance(); \
-//                                             dimensionInstance.objectName = selected[selectedCounter].name; \
-//                                             designspace.designDimensions[dimensionCounter].addDesignDimensionInstance(dimensionInstance); \
-//                                         } \
-//                                     } \
-//                                 }");
-
-
-                evaluateQualityMetrics();
-                populateDesignSpaceView(modelingObjectList.at(0));
-
-                setCursor(Qt::ArrowCursor);
-            }
-        }
-        else
-            return;
-    } while (_newDuseDesign->_inputModelFileName.isEmpty() || _newDuseDesign->_duseInstanceModelFileName.isEmpty());
-}
-
 void MainWindow::evaluateQualityMetrics()
 {
 //    _engine.evaluate("var m = designspace.qualityMetrics.length; \
@@ -267,10 +190,6 @@ void MainWindow::populateDesignSpaceView(QModelingElement *modelingObject)
 //    ui->tblDesignSpace->resizeRowsToContents();
 }
 
-void MainWindow::on_actionFileOpenDuseDesign_triggered()
-{
-}
-
 void MainWindow::on_actionFileSaveAs_triggered()
 {
     QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), QDir::currentPath(), "XMI files (*.xmi)");
diff --git a/examples/uml/duse-mt/src/app/shell/mainwindow.h b/examples/uml/duse-mt/src/app/shell/mainwindow.h
index 9a536035..98b39fad 100644
--- a/examples/uml/duse-mt/src/app/shell/mainwindow.h
+++ b/examples/uml/duse-mt/src/app/shell/mainwindow.h
@@ -43,14 +43,6 @@
 
 #include <QtWidgets/QMainWindow>
 
-#include <QtCore/QPair>
-#include <QtCore/QJsonObject>
-
-#include <QtScript/QScriptEngine>
-
-class QDialog;
-class QListView;
-class QQuickView;
 class QQuickItem;
 class QQmlComponent;
 class QTreeWidgetItem;
@@ -63,12 +55,12 @@ namespace Ui {
 }
 
 class QModelingElement;
-class QModelingObject;
+//class QModelingObject;
 class QMetaModelPlugin;
 class QModelingObjectModel;
 class QProgressDialog;
 
-class NewDuseDesign;
+class NewDuseDesignDialog;
 
 namespace DuSE
 {
@@ -81,18 +73,18 @@ class MainWindow : public QMainWindow
 
 public:
     explicit MainWindow(QWidget *parent = 0);
-    ~MainWindow();
+    virtual ~MainWindow();
 
-    void closeEvent(QCloseEvent *event);
     void readSettings();
     void populatePluginDialog();
 
+protected:
+    void closeEvent(QCloseEvent *event);
+
 private Q_SLOTS:
     void update();
     void on_actionFileNewModel_triggered();
     void on_actionFileOpenModel_triggered();
-    void on_actionFileNewDuseDesign_triggered();
-    void on_actionFileOpenDuseDesign_triggered();
     void on_actionFileSaveAs_triggered();
     void on_actionFileSave_triggered();
     void on_actionHelpAboutPlugins_triggered();
@@ -122,7 +114,7 @@ private:
     Ui::AboutDuSEMT *_aboutDuSEMT;
     QDialog *_newModelDialog;
     Ui::NewModel *_newModel;
-    NewDuseDesign *_newDuseDesign;
+    NewDuseDesignDialog *_newDuseDesign;
 
     QQmlComponent *_qmlComponent;
 
diff --git a/examples/uml/duse-mt/src/app/shell/uicontroller.cpp b/examples/uml/duse-mt/src/app/shell/uicontroller.cpp
index 85fa5ec4..86975d05 100644
--- a/examples/uml/duse-mt/src/app/shell/uicontroller.cpp
+++ b/examples/uml/duse-mt/src/app/shell/uicontroller.cpp
@@ -105,4 +105,14 @@ void UiController::removeCentralWidgetTab(const QString &name)
         }
 }
 
+void UiController::addAction(QAction *action, const QString &menuTitle, const QString &toolbarName)
+{
+    foreach (QMenu *menu, _mainWindow.ui->menuBar->findChildren<QMenu *>())
+        if (menu->objectName() == menuTitle)
+            menu->addAction(action);
+    foreach (QToolBar *toolbar, _mainWindow.findChildren<QToolBar *>())
+        if (toolbar->objectName() == toolbarName)
+            toolbar->addAction(action);
+}
+
 }
diff --git a/examples/uml/duse-mt/src/app/shell/uicontroller.h b/examples/uml/duse-mt/src/app/shell/uicontroller.h
index e549a3ab..3fc12efe 100644
--- a/examples/uml/duse-mt/src/app/shell/uicontroller.h
+++ b/examples/uml/duse-mt/src/app/shell/uicontroller.h
@@ -62,6 +62,8 @@ public:
     virtual void addCentralWidgetTab(QWidget *widget, const QString &label, const QIcon &icon = QIcon());
     virtual void removeCentralWidgetTab(const QString &name);
 
+    virtual void addAction(QAction *action, const QString &menuTitle, const QString &toolbarName = QString());
+
 protected:
     MainWindow _mainWindow;
     QDockWidget *_lastBottomDockWidgetAdded;
diff --git a/examples/uml/duse-mt/src/libs/interfaces/iuicontroller.h b/examples/uml/duse-mt/src/libs/interfaces/iuicontroller.h
index 7d1ca396..124e0ee7 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/iuicontroller.h
+++ b/examples/uml/duse-mt/src/libs/interfaces/iuicontroller.h
@@ -49,7 +49,9 @@
 
 class QModelingObject;
 
+class QAction;
 class QWidget;
+class QMainWindow;
 
 namespace DuSE
 {
@@ -69,6 +71,8 @@ public:
     virtual void addCentralWidgetTab(QWidget *widget, const QString &label, const QIcon &icon = QIcon()) = 0;
     virtual void removeCentralWidgetTab(const QString &name) = 0;
 
+    virtual void addAction(QAction *action, const QString &menuTitle, const QString &toolbarName = QString()) = 0;
+
 Q_SIGNALS:
     void currentModelingObjectChanged(QModelingObject *currentModelingObject);
     void updateCurrentModelingObject();
diff --git a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorer.pro b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorer.pro
index c75d760f..2f25d194 100644
--- a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorer.pro
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorer.pro
@@ -4,11 +4,17 @@
 #
 #-------------------------------------------------
 
+QT += widgets
+
 include(../../duse-mt-plugin.pri)
 
-SOURCES += designspaceexplorerplugin.cpp
+SOURCES += designspaceexplorerplugin.cpp \
+           newdusedesigndialog.cpp
+
+HEADERS += designspaceexplorerplugin.h \
+           newdusedesigndialog.h
 
-HEADERS += designspaceexplorerplugin.h
+FORMS += newdusedesigndialog.ui
 
 RESOURCES += qml/designspaceexplorer.qrc
 
diff --git a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp
index b16c8ed1..2a3bb396 100644
--- a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp
@@ -44,16 +44,32 @@
 
 #include <QtQuick/QQuickView>
 
+#include <QtWidgets/QAction>
 #include <QtWidgets/QWidget>
 #include <QtWidgets/QHeaderView>
 #include <QtWidgets/QTableWidget>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
+
+#include <QtCore/QFileInfo>
+
+#include <QtModeling/QXmiReader>
+#include <QtModeling/QModelingElement>
+
+#include "newdusedesigndialog.h"
 
 DesignSpaceExplorerPlugin::DesignSpaceExplorerPlugin(QObject *parent) :
     DuSE::IPlugin(parent),
     _currentDesignSpaceLocationQuickView(new QQuickView),
     _metricsQuickView(new QQuickView),
-    _designSpaceExplorer(new QTableWidget)
+    _designSpaceExplorer(new QTableWidget),
+    _newDuseDesignDialog(new NewDuseDesignDialog)
+{
+}
+
+DesignSpaceExplorerPlugin::~DesignSpaceExplorerPlugin()
 {
+    delete _newDuseDesignDialog;
 }
 
 bool DesignSpaceExplorerPlugin::initialize(DuSE::ICore *core)
@@ -81,6 +97,116 @@ bool DesignSpaceExplorerPlugin::initialize(DuSE::ICore *core)
 
     core->uiController()->addDockWidget(Qt::RightDockWidgetArea, "Design Space Explorer", _designSpaceExplorer);
 
+    QString iconThemeName;
+
+    QAction *_actionFileNewDuseDesign = new QAction(0);
+    _actionFileNewDuseDesign->setText(QApplication::translate("MainWindow", "New &DuSE Design ...", 0));
+    _actionFileNewDuseDesign->setShortcut(QApplication::translate("MainWindow", "Ctrl+D", 0));
+    _actionFileNewDuseDesign->setObjectName(QStringLiteral("actionFileNewDuseDesign"));
+    QIcon icon8;
+    iconThemeName = QStringLiteral("document-new");
+    if (QIcon::hasThemeIcon(iconThemeName)) {
+        icon8 = QIcon::fromTheme(iconThemeName);
+    } else {
+        icon8.addFile(QStringLiteral(""), QSize(), QIcon::Normal, QIcon::Off);
+    }
+    _actionFileNewDuseDesign->setIcon(icon8);
+    connect(_actionFileNewDuseDesign, &QAction::triggered, this, &DesignSpaceExplorerPlugin::newDuseDesign);
+    core->uiController()->addAction(_actionFileNewDuseDesign, "menu_File");
+
+    QAction *_actionFileOpenDuseDesign = new QAction(0);
+    _actionFileOpenDuseDesign->setText(QApplication::translate("MainWindow", "Open DuSE Design ...", 0));
+    _actionFileOpenDuseDesign->setShortcut(QApplication::translate("MainWindow", "Ctrl+U", 0));
+    _actionFileOpenDuseDesign->setObjectName(QStringLiteral("actionFileOpenDuseDesign"));
+    QIcon icon9;
+    iconThemeName = QStringLiteral("document-open");
+    if (QIcon::hasThemeIcon(iconThemeName)) {
+        icon9 = QIcon::fromTheme(iconThemeName);
+    } else {
+        icon9.addFile(QStringLiteral(""), QSize(), QIcon::Normal, QIcon::Off);
+    }
+    _actionFileOpenDuseDesign->setIcon(icon9);
+    connect(_actionFileOpenDuseDesign, &QAction::triggered, this, &DesignSpaceExplorerPlugin::openDuseDesign);
+    core->uiController()->addAction(_actionFileOpenDuseDesign, "menu_File");
+
     return true;
 }
 
+void DesignSpaceExplorerPlugin::newDuseDesign()
+{
+    do {
+        if (_newDuseDesignDialog->exec() == QDialog::Accepted) {
+            if (_newDuseDesignDialog->_inputModelFileName.isEmpty() || _newDuseDesignDialog->_duseInstanceModelFileName.isEmpty()) {
+                QMessageBox::critical(0, tr("Create new DuSE design"), tr("You should select an input model and a DuSE instance model !"));
+            }
+            else {
+//                setCursor(Qt::WaitCursor);
+
+                QFile file(_newDuseDesignDialog->_duseInstanceModelFileName);
+                if (!file.open(QFile::ReadOnly | QFile::Text)) {
+                    QMessageBox::critical(0, tr("Create new DuSE design"), tr("Cannot read DuSE instance file !"));
+//                    setCursor(Qt::ArrowCursor);
+                    return;
+                }
+                QXmiReader reader;
+                QList<QModelingElement *> modelingObjectList = reader.readFile(&file);
+                if (QString::fromLatin1(modelingObjectList.first()->asQModelingObject()->metaObject()->className()) != QString::fromLatin1("QDuseDesignSpace")) {
+                    QMessageBox::critical(0, tr("Create new DuSE design"), QString::fromLatin1("%1 is not a valid DuSE instance !").arg(QFileInfo(file).fileName()));
+//                    setCursor(Qt::ArrowCursor);
+                    return;
+                }
+
+//                _currentFileName = _newDuseDesign->_inputModelFileName;
+//                foreach (QWrappedObject *object, _inputModel)
+//                    delete object;
+//                _inputModel = loadXmi(_currentFileName);
+
+//                addToView(_inputModel[0]);
+
+//                QScriptValue value = _engine.evaluate("function checkProfile() \
+//                                                       { \
+//                                                           var length = input[0].profileApplications.length; \
+//                                                           for (var i = 0; i < length; ++i) \
+//                                                               if (input[0].profileApplications[0].appliedProfile.name == '" + modelingObjectList.first()->asQModelingObject()->objectName() + "Profile') \
+//                                                                   return true; \
+//                                                           return false; \
+//                                                       } \
+//                                                       checkProfile();");
+//                if (!value.toBool()) {
+//                    QMessageBox::critical(this, tr("Create new DuSE design"), QString::fromLatin1("Input model does not contain the required %1Profile profile application !").arg(modelingObjectList.first()->asQModelingObject()->objectName()));
+//                    setCursor(Qt::ArrowCursor);
+//                    return;
+//                }
+
+                //modelingObjectList.first()->setQmlContextProperties(_metricsQuickView->engine()->rootContext());
+
+//                _engine.globalObject().setProperty("designspace", _engine.newQObject(modelingObjectList.at(0)->asQModelingObject()));
+//                _engine.evaluate("var dimensionsLength = designspace.designDimensions.length; \
+//                                 for (var dimensionCounter = 0; dimensionCounter < dimensionsLength; ++dimensionCounter) { \
+//                                     if (designspace.designDimensions[dimensionCounter].instanceSelectionRule) { \
+//                                         var selected = eval(designspace.designDimensions[dimensionCounter].instanceSelectionRule); \
+//                                         var selectedLength = selected.length; \
+//                                         for (var selectedCounter = 0; selectedCounter < selectedLength; ++selectedCounter) { \
+//                                             var dimensionInstance = new QDuseDesignDimensionInstance(); \
+//                                             dimensionInstance.objectName = selected[selectedCounter].name; \
+//                                             designspace.designDimensions[dimensionCounter].addDesignDimensionInstance(dimensionInstance); \
+//                                         } \
+//                                     } \
+//                                 }");
+
+
+//                evaluateQualityMetrics();
+//                populateDesignSpaceView(modelingObjectList.at(0));
+
+//                setCursor(Qt::ArrowCursor);
+            }
+        }
+        else
+            return;
+    } while (_newDuseDesignDialog->_inputModelFileName.isEmpty() || _newDuseDesignDialog->_duseInstanceModelFileName.isEmpty());
+}
+
+void DesignSpaceExplorerPlugin::openDuseDesign()
+{
+}
+
diff --git a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h
index c42eb18b..950edc54 100644
--- a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h
@@ -43,6 +43,8 @@
 
 #include <interfaces/iplugin.h>
 
+class NewDuseDesignDialog;
+
 class QQuickView;
 class QTableWidget;
 
@@ -53,13 +55,20 @@ class DesignSpaceExplorerPlugin : public DuSE::IPlugin
 
 public:
     DesignSpaceExplorerPlugin(QObject *parent = 0);
+    virtual ~DesignSpaceExplorerPlugin();
 
     virtual bool initialize(DuSE::ICore *core);
 
+private Q_SLOTS:
+    void newDuseDesign();
+    void openDuseDesign();
+
 private:
     QQuickView *_currentDesignSpaceLocationQuickView;
     QQuickView *_metricsQuickView;
     QTableWidget *_designSpaceExplorer;
+
+    NewDuseDesignDialog *_newDuseDesignDialog;
 };
 
 #endif // DESIGNSPACEEXPLORERPLUGIN_H
diff --git a/examples/uml/duse-mt/src/app/newdusedesign.cpp b/examples/uml/duse-mt/src/plugins/designspaceexplorer/newdusedesigndialog.cpp
index d84ecf51..81eb11e3 100644
--- a/examples/uml/duse-mt/src/app/newdusedesign.cpp
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/newdusedesigndialog.cpp
@@ -38,30 +38,30 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "newdusedesign.h"
-#include "ui_newdusedesign.h"
+#include "newdusedesigndialog.h"
+#include "ui_newdusedesigndialog.h"
 
 #include <QtWidgets/QFileDialog>
 
-NewDuseDesign::NewDuseDesign(QWidget *parent) :
+NewDuseDesignDialog::NewDuseDesignDialog(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::NewDuseDesign)
+    ui(new Ui::NewDuseDesignDialog)
 {
     ui->setupUi(this);
 }
 
-NewDuseDesign::~NewDuseDesign()
+NewDuseDesignDialog::~NewDuseDesignDialog()
 {
     delete ui;
 }
 
-void NewDuseDesign::on_tbtInputModel_clicked()
+void NewDuseDesignDialog::on_tbtInputModel_clicked()
 {
     _inputModelFileName = QFileDialog::getOpenFileName(this, tr("Open input model"), QDir::currentPath(), "XMI files (*.xmi)");
     ui->lneInputModel->setText(_inputModelFileName);
 }
 
-void NewDuseDesign::on_tbtDuseInstanceModel_clicked()
+void NewDuseDesignDialog::on_tbtDuseInstanceModel_clicked()
 {
     _duseInstanceModelFileName = QFileDialog::getOpenFileName(this, tr("Open DuSE instance model"), QDir::currentPath(), "XMI files (*.xmi)");
     ui->lneDuseInstanceModel->setText(_duseInstanceModelFileName);
diff --git a/examples/uml/duse-mt/src/app/newdusedesign.h b/examples/uml/duse-mt/src/plugins/designspaceexplorer/newdusedesigndialog.h
index 13e4419c..4a63f8aa 100644
--- a/examples/uml/duse-mt/src/app/newdusedesign.h
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/newdusedesigndialog.h
@@ -38,22 +38,22 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef NEWDUSEDESIGN_H
-#define NEWDUSEDESIGN_H
+#ifndef NEWDUSEDESIGNDIALOG_H
+#define NEWDUSEDESIGNDIALOG_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 namespace Ui {
-class NewDuseDesign;
+class NewDuseDesignDialog;
 }
 
-class NewDuseDesign : public QDialog
+class NewDuseDesignDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit NewDuseDesign(QWidget *parent = 0);
-    ~NewDuseDesign();
+    explicit NewDuseDesignDialog(QWidget *parent = 0);
+    ~NewDuseDesignDialog();
 
     QString _inputModelFileName;
     QString _duseInstanceModelFileName;
@@ -62,7 +62,7 @@ private Q_SLOTS:
     void on_tbtDuseInstanceModel_clicked();
 
 private:
-    Ui::NewDuseDesign *ui;
+    Ui::NewDuseDesignDialog *ui;
 };
 
-#endif // NEWDUSEDESIGN_H
+#endif // NEWDUSEDESIGNDIALOG_H
diff --git a/examples/uml/duse-mt/src/app/newdusedesign.ui b/examples/uml/duse-mt/src/plugins/designspaceexplorer/newdusedesigndialog.ui
index ac56f47d..a2b3de08 100644
--- a/examples/uml/duse-mt/src/app/newdusedesign.ui
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/newdusedesigndialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>NewDuseDesign</class>
- <widget class="QDialog" name="NewDuseDesign">
+ <class>NewDuseDesignDialog</class>
+ <widget class="QDialog" name="NewDuseDesignDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -69,7 +69,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>NewDuseDesign</receiver>
+   <receiver>NewDuseDesignDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -85,7 +85,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>NewDuseDesign</receiver>
+   <receiver>NewDuseDesignDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">