Further refactoring in QtModeling (initial step)

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

2 files changed, 28 insertions, 28 deletions

diff --git a/examples/uml/duse-mt/mainwindow.cpp b/examples/uml/duse-mt/mainwindow.cpp
index 60527174..16c2582c 100644
--- a/examples/uml/duse-mt/mainwindow.cpp
+++ b/examples/uml/duse-mt/mainwindow.cpp
@@ -113,7 +113,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(ui->modelingObjectView, &QModelingObjectView::modelingObjectChanged,
             modelingObjectPropertyModel, &QModelingObjectPropertyModel::setModelingObject);
     //connect(ui->modelingObjectView, &QModelingObjectView::addToView, this, &MainWindow::addToView);
-    connect(ui->modelingObjectView, SIGNAL(modelingObjectChanged(QModelingObject*)), SLOT(modelingObjectChanged(QModelingObject*)));
+    connect(ui->modelingObjectView, SIGNAL(modelingObjectChanged(QModelingElement*)), SLOT(modelingObjectChanged(QModelingElement*)));
     connect(modelingObjectPropertyModel, &QModelingObjectPropertyModel::indexChanged,
             _modelingObjectModel, &QModelingObjectModel::updateIndex);
 
@@ -220,7 +220,7 @@ void MainWindow::on_actionFileNewModel_triggered()
 //    }
 }
 
-void MainWindow::saveXmi(QModelingObject *rootElement)
+void MainWindow::saveXmi(QModelingElement *rootElement)
 {
     QFile file(_currentFileName);
     if (!file.open(QFile::WriteOnly | QFile::Text)) {
@@ -239,18 +239,18 @@ void MainWindow::saveXmi(QModelingObject *rootElement)
     setCursor(Qt::ArrowCursor);
 }
 
-QList<QModelingObject *> MainWindow::loadXmi(QString fileName)
+QList<QModelingElement *> MainWindow::loadXmi(QString fileName)
 {
     QFile file(fileName);
     if (!file.open(QFile::ReadOnly | QFile::Text)) {
         QMessageBox::critical(this, tr("Open"), tr("Cannot read file !"));
-        return QList<QModelingObject *>();
+        return QList<QModelingElement *>();
     }
 
     QXmiReader reader(&_engine, true);
     if (fileName.contains("duse-mt"))
         setWindowTitle(QFileInfo(file).fileName() + " - DuSE-MT");
-    QList<QModelingObject *> modelingObjectList = reader.readFile(&file);
+    QList<QModelingElement *> modelingObjectList = reader.readFile(&file);
 
     ui->txeIssues->setModel(new QStringListModel(reader.errorStrings()));
     setModelInspector(modelingObjectList);
@@ -258,13 +258,13 @@ QList<QModelingObject *> MainWindow::loadXmi(QString fileName)
     return modelingObjectList;
 }
 
-void MainWindow::setModelInspector(QList<QModelingObject *> modelingObjectList)
+void MainWindow::setModelInspector(QList<QModelingElement *> modelingObjectList)
 {
     if (!modelingObjectList.isEmpty()) {
         _engine.globalObject().setProperty(modelingObjectList.at(0)->asQObject()->objectName(), _engine.newQObject(modelingObjectList.at(0)->asQObject()));
 
         QScriptValue array = _engine.newArray();
-        foreach (QModelingObject *modelingObject, modelingObjectList)
+        foreach (QModelingElement *modelingObject, modelingObjectList)
             array.property(QString::fromLatin1("push")).call(array, QScriptValueList() << _engine.newQObject(modelingObject->asQObject()));
         _engine.globalObject().setProperty("input", array);
 
@@ -272,7 +272,7 @@ void MainWindow::setModelInspector(QList<QModelingObject *> modelingObjectList)
         QTimer::singleShot(0, this, SLOT(on_psbJSEvaluate_clicked()));
     }
     _modelingObjectModel->clear();
-    foreach (QModelingObject *object, modelingObjectList)
+    foreach (QModelingElement *object, modelingObjectList)
         _modelingObjectModel->addModelingObject(object->asQObject());
 }
 
@@ -309,7 +309,7 @@ void MainWindow::on_actionFileNewDuseDesign_triggered()
                     return;
                 }
                 QXmiReader reader(&_engine, true);
-                QList<QModelingObject *> modelingObjectList = reader.readFile(&file);
+                QList<QModelingElement *> modelingObjectList = reader.readFile(&file);
                 if (QString::fromLatin1(modelingObjectList.first()->asQObject()->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);
@@ -375,7 +375,7 @@ void MainWindow::evaluateQualityMetrics()
                           designspace.qualityMetrics[j].value = Math.random()*60+eval(designspace.qualityMetrics[j].expression)");
 }
 
-void MainWindow::populateDesignSpaceView(QModelingObject *modelingObject)
+void MainWindow::populateDesignSpaceView(QModelingElement *modelingObject)
 {
 //    QDuseDesignSpace *designSpace = qobject_cast<QDuseDesignSpace *>(modelingObject);
 //    ui->tblDesignSpace->setRowCount(0);
@@ -508,12 +508,12 @@ void MainWindow::metaModelChanged(QString newMetaModel)
     _newModel->lstTopLevelContainers->setCurrentRow(0);
 }
 
