feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTool: Avoid a use of QStringRef

Browse Source 
Change-Id: I2a82bad7d91e059915526f0cf7b89f0d8367463a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-15 17:39:32 +02:00
parent 361b80cb9b
commit 328c0cf809
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppeditor/cpphighlighter.cpp
View File

@@ -195,7 +195,7 @@ void CppHighlighter::highlightBlock(const QString &text)
} else if (tk.isKeyword() } else if (tk.isKeyword()
|| (m_languageFeatures.qtKeywordsEnabled || (m_languageFeatures.qtKeywordsEnabled
&& CppTools::isQtKeyword(text.midRef(tk.utf16charsBegin(), tk.utf16chars()))) && CppTools::isQtKeyword(QStringView{text}.mid(tk.utf16charsBegin(), tk.utf16chars())))
|| (m_languageFeatures.objCEnabled && tk.isObjCAtKeyword())) { || (m_languageFeatures.objCEnabled && tk.isObjCAtKeyword())) {
setFormat(tk.utf16charsBegin(), tk.utf16chars(), formatForCategory(C_KEYWORD)); setFormat(tk.utf16charsBegin(), tk.utf16chars(), formatForCategory(C_KEYWORD));
} else if (tk.isPrimitiveType()) { } else if (tk.isPrimitiveType()) {

2
src/plugins/cpptools/builtineditordocumentprocessor.cpp
View File

@@ -123,7 +123,7 @@ CppTools::CheckSymbols *createHighlighter(const CPlusPlus::Document::Ptr &doc,
const QString name = macro.macro().nameToQString(); const QString name = macro.macro().nameToQString();
//Filter out QtKeywords //Filter out QtKeywords
if (features.qtKeywordsEnabled && isQtKeyword(QStringRef(&name))) if (features.qtKeywordsEnabled && isQtKeyword(name))
continue; continue;
SimpleLexer tokenize; SimpleLexer tokenize;

2
src/plugins/cpptools/cpptoolsreuse.cpp
View File

@@ -214,7 +214,7 @@ bool isValidIdentifier(const QString &s)
return true; return true;
} }
bool isQtKeyword(const QStringRef &text) bool isQtKeyword(QStringView text)
{ {
switch (text.length()) { switch (text.length()) {
case 4: case 4:

2
src/plugins/cpptools/cpptoolsreuse.h
View File

@@ -52,7 +52,7 @@ namespace CppTools {
void CPPTOOLS_EXPORT moveCursorToEndOfIdentifier(QTextCursor *tc); void CPPTOOLS_EXPORT moveCursorToEndOfIdentifier(QTextCursor *tc);
void CPPTOOLS_EXPORT moveCursorToStartOfIdentifier(QTextCursor *tc); void CPPTOOLS_EXPORT moveCursorToStartOfIdentifier(QTextCursor *tc);
bool CPPTOOLS_EXPORT isQtKeyword(const QStringRef &text); bool CPPTOOLS_EXPORT isQtKeyword(QStringView text);
bool CPPTOOLS_EXPORT isValidAsciiIdentifierChar(const QChar &ch); bool CPPTOOLS_EXPORT isValidAsciiIdentifierChar(const QChar &ch);
bool CPPTOOLS_EXPORT isValidFirstIdentifierChar(const QChar &ch); bool CPPTOOLS_EXPORT isValidFirstIdentifierChar(const QChar &ch);