Rework of the component to be a proper lib

8 files changed, 28 insertions, 37 deletions

diff --git a/result/diceresult.cpp b/result/diceresult.cpp
index e66fc4f..23b925e 100644
--- a/result/diceresult.cpp
+++ b/result/diceresult.cpp
@@ -25,7 +25,7 @@
 
 DiceResult::DiceResult() : m_operator(Die::PLUS)
 {
-    m_resultTypes= (DICE_LIST | SCALAR);
+    m_resultTypes= (static_cast<int>(Dice::RESULT_TYPE::DICE_LIST) | static_cast<int>(Dice::RESULT_TYPE::SCALAR));
     m_homogeneous= true;
 }
 void DiceResult::insertResult(Die* die)
@@ -63,15 +63,15 @@ DiceResult::~DiceResult()
         m_diceValues.clear();
     }
 }
-QVariant DiceResult::getResult(RESULT_TYPE type)
+QVariant DiceResult::getResult(Dice::RESULT_TYPE type)
 {
     switch(type)
     {
-    case SCALAR:
+    case Dice::RESULT_TYPE::SCALAR:
     {
         return getScalarResult();
     }
-    case DICE_LIST:
+    case Dice::RESULT_TYPE::DICE_LIST:
     {
         return QVariant();
     }
diff --git a/result/diceresult.h b/result/diceresult.h
index 54e0b57..ce8ffb7 100644
--- a/result/diceresult.h
+++ b/result/diceresult.h
@@ -61,7 +61,7 @@ public:
      * @brief getScalar
      * @return
      */
-    virtual QVariant getResult(RESULT_TYPE);
+    virtual QVariant getResult(Dice::RESULT_TYPE);
     /**
      * @brief toString
      * @return
diff --git a/result/result.cpp b/result/result.cpp
index edd00e4..983f1f4 100644
--- a/result/result.cpp
+++ b/result/result.cpp
@@ -22,7 +22,10 @@
 #include "result.h"
 #include <QUuid>
 
-Result::Result() : m_resultTypes(NONE), m_id(QString("\"%1\"").arg(QUuid::createUuid().toString())), m_previous(nullptr)
+Result::Result()
+    : m_resultTypes(static_cast<int>(Dice::RESULT_TYPE::NONE))
+    , m_id(QString("\"%1\"").arg(QUuid::createUuid().toString()))
+    , m_previous(nullptr)
 {
 }
 Result::~Result() {}
@@ -43,9 +46,9 @@ bool Result::isStringResult() const
     return false;
 }
 void Result::clear() {}
-bool Result::hasResultOfType(RESULT_TYPE type) const
+bool Result::hasResultOfType(Dice::RESULT_TYPE type) const
 {
-    return (m_resultTypes & type);
+    return (m_resultTypes & static_cast<int>(type));
 }
 void Result::generateDotTree(QString& s)
 {
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>
 /**
@@ -32,16 +32,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
      */
     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
diff --git a/result/scalarresult.cpp b/result/scalarresult.cpp
index 089c4b8..ec2b5f0 100644
--- a/result/scalarresult.cpp
+++ b/result/scalarresult.cpp
@@ -21,18 +21,15 @@
  ***************************************************************************/
 #include "scalarresult.h"
 
-ScalarResult::ScalarResult()
-{
-    m_resultTypes= Result::SCALAR;
-}
+ScalarResult::ScalarResult() {}
 
 void ScalarResult::setValue(qreal i)
 {
     m_value= i;
 }
-QVariant ScalarResult::getResult(Result::RESULT_TYPE type)
+QVariant ScalarResult::getResult(Dice::RESULT_TYPE type)
 {
-    if(SCALAR == type)
+    if(Dice::RESULT_TYPE::SCALAR == type)
     {
         return m_value;
     }
diff --git a/result/scalarresult.h b/result/scalarresult.h
index c20de0f..1eac73c 100644
--- a/result/scalarresult.h
+++ b/result/scalarresult.h
@@ -39,7 +39,7 @@ public:
      * @brief getResult
      * @return
      */
-    virtual QVariant getResult(Result::RESULT_TYPE);
+    virtual QVariant getResult(Dice::RESULT_TYPE);
     /**
      * @brief setValue
      * @param i
diff --git a/result/stringresult.cpp b/result/stringresult.cpp
index a44e24e..d5a7880 100644
--- a/result/stringresult.cpp
+++ b/result/stringresult.cpp
@@ -3,20 +3,21 @@
 StringResult::StringResult()
 {
     m_highlight= true;
-    m_resultTypes= Result::STRING;
+    m_resultTypes= static_cast<int>(Dice::RESULT_TYPE::STRING);
 }
 void StringResult::setText(QString text)
 {
     m_value= text;
 }
 StringResult::~StringResult() {}
-bool StringResult::hasResultOfType(RESULT_TYPE resultType) const
+bool StringResult::hasResultOfType(Dice::RESULT_TYPE resultType) const
 {
-    if(resultType & Result::STRING)
+
+    if(resultType == Dice::RESULT_TYPE::STRING)
     {
         return true;
     }
-    else if(resultType & Result::SCALAR)
+    else if(resultType == Dice::RESULT_TYPE::SCALAR)
     {
         bool ok= false;
         getText().toInt(&ok);
@@ -28,13 +29,13 @@ QString StringResult::getText() const
 {
     return m_value;
 }
-QVariant StringResult::getResult(RESULT_TYPE type)
+QVariant StringResult::getResult(Dice::RESULT_TYPE type)
 {
     switch(type)
     {
-    case STRING:
+    case Dice::RESULT_TYPE::STRING:
         return getText();
-    case SCALAR:
+    case Dice::RESULT_TYPE::SCALAR:
         return getText().toInt();
     default:
         return QVariant();
diff --git a/result/stringresult.h b/result/stringresult.h
index ec6c3ce..0e469fe 100644
--- a/result/stringresult.h
+++ b/result/stringresult.h
@@ -31,7 +31,7 @@ public:
      * @brief getScalar
      * @return
      */
-    virtual QVariant getResult(RESULT_TYPE);
+    virtual QVariant getResult(Dice::RESULT_TYPE);
     /**
      * @brief toString
      * @return
@@ -40,7 +40,7 @@ public:
 
     virtual void setHighLight(bool);
     virtual bool hasHighLight() const;
-    virtual bool hasResultOfType(RESULT_TYPE resultType) const;
+    virtual bool hasResultOfType(Dice::RESULT_TYPE resultType) const;
     virtual Result* getCopy() const;
 
 private: