diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-11 11:25:03 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-11 11:25:03 (GMT) |
| commit | b111d0bb1f0483d507c758810a0f247cb8dd82c0 (patch) | |
| tree | 9db9a693360c607a53d1ec8c3c421b338fb53fef /src/xmlpatterns | |
| parent | 3e2c214dc217ac677733e2a56ac9f17ff0c3196f (diff) | |
| parent | 95db13345cd7b6b7cac8725fe2879aaf80233818 (diff) | |
| download | Qt-b111d0bb1f0483d507c758810a0f247cb8dd82c0.zip Qt-b111d0bb1f0483d507c758810a0f247cb8dd82c0.tar.gz Qt-b111d0bb1f0483d507c758810a0f247cb8dd82c0.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6-ce
Diffstat (limited to 'src/xmlpatterns')
| -rw-r--r-- | src/xmlpatterns/functions/qpatternmatchingfns.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/functions/qpatternplatform_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/functions/qpatternmatchingfns.cpp b/src/xmlpatterns/functions/qpatternmatchingfns.cpp index cb421cb..a7275f6 100644 --- a/src/xmlpatterns/functions/qpatternmatchingfns.cpp +++ b/src/xmlpatterns/functions/qpatternmatchingfns.cpp @@ -82,7 +82,7 @@ Item ReplaceFN::evaluateSingleton(const DynamicContext::Ptr &context) const if(arg) input = arg.stringValue(); - const QString replacement(m_replacementString.isNull() ? parseReplacement(regexp.numCaptures(), context) + const QString replacement(m_replacementString.isNull() ? parseReplacement(regexp.captureCount(), context) : m_replacementString); diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h index e007381..a85cd0c 100644 --- a/src/xmlpatterns/functions/qpatternplatform_p.h +++ b/src/xmlpatterns/functions/qpatternplatform_p.h @@ -180,7 +180,7 @@ namespace QPatternist inline int PatternPlatform::captureCount() const { if(m_compiledParts.testFlag(PatternPrecompiled)) - return m_pattern.numCaptures(); + return m_pattern.captureCount(); else return -1; } |