From 671bf7bdf20ccc61339d0959b1fb2f81a316825b Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Wed, 21 Oct 2020 11:34:58 +0200
Subject: fix output

---
 include/diceparser.h     | 5 +++--
 include/parsingtoolbox.h | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/diceparser.h b/include/diceparser.h
index 8951a99..3c42bcc 100644
--- a/include/diceparser.h
+++ b/include/diceparser.h
@@ -99,14 +99,15 @@ public:
     QList<qreal> scalarResultsFromEachInstruction() const;
     QStringList stringResultFromEachInstruction(bool& hasAlias) const;
     void diceResultFromEachInstruction(QList<ExportedDiceResult>& resultList) const;
-    QString finalStringResult() const;
+    QString finalStringResult(std::function<QString(const QString&, const QString&, bool)> colorize) const;
 
     QString diceCommand() const;
     QMap<Dice::ERROR_CODE, QString> errorMap() const;
     QString comment() const;
     QString humanReadableWarning() const;
     QString humanReadableError() const;
-    QString resultAsJSon(std::function<QString(const QString&, const QString&, bool)> colorize) const;
+    QString resultAsJSon(std::function<QString(const QString&, const QString&, bool)> colorize,
+                         bool removeUnhighligthed= false) const;
 
     //    QStringList stringResult() const;
     //    QStringList allDiceResult(bool& hasAlias) const;
diff --git a/include/parsingtoolbox.h b/include/parsingtoolbox.h
index f91c2f6..a58aabd 100644
--- a/include/parsingtoolbox.h
+++ b/include/parsingtoolbox.h
@@ -23,6 +23,7 @@
 #define PARSINGTOOLBOX_H
 
 #include <QMap>
+#include <functional>
 #include <vector>
 
 #include "booleancondition.h"
@@ -197,7 +198,8 @@ public:
     std::pair<bool, QVariant> hasResultOfType(Dice::RESULT_TYPE, ExecutionNode* node, bool notthelast= false) const;
     QList<qreal> scalarResultsFromEachInstruction() const;
     std::pair<QString, QString> finalScalarResult() const;
-    QString finalStringResult() const;
+    QString finalStringResult(std::function<QString(const QString&, const QString&, bool)> colorize,
+                              bool removeUnhighlighted= false) const;
     QStringList allFirstResultAsString(bool& hasAlias) const;
     QList<qreal> sumOfDiceResult() const;
     QList<ExportedDiceResult> diceResultFromEachInstruction() const;
@@ -208,7 +210,9 @@ public:
     // result
     static QString replaceVariableToValue(const QString& source, QStringList values,
                                           QMap<Dice::ERROR_CODE, QString>& errorMap);
-    static QString replacePlaceHolderToValue(const QString& source, const QList<ExportedDiceResult>& list);
+    static QString replacePlaceHolderToValue(const QString& source, const QList<ExportedDiceResult>& list,
+                                             bool removeUnhighlighted,
+                                             std::function<QString(const QString&, const QString&, bool)> colorize);
     static SubtituteInfo readVariableFromString(const QString& source, int& start);
     static SubtituteInfo readPlaceHolderFromString(const QString& source, int& start);
     static ExportedDiceResult finalDiceResultFromInstruction(ExecutionNode* start);
-- 
cgit v1.2.3-70-g09d2