diff options
| author |   Renaud G <renaud@rolisteam.org> | 2020-06-19 08:54:57 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2020-08-21 22:50:44 +0200 |
| commit | 62b7114ce29af10395273acec8dffeb41f255145 (patch) | |
| tree | b15ccf438ea03c0d7673e8efb174b3a1042e92aa /diceroller.cpp | |
| parent | 80ab093722485fe7ac577415ae401f347907623c (diff) | |
| download | OneRoll-62b7114ce29af10395273acec8dffeb41f255145.tar.gz OneRoll-62b7114ce29af10395273acec8dffeb41f255145.zip | |
change the way diceparser is giving its result.
Diffstat (limited to 'diceroller.cpp')
| -rw-r--r-- | diceroller.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/diceroller.cpp b/diceroller.cpp index 3d91f3e..cba24df 100644 --- a/diceroller.cpp +++ b/diceroller.cpp @@ -101,14 +101,14 @@ QString DiceRoller::diceToText(QList<ExportedDiceResult>& diceList) } void DiceRoller::start() { - if(m_diceparser.parseLine(m_command)) + /*if(m_diceparser.parseLine(m_command)) { m_diceparser.start(); - if(m_diceparser.getErrorMap().isEmpty()) + if(m_diceparser.errorMap().isEmpty()) { bool homogeneous; QList<ExportedDiceResult> list; - m_diceparser.getLastDiceResult(list, homogeneous); + m_diceparser.lastDiceResult(list, homogeneous); QString diceText= diceToText(list); QString scalarText; QString str; @@ -117,7 +117,7 @@ void DiceRoller::start() QString resultStr; if(m_diceparser.hasIntegerResultNotInFirst()) { - auto values= m_diceparser.getLastIntegerResults(); + auto values= m_diceparser.lastIntegerResults(); QStringList strLst; for(auto& val : values) { @@ -169,7 +169,7 @@ void DiceRoller::start() { auto errors= m_diceparser.getErrorMap(); setError(errors.first()); - } + }*/ } QString DiceRoller::getError() const @@ -185,4 +185,3 @@ void DiceRoller::setError(const QString& error) m_error= error; emit errorOccurs(); } - |