Use QStringView instead of QStringRef, for compat reasons.

Author: adriweb

gui/qt/debugger/cdebughighlighter.cpp

@@ -5,7 +5,7 @@
 
 #include <cassert>
 
-const QSet<QString> CDebugHighlighter::s_keywords{
+const QSet<QStringView> CDebugHighlighter::s_keywords{
     QStringLiteral("_Align"),
     QStringLiteral("_At"),
     QStringLiteral("auto"),
@@ -151,7 +151,7 @@ void CDebugHighlighter::highlightBlock(const QString &text) {
                 [[gnu::fallthrough]];
             case ParseState::PreprocessorInstruction:
                 if (c == ' ' || c == '\t') {
-                    QStringRef instruction = text.midRef(start, i - start);
+                    QStringView instruction = text.mid(start, i - start);
                     if (instruction == QStringLiteral("include")) {
                         state = ParseState::PreprocessorInclude;
                     } else if (instruction == QStringLiteral("if")) {
@@ -198,7 +198,7 @@ void CDebugHighlighter::highlightBlock(const QString &text) {
                 if (i == text.length() ||
                     ((c < '0' || c > '9') && (c < 'A' || c > 'Z') &&
                      c != '_' && (c < 'a' || c > 'z'))) {
-                    QStringRef token = text.midRef(start, i - start);
+                    QStringView token = text.mid(start, i - start);
                     if (state == ParseState::NumberLiteral) {
                         if (c == '.' || ((c == '+' || c == '-') && i > start &&
                                          (text[i - 1] == 'E' || text[i - 1] == 'e'))) {
@@ -240,7 +240,7 @@ void CDebugHighlighter::highlightBlock(const QString &text) {
                                                        : m_sources->m_errorFormat);
                     } else {
                         setFormat(start, i - start,
-                                  s_keywords.contains(token.toString()) ?
+                                  s_keywords.contains(token) ?
                                   m_sources->m_keywordFormat :
                                   m_sources->m_identifierFormat);
                     }

gui/qt/debugger/cdebughighlighter.h

@@ -20,7 +20,7 @@ class CDebugHighlighter : public QSyntaxHighlighter {
 
 private:
     SourcesWidget *m_sources;
-    const static QSet<QString> s_keywords;
+    const static QSet<QStringView> s_keywords;
 };
 
 #endif

gui/qt/debugger/sourceswidget.cpp

@@ -590,7 +590,7 @@ void SourcesWidget::sourceContextMenu(const QPoint &pos) {
     QAction *action = menu.exec(sourceView->mapToGlobal(pos));
 
     const auto &source = m_debugFile->line()
-        .get(sourceView->objectName().midRef(QStringLiteral("sourceView").count()).toInt());
+        .get(sourceView->objectName().mid(QStringLiteral("sourceView").count()).toInt());
     QTextCursor cursor = sourceView->cursorForPosition(pos);
     auto it = source.lines().upper_bound({ cursor.blockNumber() + 1, cursor.columnNumber() });
     if (it == source.lines().begin()) {
@@ -1166,7 +1166,7 @@ void SourcesWidget::VariableModel::fetchMore(const QModelIndex &parent) {
                 continue;
             }
             if (name.startsWith('*')) {
-                name = name.midRef(1) + "->";
+                name = name.mid(1) + "->";
             } else {
                 name = name + '.';
             }
@@ -1188,7 +1188,7 @@ int SourcesWidget::GlobalModel::commonPrefixLength(const QStringList &paths) {
         if (!prefixLength) {
             return maxPrefixLength;
         }
-        QStringRef prefix = paths.first().leftRef(prefixLength);
+        QStringView prefix = paths.first().left(prefixLength);
         for (int i = 1; i < paths.count(); i++) {
             if (!paths.at(i).startsWith(prefix)) {
                 return maxPrefixLength;