aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node
diff options
context:
space:
mode:
Diffstat (limited to 'node')
-rw-r--r--node/executionnode.cpp4
-rw-r--r--node/executionnode.h6
-rw-r--r--node/scalaroperatornode.cpp6
-rw-r--r--node/scalaroperatornode.h2
4 files changed, 9 insertions, 9 deletions
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);