6 files changed, 16 insertions, 11 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index c8ba07fbe0..ddd1079c32 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -528,7 +528,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
                 }
             }
 
-            QStringRef tokenText = currentTokenText();
+            QStringView tokenText = currentTokenText();
             if (tokenText == QLatin1String("ifdef")
                     || tokenText == QLatin1String("if")
                     || tokenText == QLatin1String("ifndef")) {
@@ -854,7 +854,7 @@ bool CodeFormatter::tryDeclaration()
         return true;
     case T_IDENTIFIER:
         if (m_tokenIndex == 0) {
-            const QStringRef tokenText = currentTokenText();
+            const QStringView tokenText = currentTokenText();
             if (tokenText.startsWith(QLatin1String("Q_"))
                     || tokenText.startsWith(QLatin1String("QT_"))
                     || tokenText.startsWith(QLatin1String("QML_"))
@@ -1009,9 +1009,11 @@ int CodeFormatter::column(int index) const
     return col;
 }
 
-QStringRef CodeFormatter::currentTokenText() const
+QStringView CodeFormatter::currentTokenText() const
 {
-    return m_currentLine.midRef(m_currentToken.utf16charsBegin(), m_currentToken.utf16chars());
+    if (m_currentToken.utf16charsEnd() > m_currentLine.size())
+        return QStringView(m_currentLine).mid(m_currentToken.utf16charsBegin());
+    return QStringView(m_currentLine).mid(m_currentToken.utf16charsBegin(), m_currentToken.utf16chars());
 }
 
 void CodeFormatter::turnInto(int newState)
diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h
index cf3eab98cb..1164c12eb1 100644
--- a/src/plugins/cpptools/cppcodeformatter.h
+++ b/src/plugins/cpptools/cppcodeformatter.h
@@ -216,7 +216,7 @@ private:
     void saveCurrentState(const QTextBlock &block);
     void restoreCurrentState(const QTextBlock &block);
 
-    QStringRef currentTokenText() const;
+    QStringView currentTokenText() const;
 
     int tokenizeBlock(const QTextBlock &block, bool *endedJoined = nullptr);
 
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 48d7ea6beb..92dd8ce1ec 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -880,9 +880,12 @@ bool InternalCppCompletionAssistProcessor::accepts() const
                                && tokens.at(1).kind() == T_IDENTIFIER) {
                         const QString &line = tc.block().text();
                         const Token &idToken = tokens.at(1);
-                        const QStringRef &identifier =
-                                line.midRef(idToken.utf16charsBegin(),
-                                            idToken.utf16charsEnd() - idToken.utf16charsBegin());
+                        const QStringView &identifier = idToken.utf16charsEnd() > line.size()
+                                                            ? QStringView(line).mid(
+                                                                idToken.utf16charsBegin())
+                                                            : QStringView(line)
+                                                                  .mid(idToken.utf16charsBegin(),
+                                                                       idToken.utf16chars());
                         if (identifier == QLatin1String("include")
                                 || identifier == QLatin1String("include_next")
                                 || (m_interface->languageFeatures().objCEnabled && identifier == QLatin1String("import"))) {
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index 000091bde4..1705634cad 100644
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -101,7 +101,7 @@ QList<Core::LocatorFilterEntry> CppLocatorFilter::matchesFor(
 
                 // Highlight the matched characters, therefore it may be necessary
                 // to update the match if the displayName is different from matchString
-                if (matchString.midRef(matchOffset) != filterEntry.displayName) {
+                if (QStringView(matchString).mid(matchOffset) != filterEntry.displayName) {
                     match = shortRegexp.match(filterEntry.displayName);
                     matchOffset = 0;
                 }
diff --git a/src/plugins/cpptools/cppoverviewmodel.cpp b/src/plugins/cpptools/cppoverviewmodel.cpp
index 6fd9b161dc..74f4404b1b 100644
--- a/src/plugins/cpptools/cppoverviewmodel.cpp
+++ b/src/plugins/cpptools/cppoverviewmodel.cpp
@@ -132,7 +132,7 @@ QVariant SymbolItem::data(int /*column*/, int role) const
 
 bool OverviewModel::hasDocument() const
 {
-    return _cppDocument;
+    return !_cppDocument.isNull();
 }
 
 int OverviewModel::globalSymbolCount() const
diff --git a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp
index c8acdb9918..5919cc4b17 100644
--- a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp
+++ b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp
@@ -55,7 +55,7 @@ CppTools::ProjectPart::Ptr projectPartForFile(const QString &filePath)
 bool isProjectPartValid(const CppTools::ProjectPart::Ptr projectPart)
 {
     if (projectPart)
-        return CppTools::CppModelManager::instance()->projectPartForId(projectPart->id());
+        return !CppTools::CppModelManager::instance()->projectPartForId(projectPart->id()).isNull();
 
     return false;
 }