diff options
| author | 2019-02-12 23:59:24 +0100 | |
|---|---|---|
| committer | 2019-02-12 23:59:24 +0100 | |
| commit | f2051fb35b1ad49c4d940e6fbba2acc98b216e13 (patch) | |
| tree | 03117f493191d35104ac37eba72e916d41c849f2 /range.cpp | |
| parent | 210a222b894caa3c8af38ccb6653db0fd8491f6e (diff) | |
| download | OneRoll-f2051fb35b1ad49c4d940e6fbba2acc98b216e13.tar.gz OneRoll-f2051fb35b1ad49c4d940e6fbba2acc98b216e13.zip | |
clang format
Diffstat (limited to 'range.cpp')
| -rw-r--r-- | range.cpp | 95 |
1 files changed, 45 insertions, 50 deletions
@@ -1,59 +1,54 @@ /*************************************************************************** -* 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. * + ***************************************************************************/ #include "range.h" -Range::Range() - : m_hasEnd(false),m_hasStart(false),m_emptyRange(false) +Range::Range() : m_hasEnd(false), m_hasStart(false), m_emptyRange(false) {} +void Range::setValue(qint64 s, qint64 e) { + m_start= s; + m_end= e; - + m_hasEnd= true; + m_hasStart= true; } -void Range::setValue(qint64 s,qint64 e) -{ - m_start = s; - m_end=e; - m_hasEnd = true; - m_hasStart = true; -} - -qint64 Range::hasValid(Die* m,bool recursive, bool unhighlight) const +qint64 Range::hasValid(Die* m, bool recursive, bool unhighlight) const { - qint64 result = 0; + qint64 result= 0; if(recursive) { for(qint64& value : m->getListValue()) { - if((value>=m_start)&&(value<=m_end)) + if((value >= m_start) && (value <= m_end)) { ++result; } } } - else if((m->getLastRolledValue()>=m_start)&&(m->getLastRolledValue()<=m_end)) + else if((m->getLastRolledValue() >= m_start) && (m->getLastRolledValue() <= m_end)) { ++result; } - if((unhighlight)&&(result==0)) + if((unhighlight) && (result == 0)) { m->setHighlighted(false); } @@ -61,24 +56,24 @@ qint64 Range::hasValid(Die* m,bool recursive, bool unhighlight) const } QString Range::toString() { - return QStringLiteral("[%1-%2]").arg(m_start).arg(m_end); + return QStringLiteral("[%1-%2]").arg(m_start).arg(m_end); } -bool Range::isValidRangeSize(std::pair<qint64,qint64> range) const -{ - auto newStart = qBound(range.first, m_start, range.second); - auto newEnd = qBound(range.first, m_end, range.second); +bool Range::isValidRangeSize(std::pair<qint64, qint64> range) const +{ + auto newStart= qBound(range.first, m_start, range.second); + auto newEnd= qBound(range.first, m_end, range.second); - return (newStart==m_start && newEnd == m_end && m_end>=m_start); + return (newStart == m_start && newEnd == m_end && m_end >= m_start); } void Range::setStart(qint64 start) { - m_start = start; - m_hasStart = true; + m_start= start; + m_hasStart= true; } void Range::setEnd(qint64 end) { - m_end = end; - m_hasEnd = true; + m_end= end; + m_hasEnd= true; } bool Range::isFullyDefined() const @@ -87,7 +82,7 @@ bool Range::isFullyDefined() const } qint64 Range::getStart() const { - return m_start; + return m_start; } qint64 Range::getEnd() const { @@ -95,7 +90,7 @@ qint64 Range::getEnd() const } void Range::setEmptyRange(bool b) { - m_emptyRange = b; + m_emptyRange= b; } bool Range::isEmptyRange() @@ -104,7 +99,7 @@ bool Range::isEmptyRange() } Validator* Range::getCopy() const { - Range* val = new Range(); + Range* val= new Range(); val->setEmptyRange(m_emptyRange); if(m_hasEnd) { @@ -114,5 +109,5 @@ Validator* Range::getCopy() const { val->setStart(m_start); } - return val; + return val; } |