diff options
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/commandmodel.cpp | 57 | ||||
| -rw-r--r-- | mobile/commandmodel.h | 54 | ||||
| -rw-r--r-- | mobile/main.cpp | 43 | ||||
| -rw-r--r-- | mobile/maincontroler.cpp | 31 | ||||
| -rw-r--r-- | mobile/maincontroler.h | 7 |
5 files changed, 95 insertions, 97 deletions
diff --git a/mobile/commandmodel.cpp b/mobile/commandmodel.cpp index 6a3ab1d..7b50397 100644 --- a/mobile/commandmodel.cpp +++ b/mobile/commandmodel.cpp @@ -1,32 +1,29 @@ /*************************************************************************** - * Copyright (C) 2016 by Renaud Guezennec * - * http://www.rolisteam.org/contact * - * * - * rolisteam is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ + * Copyright (C) 2016 by Renaud Guezennec * + * http://www.rolisteam.org/contact * + * * + * rolisteam is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ #include "commandmodel.h" -CommandModel::CommandModel() -{ - -} +CommandModel::CommandModel() {} -QVariant CommandModel::data(const QModelIndex &index, int role) const +QVariant CommandModel::data(const QModelIndex& index, int role) const { - QPair<QString,QString> indexP = m_data.at(index.row()); + QPair<QString, QString> indexP= m_data.at(index.row()); if(role == NameRole) { return indexP.first; @@ -37,21 +34,21 @@ QVariant CommandModel::data(const QModelIndex &index, int role) const } } -int CommandModel::rowCount(const QModelIndex &parent) const +int CommandModel::rowCount(const QModelIndex& parent) const { return m_data.count(); } -QHash<int, QByteArray> CommandModel::roleNames() const +QHash<int, QByteArray> CommandModel::roleNames() const { QHash<int, QByteArray> roles; - roles[NameRole] = "name"; - roles[CmdRole] = "cmd"; + roles[NameRole]= "name"; + roles[CmdRole]= "cmd"; return roles; } void CommandModel::insertCmd(QString name, QString cmd) { QModelIndex index; - beginInsertRows(index,0,0); - m_data.prepend(QPair<QString,QString>(name,cmd)); + beginInsertRows(index, 0, 0); + m_data.prepend(QPair<QString, QString>(name, cmd)); endInsertRows(); } diff --git a/mobile/commandmodel.h b/mobile/commandmodel.h index 2c20072..4037032 100644 --- a/mobile/commandmodel.h +++ b/mobile/commandmodel.h @@ -1,22 +1,22 @@ /*************************************************************************** - * Copyright (C) 2016 by Renaud Guezennec * - * http://www.rolisteam.org/contact * - * * - * rolisteam is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ + * Copyright (C) 2016 by Renaud Guezennec * + * http://www.rolisteam.org/contact * + * * + * rolisteam is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ #ifndef COMMANDMODEL_H #define COMMANDMODEL_H @@ -28,19 +28,23 @@ class CommandModel : public QAbstractListModel { Q_OBJECT public: - enum CustomRole {NameRole = Qt::UserRole+1,CmdRole}; + enum CustomRole + { + NameRole= Qt::UserRole + 1, + CmdRole + }; CommandModel(); - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole ) const; - virtual int rowCount(const QModelIndex &parent) const; - - QHash<int, QByteArray> roleNames() const; + virtual QVariant data(const QModelIndex& index, int role= Qt::DisplayRole) const; + virtual int rowCount(const QModelIndex& parent) const; + QHash<int, QByteArray> roleNames() const; public slots: - void insertCmd(QString name, QString cmd); + void insertCmd(QString name, QString cmd); + private: - QList<QPair<QString,QString> > m_data; + QList<QPair<QString, QString>> m_data; }; #endif // COMMANDMODEL_H diff --git a/mobile/main.cpp b/mobile/main.cpp index c4c8b0a..9b81329 100644 --- a/mobile/main.cpp +++ b/mobile/main.cpp @@ -1,39 +1,38 @@ /*************************************************************************** - * Copyright (C) 2016 by Renaud Guezennec * - * http://www.rolisteam.org/contact * - * * - * rolisteam is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ + * Copyright (C) 2016 by Renaud Guezennec * + * http://www.rolisteam.org/contact * + * * + * rolisteam is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ #include <QGuiApplication> #include <QQmlApplicationEngine> #include "maincontroler.h" -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - MainControler* main = new MainControler(); - + MainControler* main= new MainControler(); QQmlApplicationEngine engine; main->initEngine(&engine); engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); - //main->setConnections(&engine); + // main->setConnections(&engine); return app.exec(); } 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))); } diff --git a/mobile/maincontroler.h b/mobile/maincontroler.h index b94312d..fb806b0 100644 --- a/mobile/maincontroler.h +++ b/mobile/maincontroler.h @@ -11,14 +11,15 @@ class MainControler : public QObject { Q_OBJECT public: - explicit MainControler(QObject *parent = 0); + explicit MainControler(QObject* parent= 0); - void initEngine(QQmlApplicationEngine* ); + void initEngine(QQmlApplicationEngine*); signals: public slots: - void setConnections(QObject* root,QUrl url); + void setConnections(QObject* root, QUrl url); void rollDice(QString cmd); + private: CommandModel* m_model; DiceParser* m_diceParser; |