From 5cfe48265ebad0ffa0a980dbc2d131fceeecdf3b Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Wed, 8 Apr 2015 21:34:02 +0200
Subject: -remove memory leaks -delete created objects

---
 node/countexecutenode.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'node/countexecutenode.cpp')

diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp
index 281fc80..1050efc 100644
--- a/node/countexecutenode.cpp
+++ b/node/countexecutenode.cpp
@@ -4,7 +4,7 @@
 
 
 CountExecuteNode::CountExecuteNode()
-    : m_scalarResult(new ScalarResult())
+	: m_scalarResult(new ScalarResult()),m_validator(NULL)
 {
     m_result = m_scalarResult;
 }
@@ -12,6 +12,13 @@ void CountExecuteNode::setValidator(Validator* validator)
 {
     m_validator = validator;
 }
+CountExecuteNode::~CountExecuteNode()
+{
+	if(NULL!=m_validator)
+	{
+		delete m_validator;
+	}
+}
 
 void CountExecuteNode::run(ExecutionNode *previous)
 {
-- 
cgit v1.2.3-70-g09d2


From d4c03f1eb5627294df3675de2e8e55fd721e37d8 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Wed, 22 Apr 2015 10:57:53 +0200
Subject: management of highligth dice

---
 node/countexecutenode.cpp | 2 +-
 node/keepdiceexecnode.cpp | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'node/countexecutenode.cpp')

diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp
index 1050efc..ff3d67b 100644
--- a/node/countexecutenode.cpp
+++ b/node/countexecutenode.cpp
@@ -35,7 +35,7 @@ void CountExecuteNode::run(ExecutionNode *previous)
         qint64 sum = 0;
         foreach(Die* dice,diceList)
         {
-            sum+=m_validator->hasValid(dice,true);
+            sum+=m_validator->hasValid(dice,true,true);
         }
         m_scalarResult->setValue(sum);
 
diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp
index 62b4c8f..e8cfac8 100644
--- a/node/keepdiceexecnode.cpp
+++ b/node/keepdiceexecnode.cpp
@@ -26,6 +26,11 @@ m_previousNode = previous;
 
 
         diceList2 = diceList.mid(0,m_numberOfDice);
+        foreach(Die* tmp,diceList.mid(m_numberOfDice,-1))
+        {
+            tmp->setHighlighted(false);
+        }
+
         m_diceResult->setResultList(diceList2);
         if(NULL!=m_nextNode)
         {
-- 
cgit v1.2.3-70-g09d2