clang format

1 files changed, 55 insertions, 63 deletions

diff --git a/operationcondition.cpp b/operationcondition.cpp
index 3949799..53a994d 100644
--- a/operationcondition.cpp
+++ b/operationcondition.cpp
@@ -1,55 +1,50 @@
 /***************************************************************************
-    *   Copyright (C) 2015 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) 2015 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 "operationcondition.h"
 
-OperationCondition::OperationCondition()
-    : m_operator(Modulo),m_boolean(nullptr),m_value(nullptr)
-{
-
-}
+OperationCondition::OperationCondition() : m_operator(Modulo), m_boolean(nullptr), m_value(nullptr) {}
 OperationCondition::~OperationCondition()
 {
-    if(m_value!= nullptr)
+    if(m_value != nullptr)
     {
         delete m_value;
-        m_value = nullptr;
+        m_value= nullptr;
     }
 }
-BooleanCondition *OperationCondition::getBoolean() const
+BooleanCondition* OperationCondition::getBoolean() const
 {
     return m_boolean;
 }
 
-void OperationCondition::setBoolean(BooleanCondition *boolean)
+void OperationCondition::setBoolean(BooleanCondition* boolean)
 {
-    m_boolean = boolean;
+    m_boolean= boolean;
 }
 
-
-qint64 OperationCondition::hasValid(Die* b,bool recursive,bool unhighlight) const
+qint64 OperationCondition::hasValid(Die* b, bool recursive, bool unhighlight) const
 {
     QList<qint64> listValues;
     if(recursive)
     {
-        listValues = b->getListValue();
+        listValues= b->getListValue();
     }
     else
     {
@@ -57,31 +52,30 @@ qint64 OperationCondition::hasValid(Die* b,bool recursive,bool unhighlight) cons
     }
 
     qint64 sum= 0;
-    for(qint64& value: listValues)
+    for(qint64& value : listValues)
     {
         switch(m_operator)
         {
-            case Modulo:
-            {
-                Die die;
-                die.setMaxValue(b->getMaxValue());
-                auto valueScalar = valueToScalar();
-                if(valueScalar==0)
-                    valueScalar = 1;
-                die.insertRollValue(value%valueScalar);
-                sum+=m_boolean->hasValid(&die,recursive,false);
-            }
-            break;
-
+        case Modulo:
+        {
+            Die die;
+            die.setMaxValue(b->getMaxValue());
+            auto valueScalar= valueToScalar();
+            if(valueScalar == 0)
+                valueScalar= 1;
+            die.insertRollValue(value % valueScalar);
+            sum+= m_boolean->hasValid(&die, recursive, false);
+        }
+        break;
         }
     }
-    if((unhighlight)&&(sum==0))
+    if((unhighlight) && (sum == 0))
     {
         b->setHighlighted(false);
     }
     else
     {
-         b->setHighlighted(true);
+        b->setHighlighted(true);
     }
 
     return sum;
@@ -89,18 +83,18 @@ qint64 OperationCondition::hasValid(Die* b,bool recursive,bool unhighlight) cons
 
 void OperationCondition::setOperator(ConditionOperator m)
 {
-    m_operator = m;
+    m_operator= m;
 }
 
-void OperationCondition::setValueNode(ExecutionNode *node)
+void OperationCondition::setValueNode(ExecutionNode* node)
 {
-    m_value = node;
+    m_value= node;
 }
 
 QString OperationCondition::toString()
 {
     QString str("");
-    switch (m_operator)
+    switch(m_operator)
     {
     case Modulo:
         str.append(QStringLiteral("\\%"));
@@ -108,28 +102,26 @@ QString OperationCondition::toString()
     }
     return QStringLiteral("[%1%2%3]").arg(str).arg(valueToScalar()).arg(m_boolean->toString());
 }
-bool OperationCondition::isValidRangeSize(std::pair<qint64,qint64>) const
+bool OperationCondition::isValidRangeSize(std::pair<qint64, qint64>) const
 {
-   auto value = valueToScalar();
-   bool valid = true;
+    auto value= valueToScalar();
+    bool valid= true;
 
-   if(value==0)
-       valid = false;
- /*  else if(nullptr != m_boolean)
-       valid = m_boolean->isValidRangeSize(range);*/
-
-   return valid;
+    if(value == 0)
+        valid= false;
+    /*  else if(nullptr != m_boolean)
+          valid = m_boolean->isValidRangeSize(range);*/
 
+    return valid;
 }
 Validator* OperationCondition::getCopy() const
 {
-    OperationCondition* val = new OperationCondition();
+    OperationCondition* val= new OperationCondition();
     val->setOperator(m_operator);
     val->setValueNode(m_value->getCopy());
-    BooleanCondition* boolean = dynamic_cast<BooleanCondition*>(m_boolean->getCopy());
+    BooleanCondition* boolean= dynamic_cast<BooleanCondition*>(m_boolean->getCopy());
     val->setBoolean(boolean);
     return val;
-
 }
 
 qint64 OperationCondition::valueToScalar() const
@@ -138,6 +130,6 @@ qint64 OperationCondition::valueToScalar() const
         return 0;
 
     m_value->run(nullptr);
-    auto result = m_value->getResult();
+    auto result= m_value->getResult();
     return result->getResult(Result::SCALAR).toInt();
 }