From b48e29ad3cc1be1b0ee66b54bf19537a0bfdc782 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Fri, 21 Aug 2020 22:44:10 +0200 Subject: Better export in json. --- include/diceparser.h | 2 +- include/parsingtoolbox.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/diceparser.h b/include/diceparser.h index 4d5555e..56dcb7d 100644 --- a/include/diceparser.h +++ b/include/diceparser.h @@ -105,7 +105,7 @@ public: QString comment() const; QString humanReadableWarning() const; QString humanReadableError() const; - QString resultAsJSon() const; + QString resultAsJSon(std::function colorize) const; // QStringList stringResult() const; // QStringList allDiceResult(bool& hasAlias) const; diff --git a/include/parsingtoolbox.h b/include/parsingtoolbox.h index d0a757f..f9c7484 100644 --- a/include/parsingtoolbox.h +++ b/include/parsingtoolbox.h @@ -231,8 +231,9 @@ public: static SubtituteInfo readPlaceHolderFromString(const QString& source, int& start); static ExportedDiceResult finalDiceResultFromInstruction(ExecutionNode* start); static ExportedDiceResult allDiceResultFromInstruction(ExecutionNode* start); - void addResultInJson(QJsonObject obj, Dice::RESULT_TYPE type, const QString& key, ExecutionNode* start, bool b); - void addDiceResultInJson(QJsonObject obj, ExecutionNode* start); + void addResultInJson(QJsonObject& obj, Dice::RESULT_TYPE type, const QString& key, ExecutionNode* start, bool b); + void addDiceResultInJson(QJsonObject& obj, ExecutionNode* start, + std::function colorize); // accessors void setComment(const QString& comment); @@ -249,6 +250,7 @@ public: void cleanUpAliases(); static bool readStringResultParameter(QString& str); + static QString replacePlaceHolderFromJson(const QString& source, const QJsonObject& obj); private: QMap m_logicOp; -- cgit v1.2.3-70-g09d2