aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include/parsingtoolbox.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/parsingtoolbox.h')
-rw-r--r--include/parsingtoolbox.h6
1 files changed, 4 insertions, 2 deletions
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<QString(const QString&, const QString&, bool)> 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<QString, BooleanCondition::LogicOperator> m_logicOp;