diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-07 22:54:37 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-07 22:54:37 (GMT) |
| commit | d8606497762f569807001954ff6b670b957c5049 (patch) | |
| tree | 33059ad4ff1445621f6806a9759d774e796e5414 /src/xmlpatterns | |
| parent | 5fb8157047aca69c68438054ca7ea47ae595f428 (diff) | |
| parent | 6c067866db65f113237a4c28374317c948da8ba9 (diff) | |
| download | Qt-d8606497762f569807001954ff6b670b957c5049.zip Qt-d8606497762f569807001954ff6b670b957c5049.tar.gz Qt-d8606497762f569807001954ff6b670b957c5049.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
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 |