diff options
| author | 2019-02-12 23:59:24 +0100 | |
|---|---|---|
| committer | 2019-02-12 23:59:24 +0100 | |
| commit | f2051fb35b1ad49c4d940e6fbba2acc98b216e13 (patch) | |
| tree | 03117f493191d35104ac37eba72e916d41c849f2 /result/diceresult.h | |
| parent | 210a222b894caa3c8af38ccb6653db0fd8491f6e (diff) | |
| download | OneRoll-f2051fb35b1ad49c4d940e6fbba2acc98b216e13.tar.gz OneRoll-f2051fb35b1ad49c4d940e6fbba2acc98b216e13.zip | |
clang format
Diffstat (limited to 'result/diceresult.h')
| -rw-r--r-- | result/diceresult.h | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/result/diceresult.h b/result/diceresult.h index 8ea807a..54e0b57 100644 --- a/result/diceresult.h +++ b/result/diceresult.h @@ -1,24 +1,24 @@ /*************************************************************************** -* 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 DICERESULT_H #define DICERESULT_H #include <QList> @@ -36,10 +36,10 @@ public: * @brief DiceResult */ DiceResult(); - /** - * @brief ~DiceResult - */ - virtual ~DiceResult(); + /** + * @brief ~DiceResult + */ + virtual ~DiceResult(); /** * @brief getResultList @@ -66,7 +66,7 @@ public: * @brief toString * @return */ - virtual QString toString(bool wl); + virtual QString toString(bool wl); /** * @brief isHomogeneous */ @@ -77,14 +77,16 @@ public: void setHomogeneous(bool); Die::ArithmeticOperator getOperator() const; - void setOperator(const Die::ArithmeticOperator & dieOperator); - bool contains(Die *die, const std::function<bool (const Die *, const Die *)> equal); + void setOperator(const Die::ArithmeticOperator& dieOperator); + bool contains(Die* die, const std::function<bool(const Die*, const Die*)> equal); void clear(); virtual Result* getCopy() const; + private: qreal getScalarResult(); + private: QList<Die*> m_diceValues; bool m_homogeneous; |