From 37320ce7aa23c52f950a97c756a2d9c618467d1d Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Sat, 5 Mar 2016 12:50:09 +0100
Subject: change Error code to Dice Error code, fix compilation issue on
 windows

---
 diceparser.cpp              | 6 +++---
 diceparser.h                | 6 +++---
 node/executionnode.cpp      | 4 ++--
 node/executionnode.h        | 6 +++---
 node/scalaroperatornode.cpp | 6 +++---
 node/scalaroperatornode.h   | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/diceparser.cpp b/diceparser.cpp
index ba75b01..90d52e3 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -1028,13 +1028,13 @@ bool DiceParser::readBlocInstruction(QString& str,ExecutionNode*& resultnode)
     return false;
 }
 
-QMap<ExecutionNode::ERROR_CODE,QString>  DiceParser::getErrorMap()
+QMap<ExecutionNode::DICE_ERROR_CODE,QString>  DiceParser::getErrorMap()
 {
     return m_start->getExecutionErrorMap();
 }
 QString DiceParser::humanReadableError()
 {
-    QMapIterator<ExecutionNode::ERROR_CODE,QString> i(m_errorMap);
+    QMapIterator<ExecutionNode::DICE_ERROR_CODE,QString> i(m_errorMap);
 	QString str("");
     while (i.hasNext())
     {
@@ -1044,7 +1044,7 @@ QString DiceParser::humanReadableError()
     }
 
     ///list
-    QMapIterator<ExecutionNode::ERROR_CODE,QString> j(getErrorMap());
+    QMapIterator<ExecutionNode::DICE_ERROR_CODE,QString> j(getErrorMap());
     while(j.hasNext())
     {
         j.next();
diff --git a/diceparser.h b/diceparser.h
index 15a8a84..0df633b 100644
--- a/diceparser.h
+++ b/diceparser.h
@@ -184,7 +184,7 @@ public:
      * @brief getErrorList
      * @return
      */
-    QMap<ExecutionNode::ERROR_CODE,QString> getErrorMap();
+    QMap<ExecutionNode::DICE_ERROR_CODE,QString> getErrorMap();
     /**
      * @brief setPathToHelp set the path to the documentation, this path must be adatped to the lang of application etc…
      * @param l the path.
@@ -301,8 +301,8 @@ private:
     QList<DiceAlias*>* m_aliasList;
 	QStringList* m_commandList;
 
-    QMap<ExecutionNode::ERROR_CODE,QString> m_errorMap;
-    QMap<ExecutionNode::ERROR_CODE,QString> m_warningMap;
+    QMap<ExecutionNode::DICE_ERROR_CODE,QString> m_errorMap;
+    QMap<ExecutionNode::DICE_ERROR_CODE,QString> m_warningMap;
 
 
     ExecutionNode* m_start;
diff --git a/node/executionnode.cpp b/node/executionnode.cpp
index abcb7cf..c1dec73 100644
--- a/node/executionnode.cpp
+++ b/node/executionnode.cpp
@@ -33,11 +33,11 @@ ExecutionNode* ExecutionNode::getNextNode()
 {
     return m_nextNode;
 }
-QMap<ExecutionNode::ERROR_CODE,QString> ExecutionNode::getExecutionErrorMap()
+QMap<ExecutionNode::DICE_ERROR_CODE,QString> ExecutionNode::getExecutionErrorMap()
 {
     if(NULL!=m_nextNode)
     {
-        foreach (ExecutionNode::ERROR_CODE key, m_nextNode->getExecutionErrorMap().keys())
+        foreach (ExecutionNode::DICE_ERROR_CODE key, m_nextNode->getExecutionErrorMap().keys())
         {
             m_errors.insert(key,m_nextNode->getExecutionErrorMap().value(key));
         }
diff --git a/node/executionnode.h b/node/executionnode.h
index 2531ced..c015595 100644
--- a/node/executionnode.h
+++ b/node/executionnode.h
@@ -10,7 +10,7 @@
 class ExecutionNode
 {
 public:
-    enum ERROR_CODE {NO_ERROR,DIE_RESULT_EXPECTED,BAD_SYNTAXE,ENDLESS_LOOP_ERROR,DIVIDE_BY_ZERO,NOTHING_UNDERSTOOD,NO_DICE_TO_ROLL,TOO_MANY_DICE};
+    enum DICE_ERROR_CODE {NO_DICE_ERROR,DIE_RESULT_EXPECTED,BAD_SYNTAXE,ENDLESS_LOOP_ERROR,DIVIDE_BY_ZERO,NOTHING_UNDERSTOOD,NO_DICE_TO_ROLL,TOO_MANY_DICE};
     /**
      * @brief ExecutionNode
      */
@@ -57,7 +57,7 @@ public:
      * @brief getErrorList
      * @return
      */
-    virtual QMap<ExecutionNode::ERROR_CODE,QString> getExecutionErrorMap();
+    virtual QMap<ExecutionNode::DICE_ERROR_CODE,QString> getExecutionErrorMap();
 
     /**
      * @brief generateDotTree
@@ -85,7 +85,7 @@ protected:
     /**
      * @brief m_errors
      */
-    QMap<ExecutionNode::ERROR_CODE,QString> m_errors;
+    QMap<ExecutionNode::DICE_ERROR_CODE,QString> m_errors;
 
 	QString m_id;
 };
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp
index 22bbdac..d4c691c 100644
--- a/node/scalaroperatornode.cpp
+++ b/node/scalaroperatornode.cpp
@@ -217,18 +217,18 @@ void ScalarOperatorNode::generateDotTree(QString& s)
     }
     s.append(str);
 }
-QMap<ExecutionNode::ERROR_CODE,QString> ScalarOperatorNode::getExecutionErrorMap()
+QMap<ExecutionNode::DICE_ERROR_CODE,QString> ScalarOperatorNode::getExecutionErrorMap()
 {
     if(NULL!=m_internalNode)
     {
-        foreach (ExecutionNode::ERROR_CODE key, m_internalNode->getExecutionErrorMap().keys())
+        foreach (ExecutionNode::DICE_ERROR_CODE key, m_internalNode->getExecutionErrorMap().keys())
         {
             m_errors.insert(key,m_internalNode->getExecutionErrorMap().value(key));
         }
     }
     if(NULL!=m_nextNode)
     {
-        foreach (ExecutionNode::ERROR_CODE key, m_nextNode->getExecutionErrorMap().keys())
+        foreach (ExecutionNode::DICE_ERROR_CODE key, m_nextNode->getExecutionErrorMap().keys())
         {
             m_errors.insert(key,m_nextNode->getExecutionErrorMap().value(key));
         }
diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h
index a8f930a..06f121b 100644
--- a/node/scalaroperatornode.h
+++ b/node/scalaroperatornode.h
@@ -50,7 +50,7 @@ public:
      * @brief getErrorList
      * @return
      */
-    virtual QMap<ExecutionNode::ERROR_CODE,QString> getExecutionErrorMap();
+    virtual QMap<ExecutionNode::DICE_ERROR_CODE,QString> getExecutionErrorMap();
 
     ScalarOperatorNode::ArithmeticOperator getArithmeticOperator() const;
     void setArithmeticOperator(const ScalarOperatorNode::ArithmeticOperator &arithmeticOperator);
-- 
cgit v1.2.3-70-g09d2