From f2051fb35b1ad49c4d940e6fbba2acc98b216e13 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Tue, 12 Feb 2019 23:59:24 +0100 Subject: clang format --- node/groupnode.h | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'node/groupnode.h') diff --git a/node/groupnode.h b/node/groupnode.h index 4c1b74c..e09bf19 100644 --- a/node/groupnode.h +++ b/node/groupnode.h @@ -1,30 +1,30 @@ /*************************************************************************** -* 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 GROUPNODE_H #define GROUPNODE_H #include "node/executionnode.h" #include "result/scalarresult.h" -//typedef QList DieGroup; +// typedef QList DieGroup; class DieGroup : public QList { @@ -38,8 +38,7 @@ public: void setExceptedValue(qint64 exceptedValue); private: - qint64 m_exceptedValue = 0; - + qint64 m_exceptedValue= 0; }; /** * @brief The GroupNode class is an ExecutionNode. @@ -49,16 +48,18 @@ class GroupNode : public ExecutionNode public: GroupNode(); void run(ExecutionNode* previous); - virtual QString toString(bool withLabel)const; + virtual QString toString(bool withLabel) const; virtual qint64 getPriority() const; - virtual ExecutionNode *getCopy() const; + virtual ExecutionNode* getCopy() const; int getGroupValue() const; void setGroupValue(qint64 groupValue); QList getGroup(DieGroup); + protected: bool composeWithPrevious(DieGroup previous, qint64 first, qint64 current, DieGroup& addValue); + private: ScalarResult* m_scalarResult; qint64 m_groupValue; -- cgit v1.2.3-70-g09d2