diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:12:02 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:12:02 +0100 |
commit | ffd8366ad503649c6de365c427d0de15ab9a75db (patch) | |
tree | a43b8a9bd245a81e1d9dfae8f672beefd8bc4023 /src/xmlpatterns/expr/qexpressionsequence.cpp | |
parent | 40a50c0c585eaa838261742e33a547e09d4040d6 (diff) | |
parent | 0b20348321b0c5663e46f293ed0ceb3c68594e63 (diff) | |
download | qtxmlpatterns-ffd8366ad503649c6de365c427d0de15ab9a75db.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Idcfaa401ee18ab56f63d2089eca666be12abadcd
Diffstat (limited to 'src/xmlpatterns/expr/qexpressionsequence.cpp')
-rw-r--r-- | src/xmlpatterns/expr/qexpressionsequence.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xmlpatterns/expr/qexpressionsequence.cpp b/src/xmlpatterns/expr/qexpressionsequence.cpp index 193e15f..d796de4 100644 --- a/src/xmlpatterns/expr/qexpressionsequence.cpp +++ b/src/xmlpatterns/expr/qexpressionsequence.cpp @@ -46,6 +46,9 @@ #include "qexpressionsequence_p.h" +#include <algorithm> +#include <iterator> + QT_BEGIN_NAMESPACE using namespace QPatternist; @@ -109,11 +112,8 @@ Expression::Ptr ExpressionSequence::compress(const StaticContext::Ptr &context) else if(Id == IDExpressionSequence) { /* Rewrite "(1, (2, 3), 4)" into "(1, 2, 3, 4)" */ - Expression::List::const_iterator seqIt((*it)->operands().constBegin()); - const Expression::List::const_iterator seqEnd((*it)->operands().constEnd()); - - for(; seqIt != seqEnd; ++seqIt) - result.append(*seqIt); + const auto &operands = (*it)->operands(); + std::copy(operands.cbegin(), operands.cend(), std::back_inserter(result)); } else if (Id == IDLiteralSequence) { /* Rewrite "(1, (2, 3), 4)" into "(1, 2, 3, 4)" */ // Note: LiteralSequence does not use the dynamic context, so we pass in a nullptr. |