[tree]: improve tree generation

1 files changed, 4 insertions, 26 deletions

diff --git a/src/libparser/node/ifnode.cpp b/src/libparser/node/ifnode.cpp
index 62821ae..a448ab1 100644
--- a/src/libparser/node/ifnode.cpp
+++ b/src/libparser/node/ifnode.cpp
@@ -21,7 +21,8 @@
 #include "result/diceresult.h"
 #include "validatorlist.h"
 
-PartialDiceRollNode::PartialDiceRollNode() : m_diceResult(new DiceResult)
+PartialDiceRollNode::PartialDiceRollNode()
+    : ExecutionNode("%1 [label=\"PartialDiceRollNode \"]"), m_diceResult(new DiceResult)
 {
     m_result= m_diceResult;
 }
@@ -54,18 +55,6 @@ qint64 PartialDiceRollNode::getPriority() const
     return priority;
 }
 
-QString PartialDiceRollNode::toString(bool withLabel) const
-{
-    if(withLabel)
-    {
-        return QString("%1 [label=\"PartialDiceRollNode \"]").arg(m_id);
-    }
-    else
-    {
-        return m_id;
-    }
-}
-
 DiceResult* getFirstDiceResult(Result* result)
 {
     DiceResult* found= nullptr;
@@ -81,7 +70,8 @@ DiceResult* getFirstDiceResult(Result* result)
     return found;
 }
 
-IfNode::IfNode() : m_conditionType(Dice::AllOfThem), m_true(nullptr), m_false(nullptr)
+IfNode::IfNode()
+    : ExecutionNode("%1 [label=\"IfNode\"]"), m_conditionType(Dice::AllOfThem), m_true(nullptr), m_false(nullptr)
 {
     // m_result = new DiceResult();
 }
@@ -292,18 +282,6 @@ void IfNode::generateDotTree(QString& s)
     }
 }
 
-QString IfNode::toString(bool wl) const
-{
-    if(wl)
-    {
-        return QString("%1 [label=\"IfNode\"]").arg(m_id);
-    }
-    else
-    {
-        return m_id;
-    }
-}
-
 qint64 IfNode::getPriority() const
 {
     return 0;