Port QtDeclarative from QStringRef to QStringView

Task-number: QTBUG-84319
Change-Id: I2dcfb8a2db98282c7a1acdad1e6f4f949f26df15
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/qml/qml/qqmlstringconverters.cpp b/src/qml/qml/qqmlstringconverters.cpp
index e53f90b45b..d1c7d8cdf3 100644
--- a/src/qml/qml/qqmlstringconverters.cpp
+++ b/src/qml/qml/qqmlstringconverters.cpp
@@ -143,8 +143,8 @@ QPointF QQmlStringConverters::pointFFromString(const QString &s, bool *ok)
 
     bool xGood, yGood;
     int index = s.indexOf(QLatin1Char(','));
-    qreal xCoord = s.leftRef(index).toDouble(&xGood);
-    qreal yCoord = s.midRef(index+1).toDouble(&yGood);
+    qreal xCoord = QStringView{s}.left(index).toDouble(&xGood);
+    qreal yCoord = QStringView{s}.mid(index+1).toDouble(&yGood);
     if (!xGood || !yGood) {
         if (ok)
             *ok = false;
@@ -167,8 +167,8 @@ QSizeF QQmlStringConverters::sizeFFromString(const QString &s, bool *ok)
 
     bool wGood, hGood;
     int index = s.indexOf(QLatin1Char('x'));
-    qreal width = s.leftRef(index).toDouble(&wGood);
-    qreal height = s.midRef(index+1).toDouble(&hGood);
+    qreal width = QStringView{s}.left(index).toDouble(&wGood);
+    qreal height = QStringView{s}.mid(index+1).toDouble(&hGood);
     if (!wGood || !hGood) {
         if (ok)
             *ok = false;
@@ -191,12 +191,12 @@ QRectF QQmlStringConverters::rectFFromString(const QString &s, bool *ok)
 
     bool xGood, yGood, wGood, hGood;
     int index = s.indexOf(QLatin1Char(','));
-    qreal x = s.leftRef(index).toDouble(&xGood);
+    qreal x = QStringView{s}.left(index).toDouble(&xGood);
     int index2 = s.indexOf(QLatin1Char(','), index+1);
-    qreal y = s.midRef(index+1, index2-index-1).toDouble(&yGood);
+    qreal y = QStringView{s}.mid(index+1, index2-index-1).toDouble(&yGood);
     index = s.indexOf(QLatin1Char('x'), index2+1);
-    qreal width = s.midRef(index2+1, index-index2-1).toDouble(&wGood);
-    qreal height = s.midRef(index+1).toDouble(&hGood);
+    qreal width = QStringView{s}.mid(index2+1, index-index2-1).toDouble(&wGood);
+    qreal height = QStringView{s}.mid(index+1).toDouble(&hGood);
     if (!xGood || !yGood || !wGood || !hGood) {
         if (ok)
             *ok = false;