1 files changed, 45 insertions, 51 deletions

diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp
index d76c115..bc8e3b3 100644
--- a/node/countexecutenode.cpp
+++ b/node/countexecutenode.cpp
@@ -1,88 +1,82 @@
 #include "countexecutenode.h"
 #include "result/diceresult.h"
 
-
-
-CountExecuteNode::CountExecuteNode()
-	: m_scalarResult(new ScalarResult()),m_validator(nullptr)
+CountExecuteNode::CountExecuteNode() : m_scalarResult(new ScalarResult()), m_validator(nullptr)
 {
-	m_result = m_scalarResult;
+    m_result= m_scalarResult;
 }
 void CountExecuteNode::setValidator(Validator* validator)
 {
-	m_validator = validator;
+    m_validator= validator;
 }
 CountExecuteNode::~CountExecuteNode()
 {
-	if(nullptr!=m_validator)
-	{
-		delete m_validator;
-	}
+    if(nullptr != m_validator)
+    {
+        delete m_validator;
+    }
 }
 
-void CountExecuteNode::run(ExecutionNode *previous)
+void CountExecuteNode::run(ExecutionNode* previous)
 {
-	m_previousNode = previous;
-	if(nullptr==previous)
-	{
-		return;
-	}
-    DiceResult* previousResult = dynamic_cast<DiceResult*>(previous->getResult());
-    if(nullptr!=previousResult)
-	{
+    m_previousNode= previous;
+    if(nullptr == previous)
+    {
+        return;
+    }
+    DiceResult* previousResult= dynamic_cast<DiceResult*>(previous->getResult());
+    if(nullptr != previousResult)
+    {
         m_result->setPrevious(previousResult);
-        QList<Die*> diceList=previousResult->getResultList();
-		qint64 sum = 0;
-        for(Die* dice:diceList)
-		{
-            if(nullptr!=m_validator)
+        QList<Die*> diceList= previousResult->getResultList();
+        qint64 sum= 0;
+        for(Die* dice : diceList)
+        {
+            if(nullptr != m_validator)
             {
-                sum+=m_validator->hasValid(dice,true,true);
+                sum+= m_validator->hasValid(dice, true, true);
             }
-		}
-		m_scalarResult->setValue(sum);
+        }
+        m_scalarResult->setValue(sum);
 
-
-		if(nullptr!=m_nextNode)
-		{
-			m_nextNode->run(this);
-		}
-	}
+        if(nullptr != m_nextNode)
+        {
+            m_nextNode->run(this);
+        }
+    }
 }
 QString CountExecuteNode::toString(bool withlabel) const
 {
-	if(withlabel)
-	{
-        return QString("%1 [label=\"CountExecuteNode %2\"]").arg(m_id,m_validator->toString());
-	}
-	else
-	{
-		return m_id;
-	}
+    if(withlabel)
+    {
+        return QString("%1 [label=\"CountExecuteNode %2\"]").arg(m_id, m_validator->toString());
+    }
+    else
+    {
+        return m_id;
+    }
 }
 qint64 CountExecuteNode::getPriority() const
 {
-	qint64 priority=0;
-	if(nullptr!=m_nextNode)
-	{
-		priority = m_nextNode->getPriority();
-	}
-
+    qint64 priority= 0;
+    if(nullptr != m_nextNode)
+    {
+        priority= m_nextNode->getPriority();
+    }
 
     return priority;
 }
 
 ExecutionNode* CountExecuteNode::getCopy() const
 {
-    CountExecuteNode* node = new CountExecuteNode();
-    if(nullptr!=m_validator)
+    CountExecuteNode* node= new CountExecuteNode();
+    if(nullptr != m_validator)
     {
         node->setValidator(m_validator->getCopy());
     }
-    if(nullptr!=m_nextNode)
+    if(nullptr != m_nextNode)
     {
         node->setNextNode(m_nextNode->getCopy());
     }
     return node;
-
 }