aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2020-11-15 02:29:16 +0100
committerRenaud G <renaud@rolisteam.org>2020-11-15 02:30:17 +0100
commit228f38d2592dcce72274018a4ae9a745dc0f8005 (patch)
tree2a443b5f05ffb92deeee9d9f61c129ba9e2cc83f
parent17e3ef97962b89ff74acd84549e841c7911cad13 (diff)
downloadOneRoll-228f38d2592dcce72274018a4ae9a745dc0f8005.tar.gz
OneRoll-228f38d2592dcce72274018a4ae9a745dc0f8005.zip
Rename files
-rw-r--r--mobile/CMakeLists.txt2
-rw-r--r--mobile/maincontroller.cpp (renamed from mobile/maincontroler.cpp)17
-rw-r--r--mobile/maincontroller.h (renamed from mobile/maincontroler.h)2
3 files changed, 15 insertions, 6 deletions
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/maincontroller.cpp
index a23ca31..6f301ff 100644
--- a/mobile/maincontroler.cpp
+++ b/mobile/maincontroller.cpp
@@ -1,14 +1,23 @@
#include "maincontroler.h"
-#include <QDebug>
-#include <QQmlContext>
+#include <QJSValue>
+#include <QQmlEngine>
MainControler::MainControler(QObject* parent) : QObject(parent)
{
- m_model= new CommandModel();
- m_model->insertCmd("L5R", "8D10e10k4");
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)
{
diff --git a/mobile/maincontroler.h b/mobile/maincontroller.h
index fb806b0..43fc1ae 100644
--- a/mobile/maincontroler.h
+++ b/mobile/maincontroller.h
@@ -21,7 +21,7 @@ public slots:
void rollDice(QString cmd);
private:
- CommandModel* m_model;
+ // CommandModel* m_model;
DiceParser* m_diceParser;
QQmlApplicationEngine* m_engine;
};