diff options
| -rw-r--r-- | compositevalidator.cpp | 3 | ||||
| -rw-r--r-- | compositevalidator.h | 2 | ||||
| -rw-r--r-- | parsingtoolbox.cpp | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/compositevalidator.cpp b/compositevalidator.cpp index 4689678..bbf8c0f 100644 --- a/compositevalidator.cpp +++ b/compositevalidator.cpp @@ -109,7 +109,7 @@ quint64 CompositeValidator::getValidRangeSize(quint64 faces) const for(Validator* tmp :*m_validatorList) { quint64 rel = tmp->getValidRangeSize(faces); - LogicOperation opt; + LogicOperation opt = NONE; if(i>=0) { opt = m_operators->at(i); @@ -122,6 +122,7 @@ quint64 CompositeValidator::getValidRangeSize(quint64 faces) const { sum = qMax(rel,sum); } + ++i; } diff --git a/compositevalidator.h b/compositevalidator.h index 788cd10..c42cc34 100644 --- a/compositevalidator.h +++ b/compositevalidator.h @@ -35,7 +35,7 @@ class CompositeValidator : public Validator { public: - enum LogicOperation { OR, EXCLUSIVE_OR , AND}; + enum LogicOperation { OR, EXCLUSIVE_OR , AND, NONE}; CompositeValidator(); virtual ~CompositeValidator(); diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index 37c998e..2e383ba 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -274,6 +274,7 @@ Validator* ParsingToolBox::readCompositeValidator(QString& str) } else { + delete operators; return tmp; } tmp = nullptr; @@ -289,6 +290,7 @@ Validator* ParsingToolBox::readCompositeValidator(QString& str) } else { + delete operators; return nullptr; } } |