aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/executionnode.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2015-04-29 07:44:25 +0200
committerRenaud G <renaud@rolisteam.org>2015-04-29 07:44:25 +0200
commit590fc6528b09bf1abbd90caf31053cd5ef6b439b (patch)
treed2dcbb2c751d9edf9b736a2fa5488fbcf41247dc /node/executionnode.cpp
parent942cf3f75f49d83c4e512d5350f7de69f0ec8aa7 (diff)
parent5c73a6cb13b8c301d0e60f916998c3e683a2b043 (diff)
downloadOneRoll-590fc6528b09bf1abbd90caf31053cd5ef6b439b.tar.gz
OneRoll-590fc6528b09bf1abbd90caf31053cd5ef6b439b.zip
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Diffstat (limited to 'node/executionnode.cpp')
-rw-r--r--node/executionnode.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/node/executionnode.cpp b/node/executionnode.cpp
index 0cb9c0b..dba56fc 100644
--- a/node/executionnode.cpp
+++ b/node/executionnode.cpp
@@ -32,8 +32,15 @@ ExecutionNode* ExecutionNode::getNextNode()
{
return m_nextNode;
}
-QList<ExecutionNode::ERROR_CODE> ExecutionNode::getErrorList()
+QMap<ExecutionNode::ERROR_CODE,QString> ExecutionNode::getExecutionErrorMap()
{
+ if(NULL!=m_nextNode)
+ {
+ foreach (ExecutionNode::ERROR_CODE key, m_nextNode->getExecutionErrorMap().keys())
+ {
+ m_errors.insert(key,m_nextNode->getExecutionErrorMap().value(key));
+ }
+ }
return m_errors;
}
QString ExecutionNode::getHelp()