diff options
| author |   Renaud G <renaud@rolisteam.org> | 2020-10-21 11:34:58 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2020-10-21 11:34:58 +0200 |
| commit | 671bf7bdf20ccc61339d0959b1fb2f81a316825b (patch) | |
| tree | 595be6924b831977a8680bb3be9c5bccdf2bc4a6 /diceparser.cpp | |
| parent | d1a947bed91963e788287e186f831202b8355eea (diff) | |
| download | OneRoll-671bf7bdf20ccc61339d0959b1fb2f81a316825b.tar.gz OneRoll-671bf7bdf20ccc61339d0959b1fb2f81a316825b.zip | |
fix output
Diffstat (limited to 'diceparser.cpp')
| -rw-r--r-- | diceparser.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/diceparser.cpp b/diceparser.cpp index d42716a..5b91994 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -204,12 +204,13 @@ QString DiceParser::humanReadableWarning() const return str; } -QString DiceParser::finalStringResult() const +QString DiceParser::finalStringResult(std::function<QString(const QString&, const QString&, bool)> colorize) const { - return m_parsingToolbox->finalStringResult(); + return m_parsingToolbox->finalStringResult(colorize); } -QString DiceParser::resultAsJSon(std::function<QString(const QString&, const QString&, bool)> colorize) const +QString DiceParser::resultAsJSon(std::function<QString(const QString&, const QString&, bool)> colorize, + bool removeUnhighligthed) const { QJsonObject obj; QJsonArray instructions; @@ -227,7 +228,7 @@ QString DiceParser::resultAsJSon(std::function<QString(const QString&, const QSt obj["comment"]= m_parsingToolbox->getComment(); obj["error"]= humanReadableError(); obj["scalar"]= m_parsingToolbox->finalScalarResult().first; - obj["string"]= m_parsingToolbox->finalStringResult(); + obj["string"]= m_parsingToolbox->finalStringResult(colorize, removeUnhighligthed); obj["warning"]= humanReadableWarning(); obj["command"]= m_command; |