diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-24 10:22:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-25 10:45:26 +0200 |
| commit | 04cd6d9569e3034e57108e8309c353c13803abe8 (patch) | |
| tree | 8567026788c4d15e67b7bb39feb036fe5830491e /src | |
| parent | 4f485fab26b986a38b0caee7bbf4b16cd265f329 (diff) | |
| download | qtxmlpatterns-04cd6d9569e3034e57108e8309c353c13803abe8.tar.gz | |
QtXmlPatterns: Fix compiler warnings.
QString conversions, assigned/unused variables,
braces around ambiguous else.
Also fixed coding style in the affected lines to make
the sanity bot happy.
Change-Id: I85e440861ec9e8177a6cf9a017dc981a25212f54
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmlpatterns/functions/qstringvaluefns.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/functions/qstringvaluefns.cpp b/src/xmlpatterns/functions/qstringvaluefns.cpp index 0656721..2343737 100644 --- a/src/xmlpatterns/functions/qstringvaluefns.cpp +++ b/src/xmlpatterns/functions/qstringvaluefns.cpp @@ -345,8 +345,8 @@ Item EncodeString::evaluateSingleton(const DynamicContext::Ptr &context) const if(!item) return CommonValues::EmptyString; - return AtomicString::fromValue(item.stringValue().toUtf8().toPercentEncoding(m_excludeChars, - m_includeChars).constData()); + const QByteArray value = item.stringValue().toUtf8().toPercentEncoding(m_excludeChars, m_includeChars); + return AtomicString::fromValue(QLatin1String(value)); } const char *const EncodeForURIFN::include = "#!*'()"; |