diff options
| author | 2019-07-28 02:39:54 +0200 | |
|---|---|---|
| committer | 2019-07-28 02:39:54 +0200 | |
| commit | b720a51745b5473cd9054cb0ed7493017ace23b1 (patch) | |
| tree | 63058f89b3e67f4204f543115c8dc1dac9500049 /parsingtoolbox.cpp | |
| parent | fdacc438532892b7c76bb33d9f8774724c56f90c (diff) | |
| download | OneRoll-b720a51745b5473cd9054cb0ed7493017ace23b1.tar.gz OneRoll-b720a51745b5473cd9054cb0ed7493017ace23b1.zip | |
remove use of pointer
Diffstat (limited to 'parsingtoolbox.cpp')
| -rw-r--r-- | parsingtoolbox.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index 7caeefe..4372b41 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -281,16 +281,16 @@ Validator* ParsingToolBox::readCompositeValidator(QString& str) Validator* tmp= readValidator(str, expectSquareBrasket); CompositeValidator::LogicOperation opLogic; - QVector<CompositeValidator::LogicOperation>* operators= new QVector<CompositeValidator::LogicOperation>(); - QList<Validator*>* validatorList= new QList<Validator*>(); + QVector<CompositeValidator::LogicOperation> operators; + QList<Validator*> validatorList; while(nullptr != tmp) { bool hasOperator= readLogicOperation(str, opLogic); if(hasOperator) { - operators->append(opLogic); - validatorList->append(tmp); + operators.append(opLogic); + validatorList.append(tmp); tmp= readValidator(str, expectSquareBrasket); } else @@ -301,19 +301,19 @@ Validator* ParsingToolBox::readCompositeValidator(QString& str) // isOk=true; } - if(!validatorList->isEmpty()) + if(!validatorList.isEmpty()) { - validatorList->append(tmp); + validatorList.append(tmp); } else { - delete operators; + operators.clear(); return tmp; } tmp= nullptr; } } - if(!validatorList->isEmpty()) + if(!validatorList.isEmpty()) { CompositeValidator* validator= new CompositeValidator(); validator->setOperationList(operators); @@ -322,7 +322,6 @@ Validator* ParsingToolBox::readCompositeValidator(QString& str) } else { - delete operators; return nullptr; } } |