diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-13 13:22:21 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-13 13:22:21 (GMT) |
| commit | f15352c51625688ec445c73125a2e25327377d49 (patch) | |
| tree | 0d7d82d8ea8ffeff5cf042cd70af3200ec6f1925 /src/xmlpatterns | |
| parent | c8c5becc81679eb8a9a0f8baa454bc43fd3cccf9 (diff) | |
| parent | 0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9 (diff) | |
| download | Qt-f15352c51625688ec445c73125a2e25327377d49.zip Qt-f15352c51625688ec445c73125a2e25327377d49.tar.gz Qt-f15352c51625688ec445c73125a2e25327377d49.tar.bz2 | |
Merge commit 'qt/master'
Diffstat (limited to 'src/xmlpatterns')
| -rw-r--r-- | src/xmlpatterns/expr/qapplytemplate.cpp | 3 | ||||
| -rw-r--r-- | src/xmlpatterns/functions/qsequencefns.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/xmlpatterns/expr/qapplytemplate.cpp b/src/xmlpatterns/expr/qapplytemplate.cpp index 95f4fdf..b91c2f0 100644 --- a/src/xmlpatterns/expr/qapplytemplate.cpp +++ b/src/xmlpatterns/expr/qapplytemplate.cpp @@ -160,8 +160,7 @@ Item::Iterator::Ptr ApplyTemplate::evaluateSequence(const DynamicContext::Ptr &c focus->setFocusIterator(focusIterator); return makeSequenceMappingIterator<Item>(ConstPtr(this), focusIterator, focus); } - else - return CommonValues::emptyIterator; + return CommonValues::emptyIterator; } } diff --git a/src/xmlpatterns/functions/qsequencefns.cpp b/src/xmlpatterns/functions/qsequencefns.cpp index f6d5391..faa787e 100644 --- a/src/xmlpatterns/functions/qsequencefns.cpp +++ b/src/xmlpatterns/functions/qsequencefns.cpp @@ -246,8 +246,7 @@ Item::Iterator::Ptr SubsequenceFN::evaluateSequence(const DynamicContext::Ptr &c if(length < 1 && length != -1) return CommonValues::emptyIterator; - else - return Item::Iterator::Ptr(new SubsequenceIterator(it, startingLoc, length)); + return Item::Iterator::Ptr(new SubsequenceIterator(it, startingLoc, length)); } Item SubsequenceFN::evaluateSingleton(const DynamicContext::Ptr &context) const |