diff options
Diffstat (limited to 'node/scalaroperatornode.h')
| -rw-r--r-- | node/scalaroperatornode.h | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h index 04c3c23..2ac89b0 100644 --- a/node/scalaroperatornode.h +++ b/node/scalaroperatornode.h @@ -1,34 +1,33 @@ /*************************************************************************** -* Copyright (C) 2014 by Renaud Guezennec * -* http://www.rolisteam.org/contact * -* * -* This file is part of DiceParser * -* * -* DiceParser 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) 2014 by Renaud Guezennec * + * http://www.rolisteam.org/contact * + * * + * This file is part of DiceParser * + * * + * DiceParser 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. * + ***************************************************************************/ #ifndef SCALAROPERATORNODE_H #define SCALAROPERATORNODE_H -#include <QMap> #include <QChar> +#include <QMap> +#include "die.h" #include "executionnode.h" #include "result/scalarresult.h" -#include "die.h" - /** * @brief The ScalarOperatorNode class @@ -39,7 +38,7 @@ public: /** * @brief The ArithmeticOperator enum */ - //enum ArithmeticOperator {PLUS,MINUS,DIVIDE,MULTIPLICATION}; + // enum ArithmeticOperator {PLUS,MINUS,DIVIDE,MULTIPLICATION}; /** * @brief ScalarOperatorNode */ @@ -62,7 +61,7 @@ public: * @param wl * @return */ - virtual QString toString(bool wl)const; + virtual QString toString(bool wl) const; /** * @brief getPriority * @return @@ -77,7 +76,7 @@ public: * @brief getErrorList * @return */ - virtual QMap<ExecutionNode::DICE_ERROR_CODE,QString> getExecutionErrorMap(); + virtual QMap<ExecutionNode::DICE_ERROR_CODE, QString> getExecutionErrorMap(); /** * @brief getArithmeticOperator * @return @@ -87,35 +86,35 @@ public: * @brief setArithmeticOperator * @param arithmeticOperator */ - void setArithmeticOperator(const Die::ArithmeticOperator &arithmeticOperator); + void setArithmeticOperator(const Die::ArithmeticOperator& arithmeticOperator); /** * @brief getCopy * @return */ - virtual ExecutionNode *getCopy() const; + virtual ExecutionNode* getCopy() const; private: /** * @brief add * @return */ - static qint64 add(qreal,qreal); + static qint64 add(qreal, qreal); /** * @brief substract * @return */ - static qint64 substract(qreal,qreal); + static qint64 substract(qreal, qreal); /** * @brief divide not static because of error management * @return */ - qreal divide(qreal,qreal); + qreal divide(qreal, qreal); /** * @brief multiple * @return */ - static qint64 multiple(qreal,qreal); + static qint64 multiple(qreal, qreal); static qint64 pow(qreal a, qreal b); @@ -126,4 +125,3 @@ private: }; #endif // SCALAROPERATORNODE_H - |