From c671d21b54d43dbd6112f3ab50fc6ebd63dc4aef Mon Sep 17 00:00:00 2001 From: Renaud Guezennec Date: Thu, 4 Feb 2016 17:58:00 +0100 Subject: Add Management of Color --- diceparser.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'diceparser.h') diff --git a/diceparser.h b/diceparser.h index e1a5ee5..15a8a84 100644 --- a/diceparser.h +++ b/diceparser.h @@ -33,10 +33,9 @@ #include "booleancondition.h" #include "parsingtoolbox.h" #include "dicealias.h" +#include "highlightdice.h" - -typedef QPair,bool> DiceAndHighlight; -typedef QList ListDiceResult; +typedef QList ListDiceResult; typedef QMap ExportedDiceResult; class ExploseDiceNode; @@ -77,7 +76,7 @@ public: /** * @brief The OptionOperator enum gathering all options availables for result. */ - enum OptionOperator {KeepAndExplose,Keep,Reroll,Explosing,Sort,Count,RerollAndAdd,Merge,ifOperator}; + enum OptionOperator {KeepAndExplose,Keep,Reroll,Explosing,Sort,Count,RerollAndAdd,Merge,ifOperator,Painter}; /** * @brief The CommandOperator enum */ -- cgit v1.2.3-70-g09d2