summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/expr
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-11-20 13:49:31 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-11-20 13:49:31 +0100
commit7a3fd8444e71b11c1f5944983d17e9bd4f7bc6be (patch)
tree7c69e08aef10ad6ccbc0ce7c900afee83ac509c7 /src/xmlpatterns/expr
parent614a0dc2041ffbaf78331c247fa2acfff581cf86 (diff)
parentffd8366ad503649c6de365c427d0de15ab9a75db (diff)
downloadqtxmlpatterns-7a3fd8444e71b11c1f5944983d17e9bd4f7bc6be.tar.gz
Merge 5.10 into 5.10.0
Change-Id: I30123ba9baea5b669fe1e19112225f2e737c70e9
Diffstat (limited to 'src/xmlpatterns/expr')
-rw-r--r--src/xmlpatterns/expr/qexpressionsequence.cpp10
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.