aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/mergenode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'node/mergenode.cpp')
-rw-r--r--node/mergenode.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/node/mergenode.cpp b/node/mergenode.cpp
index 16a6649..5e65df3 100644
--- a/node/mergenode.cpp
+++ b/node/mergenode.cpp
@@ -41,7 +41,7 @@ void MergeNode::run(ExecutionNode* previous)
{
///@todo improve here to set homogeneous while is really
m_diceResult->setHomogeneous(false);
- foreach(Die* die, dice->getResultList())
+ for(Die* die : dice->getResultList())
{
if(!m_diceResult->getResultList().contains(die))
{
@@ -62,7 +62,7 @@ QString MergeNode::toString(bool withLabel) const
{
if(withLabel)
{
- return QString("%1 [label=\"Merge Node %2\"]").arg(m_id).arg(m_number);
+ return QString("%1 [label=\"Merge Node\"]").arg(m_id);
}
else
{
@@ -78,3 +78,13 @@ qint64 MergeNode::getPriority() const
}
return priority;
}
+ExecutionNode* MergeNode::getCopy() const
+{
+ MergeNode* node = new MergeNode();
+ if(NULL!=m_nextNode)
+ {
+ node->setNextNode(m_nextNode->getCopy());
+ }
+ return node;
+
+}