Port QtTools from QStringRef to QStringView

Task-number: QTBUG-84319
Change-Id: Idb5a41172ea38b2f4edf385d67c1cdc2968a8d8c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 18 insertions, 18 deletions

diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp
index 91ea27dc2..c0d1346a7 100644
--- a/src/linguist/shared/qmakebuiltins.cpp
+++ b/src/linguist/shared/qmakebuiltins.cpp
@@ -669,7 +669,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
         bool leftalign = false;
         enum { DefaultSign, PadSign, AlwaysSign } sign = DefaultSign;
         if (args.count() >= 2) {
-            const auto opts = split_value_list(args.at(1).toQStringRef());
+            const auto opts = split_value_list(args.at(1).toQStringView());
             for (const ProString &opt : opts) {
                 if (opt.startsWith(QLatin1String("ibase="))) {
                     ibase = opt.mid(6).toInt();
@@ -772,7 +772,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
         const auto vars = values(map(args.at(0)));
         for (const ProString &var : vars) {
             // FIXME: this is inconsistent with the "there are no empty strings" dogma.
-            const auto splits = var.toQStringRef().split(sep, Qt::KeepEmptyParts);
+            const auto splits = var.toQStringView().split(sep, Qt::KeepEmptyParts);
             for (const auto &splt : splits)
                 ret << ProString(splt).setSource(var);
         }
@@ -862,7 +862,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
                         ret += ProString(stream.readLine());
                     } else {
                         const QString &line = stream.readLine();
-                        ret += split_value_list(QStringRef(&line).trimmed());
+                        ret += split_value_list(QStringView(line).trimmed());
                         if (!singleLine)
                             ret += ProString("\n");
                     }
@@ -886,7 +886,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
         ret = ProStringList(ProString(tmp));
         ProStringList lst;
         for (const ProString &arg : args)
-            lst += split_value_list(arg.toQStringRef(), arg.sourceFile()); // Relies on deep copy
+            lst += split_value_list(arg.toQStringView(), arg.sourceFile()); // Relies on deep copy
         m_valuemapStack.top()[ret.at(0).toKey()] = lst;
         break; }
     case E_FIND: {
@@ -935,7 +935,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
                 output.replace(QLatin1Char('\t'), QLatin1Char(' '));
                 if (singleLine)
                     output.replace(QLatin1Char('\n'), QLatin1Char(' '));
-                ret += split_value_list(QStringRef(&output));
+                ret += split_value_list(QStringView(output));
             }
         }
         break;
@@ -1088,7 +1088,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
                 evalError(fL1S("Unexpected EOF."));
                 return ReturnError;
             }
-            ret = split_value_list(QStringRef(&line));
+            ret = split_value_list(QStringView(line));
         }
         break;
     }
@@ -1121,7 +1121,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
         ProString priosfx = args.count() < 4 ? ProString(".priority") : args.at(3);
         populateDeps(orgList, prefix,
                      args.count() < 3 ? ProStringList(ProString(".depends"))
-                                      : split_value_list(args.at(2).toQStringRef()),
+                                      : split_value_list(args.at(2).toQStringView()),
                      priosfx, dependencies, dependees, rootSet);
         while (!rootSet.isEmpty()) {
             QMultiMap<int, ProString>::iterator it = rootSet.begin();
@@ -1245,7 +1245,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::testFunc_cache(const ProStringList &
     enum { CacheSet, CacheAdd, CacheSub } mode = CacheSet;
     ProKey srcvar;
     if (args.count() >= 2) {
-        const auto opts = split_value_list(args.at(1).toQStringRef());
+        const auto opts = split_value_list(args.at(1).toQStringView());
         for (const ProString &opt : opts) {
             if (opt == QLatin1String("transient")) {
                 persist = false;
@@ -1538,7 +1538,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
     case T_EVAL: {
         VisitReturn ret = ReturnFalse;
         QString contents = args.join(statics.field_sep);
-        ProFile *pro = m_parser->parsedProBlock(QStringRef(&contents),
+        ProFile *pro = m_parser->parsedProBlock(QStringView(contents),
                                                 0, m_current.pro->fileName(), m_current.line);
         if (m_cumulative || pro->isOk()) {
             m_locationStack.push(m_current);
@@ -1550,19 +1550,19 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
         return ret;
     }
     case T_IF: {
-        return evaluateConditional(args.at(0).toQStringRef(),
+        return evaluateConditional(args.at(0).toQStringView(),
                                    m_current.pro->fileName(), m_current.line);
     }
     case T_CONFIG: {
         if (args.count() == 1)
-            return returnBool(isActiveConfig(args.at(0).toQStringRef()));
-        const auto &mutuals = args.at(1).toQStringRef().split(QLatin1Char('|'),
+            return returnBool(isActiveConfig(args.at(0).toQStringView()));
+        const auto &mutuals = args.at(1).toQStringView().split(QLatin1Char('|'),
                                                               Qt::SkipEmptyParts);
         const ProStringList &configs = values(statics.strCONFIG);
 
         for (int i = configs.size() - 1; i >= 0; i--) {
             for (int mut = 0; mut < mutuals.count(); mut++) {
-                if (configs[i].toQStringRef() == mutuals[mut].trimmed())
+                if (configs[i].toQStringView() == mutuals[mut].trimmed())
                     return returnBool(configs[i] == args[0]);
             }
         }
@@ -1593,12 +1593,12 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
                 }
             }
         } else {
-            const auto mutuals = args.at(2).toQStringRef().split(QLatin1Char('|'),
+            const auto mutuals = args.at(2).toQStringView().split(QLatin1Char('|'),
                                                                  Qt::SkipEmptyParts);
             for (int i = l.size() - 1; i >= 0; i--) {
                 const ProString &val = l[i];
                 for (int mut = 0; mut < mutuals.count(); mut++) {
-                    if (val.toQStringRef() == mutuals[mut].trimmed()) {
+                    if (val.toQStringView() == mutuals[mut].trimmed()) {
                         if (val == qry)
                             return ReturnTrue;
                         if (!regx.pattern().isEmpty()) {
@@ -1651,8 +1651,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
             }
         }
         if (func_t == T_GREATERTHAN)
-            return returnBool(lhs > rhs.toQStringRef());
-        return returnBool(lhs < rhs.toQStringRef());
+            return returnBool(lhs > rhs.toQStringView());
+        return returnBool(lhs < rhs.toQStringView());
     }
     case T_EQUALS:
         return returnBool(values(map(args.at(0))).join(statics.field_sep)
@@ -1843,7 +1843,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
             if (!vals.isEmpty())
                 contents = vals.join(QLatin1Char('\n')) + QLatin1Char('\n');
             if (args.count() >= 3) {
-                const auto opts = split_value_list(args.at(2).toQStringRef());
+                const auto opts = split_value_list(args.at(2).toQStringView());
                 for (const ProString &opt : opts) {
                     if (opt == QLatin1String("append")) {
                         mode = QIODevice::Append;