clang format

1 files changed, 93 insertions, 97 deletions

diff --git a/node/ifnode.cpp b/node/ifnode.cpp
index 3a2cd95..fbcd9b9 100644
--- a/node/ifnode.cpp
+++ b/node/ifnode.cpp
@@ -1,137 +1,135 @@
 /***************************************************************************
-    *   Copyright (C) 2016 by Renaud Guezennec                                *
-    *   http://www.rolisteam.org/contact                   *
-    *                                                                         *
-    *   rolisteam is free software; you can redistribute it and/or modify     *
-    *   it under the terms of the GNU General Public License as published by  *
-    *   the Free Software Foundation; either version 2 of the License, or     *
-    *   (at your option) any later version.                                   *
-    *                                                                         *
-    *   This program is distributed in the hope that it will be useful,       *
-    *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-    *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-    *   GNU General Public License for more details.                          *
-    *                                                                         *
-    *   You should have received a copy of the GNU General Public License     *
-    *   along with this program; if not, write to the                         *
-    *   Free Software Foundation, Inc.,                                       *
-    *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-    ***************************************************************************/
+ *   Copyright (C) 2016 by Renaud Guezennec                                *
+ *   http://www.rolisteam.org/contact                   *
+ *                                                                         *
+ *   rolisteam is free software; you can redistribute it and/or modify     *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
 #include "ifnode.h"
 #include "result/diceresult.h"
 
-IfNode::IfNode()
-    : m_validator(nullptr),m_conditionType(AllOfThem),m_true(nullptr),m_false(nullptr)
+IfNode::IfNode() : m_validator(nullptr), m_conditionType(AllOfThem), m_true(nullptr), m_false(nullptr)
 {
-    //m_result = new DiceResult();
+    // m_result = new DiceResult();
 }
 
 IfNode::~IfNode()
 {
-    m_result=nullptr;
+    m_result= nullptr;
 }
 
