summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-05 14:18:35 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-06 14:43:16 (GMT)
commit98e0b95581f46b94773a55195e0e67a466c333ed (patch)
tree062707bdf2ef4ed19ed0124a77b7abf7099f2b22 /src/xmlpatterns
parent863369deceeb254ea71724a247953fd0760ae30b (diff)
downloadQt-98e0b95581f46b94773a55195e0e67a466c333ed.zip
Qt-98e0b95581f46b94773a55195e0e67a466c333ed.tar.gz
Qt-98e0b95581f46b94773a55195e0e67a466c333ed.tar.bz2
API review: QRegExp::numCaptures() -> QRegExp::captureCount()
QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
Diffstat (limited to 'src/xmlpatterns')
-rw-r--r--src/xmlpatterns/functions/qpatternmatchingfns.cpp2
-rw-r--r--src/xmlpatterns/functions/qpatternplatform_p.h2
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;
}