diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-16 16:33:02 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-16 16:33:02 (GMT) |
| commit | ce7dcaf43089d6d0d4bb6029c42991cc6fec2576 (patch) | |
| tree | a047437c5a6fbced0cb34850fcda2ccd727bd67c /src/xmlpatterns | |
| parent | f6814daef41f438f6c78bf7e67f98c5b552201e4 (diff) | |
| parent | aa482dcbde0089fe32ca59e39f17e5e44fd8b244 (diff) | |
| download | Qt-ce7dcaf43089d6d0d4bb6029c42991cc6fec2576.zip Qt-ce7dcaf43089d6d0d4bb6029c42991cc6fec2576.tar.gz Qt-ce7dcaf43089d6d0d4bb6029c42991cc6fec2576.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/xmlpatterns')
| -rw-r--r-- | src/xmlpatterns/data/qderivedinteger_p.h | 8 | ||||
| -rw-r--r-- | src/xmlpatterns/functions/qcomparingaggregator.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h index 859e03d..19dc4c4 100644 --- a/src/xmlpatterns/data/qderivedinteger_p.h +++ b/src/xmlpatterns/data/qderivedinteger_p.h @@ -401,18 +401,18 @@ namespace QPatternist { return ValidationError::createError(QtXmlPatterns::tr( "Value %1 of type %2 exceeds maximum (%3).") - .arg(formatData(static_cast<xsInteger>(num))) + .arg(QPatternist::formatData(static_cast<xsInteger>(num))) .arg(formatType(np, itemType())) - .arg(formatData(static_cast<xsInteger>(maxInclusive)))); + .arg(QPatternist::formatData(static_cast<xsInteger>(maxInclusive)))); } else if((limitsUsage & LimitDownwards) && lessThan(num, minimum)) { return ValidationError::createError(QtXmlPatterns::tr( "Value %1 of type %2 is below minimum (%3).") - .arg(formatData(static_cast<xsInteger>(num))) + .arg(QPatternist::formatData(static_cast<xsInteger>(num))) .arg(formatType(np, itemType())) - .arg(formatData(static_cast<xsInteger>(minInclusive)))); + .arg(QPatternist::formatData(static_cast<xsInteger>(minInclusive)))); } else return AtomicValue::Ptr(new DerivedInteger(num)); diff --git a/src/xmlpatterns/functions/qcomparingaggregator.cpp b/src/xmlpatterns/functions/qcomparingaggregator.cpp index 6d07109..acda08c 100644 --- a/src/xmlpatterns/functions/qcomparingaggregator.cpp +++ b/src/xmlpatterns/functions/qcomparingaggregator.cpp @@ -195,7 +195,7 @@ ComparingAggregator<oper, result>::typeCheck(const StaticContext::Ptr &context, !BuiltinTypes::xsYearMonthDuration->xdtTypeMatches(t1)) { context->error(QtXmlPatterns::tr("The first argument to %1 cannot be of type %2.") - .arg(formatFunction(context->namePool(), signature())) + .arg(QPatternist::formatFunction(context->namePool(), signature())) .arg(formatType(context->namePool(), m_operands.first()->staticType())), ReportContext::FORG0006, this); return me; |