-void IfNode::run(ExecutionNode *previous)
+void IfNode::run(ExecutionNode* previous)
 {
-    m_previousNode = previous;
-    if(nullptr==previous)
+    m_previousNode= previous;
+    if(nullptr == previous)
     {
         return;
     }
-    ExecutionNode* previousLoop = previous;
-    ExecutionNode* nextNode = nullptr;
-    bool runNext = (nullptr==m_nextNode) ? false : true;
-    Result* previousResult = previous->getResult();
-    m_result = previousResult;
+    ExecutionNode* previousLoop= previous;
+    ExecutionNode* nextNode= nullptr;
+    bool runNext= (nullptr == m_nextNode) ? false : true;
+    Result* previousResult= previous->getResult();
+    m_result= previousResult;
 
-    if(nullptr!=m_result)
+    if(nullptr != m_result)
     {
-        qreal value = previousResult->getResult(Result::SCALAR).toReal();
+        qreal value= previousResult->getResult(Result::SCALAR).toReal();
 
-        if(nullptr!=m_validator)
+        if(nullptr != m_validator)
         {
-            DiceResult* previousDiceResult = dynamic_cast<DiceResult*>(previousResult);
-            if(nullptr!=previousDiceResult)
+            DiceResult* previousDiceResult= dynamic_cast<DiceResult*>(previousResult);
+            if(nullptr != previousDiceResult)
             {
-                QList<Die*> diceList=previousDiceResult->getResultList();
+                QList<Die*> diceList= previousDiceResult->getResultList();
 
                 if(m_conditionType == OnEach)
                 {
                     for(Die* dice : diceList)
                     {
-                        if(m_validator->hasValid(dice,true,true))
+                        if(m_validator->hasValid(dice, true, true))
                         {
-                            nextNode = (nullptr==m_true) ? nullptr: m_true->getCopy();
+                            nextNode= (nullptr == m_true) ? nullptr : m_true->getCopy();
                         }
                         else
                         {
-                            nextNode = (nullptr==m_false) ? nullptr: m_false->getCopy();
+                            nextNode= (nullptr == m_false) ? nullptr : m_false->getCopy();
                         }
 
-                        if(nullptr!=nextNode)
+                        if(nullptr != nextNode)
                         {
-                            if(nullptr==previousLoop->getNextNode())
+                            if(nullptr == previousLoop->getNextNode())
                             {
                                 previousLoop->setNextNode(nextNode);
                             }
-                            if(nullptr==m_nextNode)
+                            if(nullptr == m_nextNode)
                             {
-                                m_nextNode = nextNode;
+                                m_nextNode= nextNode;
                             }
                             nextNode->run(previousLoop);
-                            previousLoop = getLeafNode(nextNode);
+                            previousLoop= getLeafNode(nextNode);
                         }
                     }
                 }
-                else if((m_conditionType == OneOfThem)||(m_conditionType == AllOfThem))
+                else if((m_conditionType == OneOfThem) || (m_conditionType == AllOfThem))
                 {
-                    bool trueForAll=true;
-                    bool falseForAll=true;
+                    bool trueForAll= true;
+                    bool falseForAll= true;
 
-                    bool oneIsTrue=false;
-                    bool oneIsFalse=false;
+                    bool oneIsTrue= false;
+                    bool oneIsFalse= false;
 
                     for(Die* dice : diceList)
                     {
-                        bool result = m_validator->hasValid(dice,true,true);
-                        trueForAll = trueForAll ? result : false;
-                        falseForAll = falseForAll ? result : false;
+                        bool result= m_validator->hasValid(dice, true, true);
+                        trueForAll= trueForAll ? result : false;
+                        falseForAll= falseForAll ? result : false;
 
-                        oneIsTrue |= result;
-                        oneIsFalse = !result ? true : oneIsFalse;
+                        oneIsTrue|= result;
+                        oneIsFalse= !result ? true : oneIsFalse;
                     }
-                    if(m_conditionType==OneOfThem)
+                    if(m_conditionType == OneOfThem)
                     {
                         if(oneIsTrue)
                         {
-                            nextNode = (nullptr==m_true) ? nullptr: m_true->getCopy();
+                            nextNode= (nullptr == m_true) ? nullptr : m_true->getCopy();
                         }
-                        else //if(oneIsFalse)
+                        else // if(oneIsFalse)
                         {
-                             nextNode = (nullptr==m_false) ? nullptr: m_false->getCopy();
+                            nextNode= (nullptr == m_false) ? nullptr : m_false->getCopy();
                         }
                     }
-                    else if(m_conditionType==AllOfThem)
+                    else if(m_conditionType == AllOfThem)
                     {
                         if(trueForAll)
                         {
-                            nextNode = (nullptr==m_true) ? nullptr: m_true->getCopy();
+                            nextNode= (nullptr == m_true) ? nullptr : m_true->getCopy();
                         }
-                        else //if(falseForAll)
+                        else // if(falseForAll)
                         {
-                            nextNode = (nullptr==m_false) ? nullptr: m_false->getCopy();
+                            nextNode= (nullptr == m_false) ? nullptr : m_false->getCopy();
                         }
                     }
 
-
-                    if(nullptr!=nextNode)
+                    if(nullptr != nextNode)
                     {
-                        if(nullptr==m_nextNode)
+                        if(nullptr == m_nextNode)
                         {
-                            m_nextNode = nextNode;
+                            m_nextNode= nextNode;
                         }
                         nextNode->run(previousLoop);
-                        previousLoop = getLeafNode(nextNode);
+                        previousLoop= getLeafNode(nextNode);
                     }
                 }
             }
@@ -139,31 +137,31 @@ void IfNode::run(ExecutionNode *previous)
 
         if(m_conditionType == OnScalar)
         {
-            Die* dice = new Die();
+            Die* dice= new Die();
             dice->setValue(value);
             dice->insertRollValue(value);
             dice->setMaxValue(value);
-            if(m_validator->hasValid(dice,true,true))
+            if(m_validator->hasValid(dice, true, true))
             {
-                    nextNode=m_true;
+                nextNode= m_true;
             }
             else
             {
-                    nextNode=m_false;
+                nextNode= m_false;
             }
-            if(nullptr!=nextNode)
+            if(nullptr != nextNode)
             {
-                if(nullptr==m_nextNode)
+                if(nullptr == m_nextNode)
                 {
-                    m_nextNode = nextNode;
+                    m_nextNode= nextNode;
                 }
                 nextNode->run(previousLoop);
-                previousLoop = getLeafNode(nextNode);
+                previousLoop= getLeafNode(nextNode);
             }
         }
     }
 
-    if((nullptr!=m_nextNode)&&(runNext))
+    if((nullptr != m_nextNode) && (runNext))
     {
         m_nextNode->run(previousLoop);
     }
@@ -171,32 +169,32 @@ void IfNode::run(ExecutionNode *previous)
 
 void IfNode::setValidator(Validator* val)
 {
-       m_validator = val;
+    m_validator= val;
 }
 void IfNode::setInstructionTrue(ExecutionNode* node)
 {
-    m_true = node;
+    m_true= node;
 }
 
 void IfNode::setInstructionFalse(ExecutionNode* node)
 {
-    m_false = node;
+    m_false= node;
 }
 void IfNode::generateDotTree(QString& s)
 {
     s.append(toString(true));
     s.append(";\n");
 
-    if((nullptr!=m_true)&&(m_true != m_nextNode))
+    if((nullptr != m_true) && (m_true != m_nextNode))
     {
         s.append(toString(false));
         s.append(" -> ");
         s.append(m_true->toString(false));
-        s.append("[label=\"true"+m_validator->toString()+"\"];\n");
+        s.append("[label=\"true" + m_validator->toString() + "\"];\n");
 
         m_true->generateDotTree(s);
     }
-    if((nullptr!=m_false)&&(m_false != m_nextNode))
+    if((nullptr != m_false) && (m_false != m_nextNode))
     {
         s.append(toString(false));
         s.append(" -> ");
@@ -205,7 +203,7 @@ void IfNode::generateDotTree(QString& s)
         m_false->generateDotTree(s);
     }
 
-    if(nullptr!=m_nextNode)
+    if(nullptr != m_nextNode)
     {
         s.append(toString(false));
         s.append(" -> ");
@@ -219,9 +217,8 @@ void IfNode::generateDotTree(QString& s)
         s.append(" -> ");
         s.append("nullptr;\n");
 
-        if(nullptr!=m_result)
+        if(nullptr != m_result)
         {
-
             s.append(toString(false));
             s.append(" ->");
             s.append(m_result->toString(false));
@@ -231,7 +228,7 @@ void IfNode::generateDotTree(QString& s)
     }
 }
 
-QString IfNode::toString(bool wl)  const
+QString IfNode::toString(bool wl) const
 {
     if(wl)
     {
@@ -250,10 +247,10 @@ qint64 IfNode::getPriority() const
 
 ExecutionNode* IfNode::getLeafNode(ExecutionNode* node)
 {
-    ExecutionNode* next = node;
-    while(nullptr != next->getNextNode() )
+    ExecutionNode* next= node;
+    while(nullptr != next->getNextNode())
     {
-        next = next->getNextNode();
+        next= next->getNextNode();
     }
     return next;
 }
@@ -263,31 +260,30 @@ IfNode::ConditionType IfNode::getConditionType() const
     return m_conditionType;
 }
 
-void IfNode::setConditionType(const IfNode::ConditionType &conditionType)
+void IfNode::setConditionType(const IfNode::ConditionType& conditionType)
 {
-    m_conditionType = conditionType;
+    m_conditionType= conditionType;
 }
 ExecutionNode* IfNode::getCopy() const
 {
-    IfNode* node = new IfNode();
+    IfNode* node= new IfNode();
 
     node->setConditionType(m_conditionType);
-    if(nullptr!=m_validator)
+    if(nullptr != m_validator)
     {
         node->setValidator(m_validator->getCopy());
     }
-    if(nullptr!=m_false)
+    if(nullptr != m_false)
     {
         node->setInstructionFalse(m_false->getCopy());
     }
-    if(nullptr!=m_true)
+    if(nullptr != m_true)
     {
         node->setInstructionTrue(m_true->getCopy());
     }
-    if(nullptr!=m_nextNode)
+    if(nullptr != m_nextNode)
     {
         node->setNextNode(m_nextNode->getCopy());
     }
     return node;
-
 }