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>

5 files changed, 25 insertions, 25 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")) {
diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp
index f7df368dd7..0f8dfb5b6a 100644
--- a/examples/embedded/flightinfo/flightinfo.cpp
+++ b/examples/embedded/flightinfo/flightinfo.cpp
@@ -265,20 +265,20 @@ private:
             xml.readNext();
 
             if (xml.tokenType() == QXmlStreamReader::StartElement) {
-                QStringRef className = xml.attributes().value("class");
-                inFlightName |= xml.name() == "h1";
-                inFlightStatus |= className == "FlightDetailHeaderStatus";
-                inFlightMap |= className == "flightMap";
-                if (xml.name() == "td" && !className.isEmpty()) {
-                    if (className.contains("fieldTitle")) {
+                auto className = xml.attributes().value("class");
+                inFlightName |= xml.name() == u"h1";
+                inFlightStatus |= className == u"FlightDetailHeaderStatus";
+                inFlightMap |= className == u"flightMap";
+                if (xml.name() == u"td" && !className.isEmpty()) {
+                    if (className.contains(u"fieldTitle")) {
                         inFieldName = true;
                         fieldNames += QString();
                         fieldValues += QString();
                     }
-                    if (className.contains("fieldValue"))
+                    if (className.contains(u"fieldValue"))
                         inFieldValue = true;
                 }
-                if (xml.name() == "img" && inFlightMap) {
+                if (xml.name() == u"img" && inFlightMap) {
                     const QByteArray encoded
                         = ("http://mobile.flightview.com/" % xml.attributes().value("src")).toLatin1();
                     QUrl url = QUrl::fromPercentEncoding(encoded);
@@ -287,11 +287,11 @@ private:
             }
 
             if (xml.tokenType() == QXmlStreamReader::EndElement) {
-                inFlightName &= xml.name() != "h1";
-                inFlightStatus &= xml.name() != "div";
-                inFlightMap &= xml.name() != "div";
-                inFieldName &= xml.name() != "td";
-                inFieldValue &= xml.name() != "td";
+                inFlightName &= xml.name() != u"h1";
+                inFlightStatus &= xml.name() != u"div";
+                inFlightMap &= xml.name() != u"div";
+                inFieldName &= xml.name() != u"td";
+                inFieldValue &= xml.name() != u"td";
             }
 
             if (xml.tokenType() == QXmlStreamReader::Characters) {
diff --git a/examples/network/googlesuggest/googlesuggest.cpp b/examples/network/googlesuggest/googlesuggest.cpp
index 04a60103b2..b7b6d3ab62 100644
--- a/examples/network/googlesuggest/googlesuggest.cpp
+++ b/examples/network/googlesuggest/googlesuggest.cpp
@@ -217,8 +217,8 @@ void GSuggestCompletion::handleNetworkData(QNetworkReply *networkReply)
         while (!xml.atEnd()) {
             xml.readNext();
             if (xml.tokenType() == QXmlStreamReader::StartElement)
-                if (xml.name() == "suggestion") {
-                    QStringRef str = xml.attributes().value("data");
+                if (xml.name() == u"suggestion") {
+                    auto str = xml.attributes().value("data");
                     choices << str.toString();
                 }
         }
diff --git a/examples/widgets/animation/sub-attaq/graphicsscene.cpp b/examples/widgets/animation/sub-attaq/graphicsscene.cpp
index c7e2d269c8..5248ed9f92 100644
--- a/examples/widgets/animation/sub-attaq/graphicsscene.cpp
+++ b/examples/widgets/animation/sub-attaq/graphicsscene.cpp
@@ -103,21 +103,21 @@ GraphicsScene::GraphicsScene(int x, int y, int width, int height, Mode mode, QOb
     while (!reader.atEnd()) {
          reader.readNext();
          if (reader.tokenType() == QXmlStreamReader::StartElement) {
-             if (reader.name() == "submarine") {
+             if (reader.name() == u"submarine") {
                  SubmarineDescription desc;
                  desc.name = reader.attributes().value("name").toString();
                  desc.points = reader.attributes().value("points").toInt();
                  desc.type = reader.attributes().value("type").toInt();
                  submarinesData.append(desc);
-             } else if (reader.name() == "level") {
+             } else if (reader.name() == u"level") {
                  currentLevel.id = reader.attributes().value("id").toInt();
                  currentLevel.name = reader.attributes().value("name").toString();
-             } else if (reader.name() == "subinstance") {
+             } else if (reader.name() == u"subinstance") {
                  currentLevel.submarines.append(qMakePair(reader.attributes().value("type").toInt(),
                                                           reader.attributes().value("nb").toInt()));
              }
          } else if (reader.tokenType() == QXmlStreamReader::EndElement) {
-            if (reader.name() == "level") {
+            if (reader.name() == u"level") {
                 levelsData.insert(currentLevel.id, currentLevel);
                 currentLevel.submarines.clear();
             }
diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp
index 143ad6dcba..0d68d1792a 100644
--- a/examples/xml/rsslisting/rsslisting.cpp
+++ b/examples/xml/rsslisting/rsslisting.cpp
@@ -214,11 +214,11 @@ void RSSListing::parseXml()
     while (!xml.atEnd()) {
         xml.readNext();
         if (xml.isStartElement()) {
-            if (xml.name() == "item")
+            if (xml.name() == u"item")
                 linkString = xml.attributes().value("rss:about").toString();
             currentTag = xml.name().toString();
         } else if (xml.isEndElement()) {
-            if (xml.name() == "item") {
+            if (xml.name() == u"item") {
 
                 QTreeWidgetItem *item = new QTreeWidgetItem;
                 item->setText(0, titleString);