diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-07-23 07:12:55 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-07-23 07:12:55 (GMT) |
| commit | f9103011abc672059cda53078e84d9e73e687e12 (patch) | |
| tree | bf25e98246c7cb0893b3dbf05d9e7d18d48ed19c /src/xmlpatterns/parser | |
| parent | c42f7058dfd7ea551b2d3bca5651b0c802c91259 (diff) | |
| download | Qt-f9103011abc672059cda53078e84d9e73e687e12.zip Qt-f9103011abc672059cda53078e84d9e73e687e12.tar.gz Qt-f9103011abc672059cda53078e84d9e73e687e12.tar.bz2 | |
Build with rvct compiler.
Reviewed-by: akennedy
Diffstat (limited to 'src/xmlpatterns/parser')
| -rw-r--r-- | src/xmlpatterns/parser/qmaintainingreader.cpp | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/parser/qmaintainingreader_p.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/xmlpatterns/parser/qmaintainingreader.cpp b/src/xmlpatterns/parser/qmaintainingreader.cpp index 0513555..8569f05 100644 --- a/src/xmlpatterns/parser/qmaintainingreader.cpp +++ b/src/xmlpatterns/parser/qmaintainingreader.cpp @@ -172,7 +172,7 @@ void MaintainingReader<TokenLookupClass, LookupKey>::validateElement(const Looku QStringList allowed; for(int i = 0; i < totalCount; ++i) - allowed.append(formatKeyword(toString(all.at(i)))); + allowed.append(QPatternist::formatKeyword(TokenLookupClass::toString(all.at(i)))); /* Note, we can't run toString() on attrName, because we're in this branch, * the token lookup doesn't have the string(!).*/ @@ -229,7 +229,7 @@ void MaintainingReader<TokenLookupClass, LookupKey>::validateElement(const Looku if(!requiredButMissing.isEmpty()) { error(QtXmlPatterns::tr("The attribute %1 must appear on element %2.") - .arg(formatKeyword(toString(*requiredButMissing.constBegin())), + .arg(QPatternist::formatKeyword(TokenLookupClass::toString(*requiredButMissing.constBegin())), formatKeyword(name())), ReportContext::XTSE0010); } diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h index c2c991e..eb20bdb 100644 --- a/src/xmlpatterns/parser/qmaintainingreader_p.h +++ b/src/xmlpatterns/parser/qmaintainingreader_p.h @@ -59,6 +59,7 @@ #include <QXmlStreamReader> #include "qxpathhelper_p.h" +#include "qxslttokenlookup_p.h" class QUrl; |