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>

9 files changed, 22 insertions, 22 deletions

diff --git a/tools/qmlcachegen/resourcefilter.cpp b/tools/qmlcachegen/resourcefilter.cpp
index 261102dcbe..37c027c365 100644
--- a/tools/qmlcachegen/resourcefilter.cpp
+++ b/tools/qmlcachegen/resourcefilter.cpp
@@ -61,7 +61,7 @@ int filterResourceFile(const QString &input, const QString &output)
     while (!reader.atEnd()) {
         switch (reader.readNext()) {
         case QXmlStreamReader::StartDocument: {
-            QStringRef version = reader.documentVersion();
+            QStringView version = reader.documentVersion();
             if (!version.isEmpty())
                 writer.writeStartDocument(version.toString());
             else
diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp
index 1426a1e107..99c161d475 100644
--- a/tools/qmleasing/splineeditor.cpp
+++ b/tools/qmleasing/splineeditor.cpp
@@ -675,12 +675,12 @@ void SplineEditor::setEasingCurve(const QString &code)
     if (m_block)
         return;
     if (code.startsWith(QLatin1Char('[')) && code.endsWith(QLatin1Char(']'))) {
-        const QStringRef cleanCode(&code, 1, code.size() - 2);
+        const auto cleanCode = QStringView(code).mid(1, code.size() - 2);
         const auto stringList = cleanCode.split(QLatin1Char(','), Qt::SkipEmptyParts);
         if (stringList.count() >= 6 && (stringList.count() % 6 == 0)) {
             QVector<qreal> realList;
             realList.reserve(stringList.count());
-            for (const QStringRef &string : stringList) {
+            for (const QStringView &string : stringList) {
                 bool ok;
                 realList.append(string.toDouble(&ok));
                 if (!ok)
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index f9f3cd90cf..348328f6a4 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -254,7 +254,7 @@ QVariantList findPathsForModuleImports(const QVariantList &imports)
             if (plugininfo.contains(dependenciesLiteral())) {
                 const QStringList dependencies = plugininfo.value(dependenciesLiteral()).toStringList();
                 for (const QString &line : dependencies) {
-                    const auto dep = line.splitRef(QLatin1Char(' '));
+                    const auto dep = QStringView{line}.split(QLatin1Char(' '));
                     QVariantMap depImport;
                     depImport[typeLiteral()] = moduleLiteral();
                     depImport[nameLiteral()] = dep[0].toString();
diff --git a/tools/qmllint/checkidentifiers.cpp b/tools/qmllint/checkidentifiers.cpp
index 0bd5c8127e..32c2fa4d79 100644
--- a/tools/qmllint/checkidentifiers.cpp
+++ b/tools/qmllint/checkidentifiers.cpp
@@ -37,21 +37,21 @@ class IssueLocationWithContext
 public:
     IssueLocationWithContext(const QString &code, const QQmlJS::SourceLocation &location) {
         int before = std::max(0,code.lastIndexOf(QLatin1Char('\n'), location.offset));
-        m_beforeText = code.midRef(before + 1, int(location.offset - (before + 1)));
-        m_issueText = code.midRef(location.offset, location.length);
+        m_beforeText = QStringView{code}.mid(before + 1, int(location.offset - (before + 1)));
+        m_issueText = QStringView{code}.mid(location.offset, location.length);
         int after = code.indexOf(QLatin1Char('\n'), int(location.offset + location.length));
-        m_afterText = code.midRef(int(location.offset + location.length),
+        m_afterText = QStringView{code}.mid(int(location.offset + location.length),
                                   int(after - (location.offset+location.length)));
     }
 
-    QStringRef beforeText() const { return m_beforeText; }
-    QStringRef issueText() const { return m_issueText; }
-    QStringRef afterText() const { return m_afterText; }
+    QStringView beforeText() const { return m_beforeText; }
+    QStringView issueText() const { return m_issueText; }
+    QStringView afterText() const { return m_afterText; }
 
 private:
-    QStringRef m_beforeText;
-    QStringRef m_issueText;
-    QStringRef m_afterText;
+    QStringView m_beforeText;
+    QStringView m_issueText;
+    QStringView m_afterText;
 };
 
 static void writeWarning(ColorOutput *out)
diff --git a/tools/qmllint/findwarnings.cpp b/tools/qmllint/findwarnings.cpp
index 59b2fc90dc..cc8a323112 100644
--- a/tools/qmllint/findwarnings.cpp
+++ b/tools/qmllint/findwarnings.cpp
@@ -317,7 +317,7 @@ void FindWarningVisitor::importFileOrDirectory(const QString &fileOrDirectory,
     }
 }
 
-void FindWarningVisitor::importExportedNames(const QStringRef &prefix, QString name)
+void FindWarningVisitor::importExportedNames(QStringView prefix, QString name)
 {
     QList<ScopeTree::ConstPtr> scopes;
     for (;;) {
@@ -780,7 +780,7 @@ bool FindWarningVisitor::visit(QQmlJS::AST::UiObjectBinding *uiob)
 
     QString name {};
     auto id = uiob->qualifiedTypeNameId;
-    QStringRef prefix = uiob->qualifiedTypeNameId->name;
+    QStringView prefix = uiob->qualifiedTypeNameId->name;
     while (id) {
         name += id->name.toString() + QLatin1Char('.');
         id = id->next;
@@ -816,7 +816,7 @@ bool FindWarningVisitor::visit(QQmlJS::AST::UiObjectDefinition *uiod)
 
     QString name {};
     auto id = uiod->qualifiedTypeNameId;
-    QStringRef prefix = uiod->qualifiedTypeNameId->name;
+    QStringView prefix = uiod->qualifiedTypeNameId->name;
     while (id) {
         name += id->name.toString() + QLatin1Char('.');
         id = id->next;
diff --git a/tools/qmllint/findwarnings.h b/tools/qmllint/findwarnings.h
index 6e5f3859cc..ee019b440d 100644
--- a/tools/qmllint/findwarnings.h
+++ b/tools/qmllint/findwarnings.h
@@ -106,7 +106,7 @@ private:
     ScopeTree::Ptr localFile2ScopeTree(const QString &filePath);
 
     void importFileOrDirectory(const QString &directory, const QString &prefix);
-    void importExportedNames(const QStringRef &prefix, QString name);
+    void importExportedNames(QStringView prefix, QString name);
 
     void parseHeaders(QQmlJS::AST::UiHeaderItemList *headers);
     ScopeTree::Ptr parseProgram(QQmlJS::AST::Program *program, const QString &name);
diff --git a/tools/qmlprofiler/qmlprofilerapplication.cpp b/tools/qmlprofiler/qmlprofilerapplication.cpp
index 7c92f428ae..d91ef191e5 100644
--- a/tools/qmlprofiler/qmlprofilerapplication.cpp
+++ b/tools/qmlprofiler/qmlprofilerapplication.cpp
@@ -354,7 +354,7 @@ bool QmlProfilerApplication::checkOutputFile(PendingRequest pending)
 
 void QmlProfilerApplication::userCommand(const QString &command)
 {
-    auto args = command.splitRef(QChar::Space, Qt::SkipEmptyParts);
+    auto args = QStringView{command}.split(QChar::Space, Qt::SkipEmptyParts);
     if (args.isEmpty()) {
         prompt();
         return;
diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp
index 9ec143975e..8803170ff2 100644
--- a/tools/qmlprofiler/qmlprofilerdata.cpp
+++ b/tools/qmlprofiler/qmlprofilerdata.cpp
@@ -198,7 +198,7 @@ void QmlProfilerData::addEventType(const QQmlProfilerEventType &type)
         break;
     case PixmapCacheEvent: {
         const QString filePath = QUrl(type.location().filename()).path();
-        displayName = filePath.midRef(filePath.lastIndexOf(QLatin1Char('/')) + 1)
+        displayName = QStringView{filePath}.mid(filePath.lastIndexOf(QLatin1Char('/')) + 1)
                 + QLatin1Char(':') + QString::number(type.detailType());
         break;
     }
@@ -218,7 +218,7 @@ void QmlProfilerData::addEventType(const QQmlProfilerEventType &type)
             displayName = QString::fromLatin1("Unknown");
         } else {
             const QString filePath = QUrl(eventLocation.filename()).path();
-            displayName = filePath.midRef(
+            displayName = QStringView{filePath}.mid(
                         filePath.lastIndexOf(QLatin1Char('/')) + 1) +
                         QLatin1Char(':') + QString::number(eventLocation.line());
         }
diff --git a/tools/shared/componentversion.cpp b/tools/shared/componentversion.cpp
index 95403ec15f..5019cdcc33 100644
--- a/tools/shared/componentversion.cpp
+++ b/tools/shared/componentversion.cpp
@@ -35,10 +35,10 @@ ComponentVersion::ComponentVersion(const QString &versionString)
     if (dotIdx == -1)
         return;
     bool ok = false;
-    const int maybeMajor = versionString.leftRef(dotIdx).toInt(&ok);
+    const int maybeMajor = QStringView{versionString}.left(dotIdx).toInt(&ok);
     if (!ok)
         return;
-    const int maybeMinor = versionString.midRef(dotIdx + 1).toInt(&ok);
+    const int maybeMinor = QStringView{versionString}.mid(dotIdx + 1).toInt(&ok);
     if (!ok)
         return;
     m_version = QTypeRevision::fromVersion(maybeMajor, maybeMinor);