From 13e297604b00615d47352538e3c82ea1ac700d4c Mon Sep 17 00:00:00 2001 From: Renaud G Date: Mon, 28 Nov 2016 00:36:15 +0100 Subject: -Add API for copying a branch of execution node. -Allow to use if node several times. --- compositevalidator.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'compositevalidator.cpp') diff --git a/compositevalidator.cpp b/compositevalidator.cpp index 2de9dba..fce4260 100644 --- a/compositevalidator.cpp +++ b/compositevalidator.cpp @@ -26,6 +26,15 @@ CompositeValidator::CompositeValidator() : m_operators(NULL),m_validatorList(NULL) { } + +CompositeValidator::~CompositeValidator() +{ + qDeleteAll(*m_validatorList); + if(NULL!=m_operators) + { + delete m_operators; + } +} qint64 CompositeValidator::hasValid(Die* b,bool recursive,bool unhighlight) const { @@ -87,7 +96,7 @@ quint64 CompositeValidator::getValidRangeSize(quint64 faces) const { quint64 sum =0; int i = -1; - foreach(Validator* tmp,*m_validatorList) + for(Validator* tmp :*m_validatorList) { quint64 rel = tmp->getValidRangeSize(faces); LogicOperation opt; @@ -117,3 +126,19 @@ void CompositeValidator::setValidatorList(QList* m) { m_validatorList = m; } +Validator* CompositeValidator::getCopy() const +{ + QVector* vector = new QVector(); + *vector = *m_operators; + + QList* list= new QList(); + for(auto val : *m_validatorList) + { + list->append(val->getCopy()); + } + + CompositeValidator* val = new CompositeValidator(); + val->setOperationList(vector); + val->setValidatorList(list); + return val; +} -- cgit v1.2.3-70-g09d2