diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-08-12 11:58:54 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-08-19 19:48:03 +0200 |
| commit | a8028a02df32355f4df4c036dbb82e9f8e8d527f (patch) | |
| tree | ca5ae77f5de57a7828a526d85e702e053b63e727 /examples/corelib | |
| parent | a2cec17407b83aed23b01065f4e10d32008552e1 (diff) | |
Port the QXmlStream API from QStringRef to QStringView
This gives some source incompatibilities, most of them can be
handled by using auto instead of QStringRef explicitly.
[ChangeLog][Important API changes] QXmlStream now uses QStringView
insteead of QStringRef in it's API. Using auto forvariables returning
a QStringRef in Qt 5 should lead to code that can be used against both
Qt versions.
Fixes: QTBUG-84317
Change-Id: I6df3a9507276f5d16d044a6bdbe0e4810cf99440
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'examples/corelib')
| -rw-r--r-- | examples/corelib/serialization/convert/xmlconverter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/corelib/serialization/convert/xmlconverter.cpp b/examples/corelib/serialization/convert/xmlconverter.cpp index 42cb10100a..87ba9b5156 100644 --- a/examples/corelib/serialization/convert/xmlconverter.cpp +++ b/examples/corelib/serialization/convert/xmlconverter.cpp @@ -195,7 +195,7 @@ static QVariant mapFromXml(QXmlStreamReader &xml, Converter::Options options) static QVariant variantFromXml(QXmlStreamReader &xml, Converter::Options options) { - QStringRef name = xml.name(); + QStringView name = xml.name(); if (name == QLatin1String("list")) return listFromXml(xml, options); if (name == QLatin1String("map")) @@ -207,7 +207,7 @@ static QVariant variantFromXml(QXmlStreamReader &xml, Converter::Options options } QXmlStreamAttributes attrs = xml.attributes(); - QStringRef type = attrs.value(QLatin1String("type")); + QStringView type = attrs.value(QLatin1String("type")); forever { xml.readNext(); @@ -222,7 +222,7 @@ static QVariant variantFromXml(QXmlStreamReader &xml, Converter::Options options exit(EXIT_FAILURE); } - QStringRef text = xml.text(); + QStringView text = xml.text(); if (!xml.isCDATA()) text = text.trimmed(); @@ -247,7 +247,7 @@ static QVariant variantFromXml(QXmlStreamReader &xml, Converter::Options options } } else if (type == QLatin1String("bytes")) { QByteArray data = text.toLatin1(); - QStringRef encoding = attrs.value("encoding"); + QStringView encoding = attrs.value("encoding"); if (encoding == QLatin1String("base64url")) { result = QByteArray::fromBase64(data, QByteArray::Base64UrlEncoding); } else if (encoding == QLatin1String("hex")) { |