From a8028a02df32355f4df4c036dbb82e9f8e8d527f Mon Sep 17 00:00:00 2001
From: Karsten Heimrich <karsten.heimrich@qt.io>
Date: Wed, 12 Aug 2020 11:58:54 +0200
Subject: 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>
---
 examples/embedded/flightinfo/flightinfo.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'examples/embedded')

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) {
-- 
cgit v1.2.3