From 228f38d2592dcce72274018a4ae9a745dc0f8005 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Sun, 15 Nov 2020 02:29:16 +0100
Subject: Rename files

---
 mobile/CMakeLists.txt     |  2 +-
 mobile/maincontroler.cpp  | 35 -----------------------------------
 mobile/maincontroler.h    | 29 -----------------------------
 mobile/maincontroller.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++
 mobile/maincontroller.h   | 29 +++++++++++++++++++++++++++++
 5 files changed, 74 insertions(+), 65 deletions(-)
 delete mode 100644 mobile/maincontroler.cpp
 delete mode 100644 mobile/maincontroler.h
 create mode 100644 mobile/maincontroller.cpp
 create mode 100644 mobile/maincontroller.h

diff --git a/mobile/CMakeLists.txt b/mobile/CMakeLists.txt
index 8d7a364..95153cc 100644
--- a/mobile/CMakeLists.txt
+++ b/mobile/CMakeLists.txt
@@ -95,7 +95,7 @@ SET( diceGui_sources
    ../node/variablenode.cpp
    ../node/bind.cpp
     main.cpp
-    maincontroler.cpp
+    maincontroller.cpp
     commandmodel.cpp
     ../highlightdice.cpp
 )
diff --git a/mobile/maincontroler.cpp b/mobile/maincontroler.cpp
deleted file mode 100644
index a23ca31..0000000
--- a/mobile/maincontroler.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "maincontroler.h"
-
-#include <QDebug>
-#include <QQmlContext>
-
-MainControler::MainControler(QObject* parent) : QObject(parent)
-{
-    m_model= new CommandModel();
-    m_model->insertCmd("L5R", "8D10e10k4");
-
-    m_diceParser= new DiceParser();
-}
-void MainControler::initEngine(QQmlApplicationEngine* engine)
-{
-    m_engine= engine;
-    engine->rootContext()->setContextProperty("_model", m_model);
-    connect(m_engine, SIGNAL(objectCreated(QObject*, QUrl)), this, SLOT(setConnections(QObject*, QUrl)));
-}
-void MainControler::rollDice(QString cmd)
-{
-    if(m_diceParser->parseLine(cmd))
-    {
-        m_diceParser->start();
-        for(int i= 0; i < m_diceParser->getStartNodeCount(); ++i)
-        {
-            // qDebug() << m_diceParser->getSumOfDiceResult(i);
-        }
-    }
-}
-void MainControler::setConnections(QObject* root, QUrl url)
-{
-    // QObject* root = engine->rootContext()->contextObject();
-    connect(root, SIGNAL(roll(QString)), this, SLOT(rollDice(QString)));
-    connect(root, SIGNAL(addRoll(QString, QString)), m_model, SLOT(insertCmd(QString, QString)));
-}
diff --git a/mobile/maincontroler.h b/mobile/maincontroler.h
deleted file mode 100644
index fb806b0..0000000
--- a/mobile/maincontroler.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef MAINCONTROLER_H
-#define MAINCONTROLER_H
-
-#include <QObject>
-#include <QQmlApplicationEngine>
-
-#include "commandmodel.h"
-#include "diceparser.h"
-
-class MainControler : public QObject
-{
-    Q_OBJECT
-public:
-    explicit MainControler(QObject* parent= 0);
-
-    void initEngine(QQmlApplicationEngine*);
-signals:
-
-public slots:
-    void setConnections(QObject* root, QUrl url);
-    void rollDice(QString cmd);
-
-private:
-    CommandModel* m_model;
-    DiceParser* m_diceParser;
-    QQmlApplicationEngine* m_engine;
-};
-
-#endif // MAINCONTROLER_H
diff --git a/mobile/maincontroller.cpp b/mobile/maincontroller.cpp
new file mode 100644
index 0000000..6f301ff
--- /dev/null
+++ b/mobile/maincontroller.cpp
@@ -0,0 +1,44 @@
+#include "maincontroler.h"
+
+#include <QJSValue>
+#include <QQmlEngine>
+
+MainControler::MainControler(QObject* parent) : QObject(parent)
+{
+
+    m_diceParser= new DiceParser();
+    qmlRegisterSingletonType("DiceParser", 1, 0, "Model", [](QQmlEngine* engine, QJSEngine* scriptEngine) -> QObject* {
+        Q_UNUSED(engine)
+        static CommandModel model;
+        static bool initialized= false;
+        if(!initialized)
+        {
+            model.insertCmd("L5R", "8D10e10k4");
+            initialized= true;
+        }
+        return &model;
+    });
+}
+void MainControler::initEngine(QQmlApplicationEngine* engine)
+{
+    m_engine= engine;
+    engine->rootContext()->setContextProperty("_model", m_model);
+    connect(m_engine, SIGNAL(objectCreated(QObject*, QUrl)), this, SLOT(setConnections(QObject*, QUrl)));
+}
+void MainControler::rollDice(QString cmd)
+{
+    if(m_diceParser->parseLine(cmd))
+    {
+        m_diceParser->start();
+        for(int i= 0; i < m_diceParser->getStartNodeCount(); ++i)
+        {
+            // qDebug() << m_diceParser->getSumOfDiceResult(i);
+        }
+    }
+}
+void MainControler::setConnections(QObject* root, QUrl url)
+{
+    // QObject* root = engine->rootContext()->contextObject();
+    connect(root, SIGNAL(roll(QString)), this, SLOT(rollDice(QString)));
+    connect(root, SIGNAL(addRoll(QString, QString)), m_model, SLOT(insertCmd(QString, QString)));
+}
diff --git a/mobile/maincontroller.h b/mobile/maincontroller.h
new file mode 100644
index 0000000..43fc1ae
--- /dev/null
+++ b/mobile/maincontroller.h
@@ -0,0 +1,29 @@
+#ifndef MAINCONTROLER_H
+#define MAINCONTROLER_H
+
+#include <QObject>
+#include <QQmlApplicationEngine>
+
+#include "commandmodel.h"
+#include "diceparser.h"
+
+class MainControler : public QObject
+{
+    Q_OBJECT
+public:
+    explicit MainControler(QObject* parent= 0);
+
+    void initEngine(QQmlApplicationEngine*);
+signals:
+
+public slots:
+    void setConnections(QObject* root, QUrl url);
+    void rollDice(QString cmd);
+
+private:
+    // CommandModel* m_model;
+    DiceParser* m_diceParser;
+    QQmlApplicationEngine* m_engine;
+};
+
+#endif // MAINCONTROLER_H
-- 
cgit v1.2.3-70-g09d2