diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/mainwindow.cpp | 26 | ||||
| -rw-r--r-- | gui/mainwindow.h | 18 |
2 files changed, 21 insertions, 23 deletions
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 5ec6e87..5b8422e 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -1,31 +1,27 @@ #include "mainwindow.h" #include "ui_mainwindow.h" - #include "diceparser.h" -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) +MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWindow) { - ui->setupUi(this); + ui->setupUi(this); - connect(ui->m_rollButton,SIGNAL(pressed()),this,SLOT(rollDiceCommand())); - m_dieParser = new DiceParser(); + connect(ui->m_rollButton, SIGNAL(pressed()), this, SLOT(rollDiceCommand())); + m_dieParser= new DiceParser(); } MainWindow::~MainWindow() { - delete ui; + delete ui; } void MainWindow::rollDiceCommand() { - QString cmd = ui->m_cmdEdit->text(); - - if(m_dieParser->parseLine(cmd)) - { - m_dieParser->Start(); - m_dieParser->displayResult(); - } + QString cmd= ui->m_cmdEdit->text(); + if(m_dieParser->parseLine(cmd)) + { + m_dieParser->Start(); + m_dieParser->displayResult(); + } } diff --git a/gui/mainwindow.h b/gui/mainwindow.h index d910ad6..bd19b34 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -4,23 +4,25 @@ #include <QMainWindow> class DiceParser; -namespace Ui { -class MainWindow; +namespace Ui +{ + class MainWindow; } class MainWindow : public QMainWindow { - Q_OBJECT + Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); - ~MainWindow(); + explicit MainWindow(QWidget* parent= 0); + ~MainWindow(); protected slots: - void rollDiceCommand(); + void rollDiceCommand(); + private: - Ui::MainWindow *ui; - DiceParser* m_dieParser; + Ui::MainWindow* ui; + DiceParser* m_dieParser; }; #endif // MAINWINDOW_H |