From bb6b87a2685c0d71b5c38be33c100f85ac0b9cee Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Thu, 25 Jul 2019 09:59:29 +0200
Subject: Rework of the component to be a proper lib

---
 result/result.h | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'result/result.h')

diff --git a/result/result.h b/result/result.h
index 8f31c05..a34c74f 100644
--- a/result/result.h
+++ b/result/result.h
@@ -22,7 +22,7 @@
 #ifndef RESULT_H
 #define RESULT_H
 
-//#include <Qt>
+#include "diceparserhelper.h"
 #include <QString>
 #include <QVariant>
 /**
@@ -31,16 +31,6 @@
 class Result
 {
 public:
-    /**
-     * @brief The RESULT_TYPE enum or combinaison
-     */
-    enum RESULT_TYPE
-    {
-        NONE= 0,
-        SCALAR= 1,
-        STRING= 2,
-        DICE_LIST= 4
-    };
     /**
      * @brief Result
      */
@@ -54,12 +44,12 @@ public:
      * @brief isScalar
      * @return
      */
-    virtual bool hasResultOfType(RESULT_TYPE) const;
+    virtual bool hasResultOfType(Dice::RESULT_TYPE) const;
     /**
      * @brief getScalar
      * @return
      */
-    virtual QVariant getResult(RESULT_TYPE)= 0;
+    virtual QVariant getResult(Dice::RESULT_TYPE)= 0;
     /**
      * @brief getPrevious
      * @return
-- 
cgit v1.2.3-70-g09d2


From 62ff4aad384c248b62f88a3e38d2e51043c5bb20 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Sun, 28 Jul 2019 01:46:48 +0200
Subject: initialize pointer on nullptr

---
 node/executionnode.h | 2 +-
 node/paintnode.h     | 1 +
 operationcondition.h | 2 +-
 result/result.h      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'result/result.h')

diff --git a/node/executionnode.h b/node/executionnode.h
index 62bc5a5..6321c83 100644
--- a/node/executionnode.h
+++ b/node/executionnode.h
@@ -86,7 +86,7 @@ protected:
     /**
      * @brief m_result
      */
-    Result* m_result;
+    Result* m_result= nullptr;
     /**
      * @brief m_nextNode
      */
diff --git a/node/paintnode.h b/node/paintnode.h
index 2675285..2283f83 100644
--- a/node/paintnode.h
+++ b/node/paintnode.h
@@ -55,6 +55,7 @@ public:
 
 protected:
     QList<ColorItem> m_colors;
+    DiceResult* m_diceResult= nullptr;
 };
 
 #endif
diff --git a/operationcondition.h b/operationcondition.h
index 8b5a411..b324f6b 100644
--- a/operationcondition.h
+++ b/operationcondition.h
@@ -54,7 +54,7 @@ private:
     qint64 valueToScalar() const;
 
 private:
-    ConditionOperator m_operator;
+    ConditionOperator m_operator= Modulo;
     BooleanCondition* m_boolean= nullptr;
     // qint64 m_value;
     ExecutionNode* m_value= nullptr;
diff --git a/result/result.h b/result/result.h
index a34c74f..76f3a8c 100644
--- a/result/result.h
+++ b/result/result.h
@@ -90,7 +90,7 @@ protected:
     QString m_id;
 
 private:
-    Result* m_previous; /// @brief
+    Result* m_previous= nullptr; /// @brief
 };
 
 #endif // RESULT_H
-- 
cgit v1.2.3-70-g09d2