diff options
Diffstat (limited to 'mobile/maincontroler.cpp')
| -rw-r--r-- | mobile/maincontroler.cpp | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/mobile/maincontroler.cpp b/mobile/maincontroler.cpp index c24e512..a23ca31 100644 --- a/mobile/maincontroler.cpp +++ b/mobile/maincontroler.cpp @@ -1,38 +1,35 @@ #include "maincontroler.h" -#include <QQmlContext> #include <QDebug> +#include <QQmlContext> -MainControler::MainControler(QObject *parent) - : QObject(parent) +MainControler::MainControler(QObject* parent) : QObject(parent) { - m_model = new CommandModel(); - m_model->insertCmd("L5R","8D10e10k4"); + m_model= new CommandModel(); + m_model->insertCmd("L5R", "8D10e10k4"); - m_diceParser = new DiceParser(); + 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))); - - + 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) + for(int i= 0; i < m_diceParser->getStartNodeCount(); ++i) { - //qDebug() << m_diceParser->getSumOfDiceResult(i); + // qDebug() << m_diceParser->getSumOfDiceResult(i); } } } -void MainControler::setConnections(QObject* root,QUrl url) +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))); + // 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))); } |