diff options
| author | 2019-07-25 09:59:29 +0200 | |
|---|---|---|
| committer | 2019-07-25 09:59:29 +0200 | |
| commit | bb6b87a2685c0d71b5c38be33c100f85ac0b9cee (patch) | |
| tree | 81da599ceec1368e55fee5fd6a4dd0173fc39b5f /node/mergenode.cpp | |
| parent | 6f499de159eeac37fe473f945042e13359dc2d40 (diff) | |
| download | OneRoll-bb6b87a2685c0d71b5c38be33c100f85ac0b9cee.tar.gz OneRoll-bb6b87a2685c0d71b5c38be33c100f85ac0b9cee.zip | |
Rework of the component to be a proper lib
Diffstat (limited to 'node/mergenode.cpp')
| -rw-r--r-- | node/mergenode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node/mergenode.cpp b/node/mergenode.cpp index 4a11a76..c4c1543 100644 --- a/node/mergenode.cpp +++ b/node/mergenode.cpp @@ -29,7 +29,7 @@ void MergeNode::run(ExecutionNode* previous) { if(nullptr == previous) { - m_errors.insert(ExecutionNode::NO_PREVIOUS_ERROR, QObject::tr("No previous node before Merge operator")); + m_errors.insert(Dice::ERROR_CODE::NO_PREVIOUS_ERROR, QObject::tr("No previous node before Merge operator")); return; } @@ -69,7 +69,7 @@ void MergeNode::run(ExecutionNode* previous) } } auto it= std::find_if(pastResult.begin(), pastResult.end(), - [tmpResult](const Result* a) { return (a == tmpResult->getPrevious()); }); + [tmpResult](const Result* a) { return (a == tmpResult->getPrevious()); }); if(it == pastResult.end()) { pastResult.push_back(previousLast->getResult()); |