-void MainWindow::modelingObjectChanged(QModelingObject *modelingObject)
+void MainWindow::modelingObjectChanged(QModelingElement *modelingObject)
 {
     _engine.globalObject().setProperty("self", _engine.newQObject(modelingObject->asQObject()));
 }
 
-void MainWindow::addToView(QModelingObject *modelingObject, QQuickItem *parent)
+void MainWindow::addToView(QModelingElement *modelingObject, QQuickItem *parent)
 {
     QQmlContext *context = new QQmlContext(_modelQuickView->engine()->rootContext());
     //modelingObject->setQmlContextProperties(context);
@@ -533,12 +533,12 @@ void MainWindow::addToView(QModelingObject *modelingObject, QQuickItem *parent)
     }
 
     foreach (QObject *child, modelingObject->asQObject()->children())
-        addToView(dynamic_cast<QModelingObject *>(qModelingObject(child)));
+        addToView(dynamic_cast<QModelingElement *>(qModelingObject(child)));
 
     _qmlComponent->deleteLater();
 }
 
-void MainWindow::addToDesignSpaceView(QModelingObject *modelingObject, QQuickItem *parent)
+void MainWindow::addToDesignSpaceView(QModelingElement *modelingObject, QQuickItem *parent)
 {
     QQmlContext *context = new QQmlContext(_designSpaceQuickView->engine()->rootContext());
     //modelingObject->setQmlContextProperties(context);
@@ -558,12 +558,12 @@ void MainWindow::addToDesignSpaceView(QModelingObject *modelingObject, QQuickIte
     }
 
     foreach (QObject *child, modelingObject->asQObject()->children())
-        addToDesignSpaceView(dynamic_cast<QModelingObject *>(qModelingObject(child)));
+        addToDesignSpaceView(dynamic_cast<QModelingElement *>(qModelingObject(child)));
 
     _qmlComponent->deleteLater();
 }
 
-void MainWindow::addToPareto(QModelingObject *modelingObject, int pos)
+void MainWindow::addToPareto(QModelingElement *modelingObject, int pos)
 {
     QQmlContext *context = _paretoFrontQuickView->engine()->rootContext();
     //modelingObject->setQmlContextProperties(context);
@@ -583,7 +583,7 @@ void MainWindow::addToPareto(QModelingObject *modelingObject, int pos)
     }
 
     foreach (QObject *child, modelingObject->asQObject()->children())
-        addToPareto(dynamic_cast<QModelingObject *>(qModelingObject(child)), pos);
+        addToPareto(dynamic_cast<QModelingElement *>(qModelingObject(child)), pos);
 
     _qmlComponent->deleteLater();
 }
diff --git a/examples/uml/duse-mt/mainwindow.h b/examples/uml/duse-mt/mainwindow.h
index ab76c3c5..c565a53e 100644
--- a/examples/uml/duse-mt/mainwindow.h
+++ b/examples/uml/duse-mt/mainwindow.h
@@ -61,7 +61,7 @@ namespace Ui {
     class NewModel;
 }
 
-class QModelingObject;
+class QModelingElement;
 class QMetaModelPlugin;
 class QModelingObjectModel;
 class QProgressDialog;
@@ -93,13 +93,13 @@ private Q_SLOTS:
     void on_centralWidget_currentChanged(int);
     void on_btnOptimize_clicked();
     void evaluateQualityMetrics();
-    void setModelInspector(QList<QModelingObject *> modelingObjectList);
+    void setModelInspector(QList<QModelingElement *> modelingObjectList);
 
     void metaModelChanged(QString newMetaModel);
-    void modelingObjectChanged(QModelingObject *modelingObject);
-    void addToView(QModelingObject *modelingObject, QQuickItem *parent = 0);
-    void addToDesignSpaceView(QModelingObject *modelingObject, QQuickItem *parent = 0);
-    void addToPareto(QModelingObject *modelingObject, int pos);
+    void modelingObjectChanged(QModelingElement *modelingObject);
+    void addToView(QModelingElement *modelingObject, QQuickItem *parent = 0);
+    void addToDesignSpaceView(QModelingElement *modelingObject, QQuickItem *parent = 0);
+    void addToPareto(QModelingElement *modelingObject, int pos);
 
     void dckMetricsVisibilityChanged(bool visible);
     void designSpaceChanged();
@@ -109,14 +109,14 @@ protected:
 
 private:
     void loadPlugins();
-    void saveXmi(QModelingObject *rootElement);
-    QList<QModelingObject *> loadXmi(QString fileName = 0);
-    void populateDesignSpaceView(QModelingObject *modelingObject);
+    void saveXmi(QModelingElement *rootElement);
+    QList<QModelingElement *> loadXmi(QString fileName = 0);
+    void populateDesignSpaceView(QModelingElement *modelingObject);
 
     Ui::MainWindow *ui;
     QModelingObjectModel *_modelingObjectModel;
-    QList<QModelingObject *> _inputModel;
-    QList<QModelingObject *> _designSpaceLocation;
+    QList<QModelingElement *> _inputModel;
+    QList<QModelingElement *> _designSpaceLocation;
 
     QString _currentFileName;
     QHash< QString, QPair<QMetaModelPlugin *, QJsonObject> > _loadedPlugins;