diff options
| author |   Renaud G <renaud@rolisteam.org> | 2019-07-10 11:53:11 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2019-07-12 22:06:40 +0200 |
| commit | 2b1abc365f2d7b262e92e3d418a41e4f6d981fcb (patch) | |
| tree | dd113ed7a25368d75f44b9cc942f15ea566af039 /node | |
| parent | fb12f7ea65cf14398b5d23ffa1a56c78dc3e58b3 (diff) | |
| download | OneRoll-2b1abc365f2d7b262e92e3d418a41e4f6d981fcb.tar.gz OneRoll-2b1abc365f2d7b262e92e3d418a41e4f6d981fcb.zip | |
use copy constructor instead of assignement
Diffstat (limited to 'node')
| -rw-r--r-- | node/explodedicenode.cpp | 4 | ||||
| -rw-r--r-- | node/filternode.cpp | 4 | ||||
| -rw-r--r-- | node/jumpbackwardnode.cpp | 4 | ||||
| -rw-r--r-- | node/keepdiceexecnode.cpp | 4 | ||||
| -rw-r--r-- | node/mergenode.cpp | 4 | ||||
| -rw-r--r-- | node/rerolldicenode.cpp | 4 | ||||
| -rw-r--r-- | node/uniquenode.cpp | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/node/explodedicenode.cpp b/node/explodedicenode.cpp index 6df64ba..704ac8a 100644 --- a/node/explodedicenode.cpp +++ b/node/explodedicenode.cpp @@ -15,8 +15,8 @@ void ExplodeDiceNode::run(ExecutionNode* previous) { for(auto& die : previous_result->getResultList()) { - Die* tmpdie= new Die(); - *tmpdie= *die; + Die* tmpdie= new Die(*die); +// *tmpdie= *die; m_diceResult->insertResult(tmpdie); die->displayed(); } diff --git a/node/filternode.cpp b/node/filternode.cpp index bda9c20..d5d155a 100644 --- a/node/filternode.cpp +++ b/node/filternode.cpp @@ -34,8 +34,8 @@ void FilterNode::run(ExecutionNode* previous) { if(m_validator->hasValid(tmp, m_eachValue)) { - Die* tmpdie= new Die(); - *tmpdie= *tmp; + Die* tmpdie= new Die(*tmp); + //*tmpdie= *tmp; diceList2.append(tmpdie); tmp->displayed(); } diff --git a/node/jumpbackwardnode.cpp b/node/jumpbackwardnode.cpp index 83bdb1e..15c7063 100644 --- a/node/jumpbackwardnode.cpp +++ b/node/jumpbackwardnode.cpp @@ -128,8 +128,8 @@ void JumpBackwardNode::run(ExecutionNode* previous) { for(auto& die : diceResult->getResultList()) { - Die* tmpdie= new Die(); - *tmpdie= *die; + Die* tmpdie= new Die(*die); + //*tmpdie= *die; m_diceResult->insertResult(tmpdie); die->displayed(); } diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp index bad2370..42b4c40 100644 --- a/node/keepdiceexecnode.cpp +++ b/node/keepdiceexecnode.cpp @@ -50,8 +50,8 @@ void KeepDiceExecNode::run(ExecutionNode* previous) for(Die* die : diceList3) { - Die* tmpdie= new Die(); - *tmpdie= *die; + Die* tmpdie= new Die(*die); + //*tmpdie= *die; diceList2.append(tmpdie); die->displayed(); } diff --git a/node/mergenode.cpp b/node/mergenode.cpp index e708cef..4a11a76 100644 --- a/node/mergenode.cpp +++ b/node/mergenode.cpp @@ -61,8 +61,8 @@ void MergeNode::run(ExecutionNode* previous) { if(!m_diceResult->getResultList().contains(die) && (!die->hasBeenDisplayed())) { - Die* tmpdie= new Die(); - *tmpdie= *die; + Die* tmpdie= new Die(*die); + //*tmpdie= *die; die->displayed(); m_diceResult->getResultList().append(tmpdie); } diff --git a/node/rerolldicenode.cpp b/node/rerolldicenode.cpp index 659e9c0..56ee6d9 100644 --- a/node/rerolldicenode.cpp +++ b/node/rerolldicenode.cpp @@ -25,8 +25,8 @@ void RerollDiceNode::run(ExecutionNode* previous) { for(auto& die : previous_result->getResultList()) { - Die* tmpdie= new Die(); - *tmpdie= *die; + Die* tmpdie= new Die(*die); + //*tmpdie= *die; m_diceResult->insertResult(tmpdie); die->displayed(); } diff --git a/node/uniquenode.cpp b/node/uniquenode.cpp index 4ef7fa6..e937c6d 100644 --- a/node/uniquenode.cpp +++ b/node/uniquenode.cpp @@ -50,8 +50,8 @@ void UniqueNode::run(ExecutionNode* previous) if(it == formerValues.end()) { - auto die = new Die(); - *die = *oldDie; + auto die = new Die(*oldDie); + //*die = *oldDie; m_diceResult->insertResult(die); formerValues.push_back(value); } |