diff options
author | Samuel Rødal <sroedal@trolltech.com> | 2009-11-05 12:10:19 (GMT) |
---|---|---|
committer | Samuel Rødal <sroedal@trolltech.com> | 2009-11-11 11:17:28 (GMT) |
commit | 223b5de63e56c6c3dfbc5000b460baa653ab3f75 (patch) | |
tree | 593e205d3fa06067eea4ce838ffd50f4098ef341 /src/xmlpatterns | |
parent | 71d05ae1f212793b59c2f0fcb68ec5f21732073e (diff) | |
download | Qt-223b5de63e56c6c3dfbc5000b460baa653ab3f75.zip Qt-223b5de63e56c6c3dfbc5000b460baa653ab3f75.tar.gz Qt-223b5de63e56c6c3dfbc5000b460baa653ab3f75.tar.bz2 |
Fixed compilation on AIX 6.1 with xlC 10.1
Task-number: QTBUG-3368
Reviewed-by: Thiago Macieira
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; |