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

GenericProposalModel: Modernize and cleanup

Browse Source 
Change-Id: Iae0733c9734f63900af32c89f553d6a337b49daf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2019-07-13 14:08:37 +02:00
committed by André Hartmann
parent 81d417ce36
commit b5badf97b7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/texteditor/codeassist/genericproposalmodel.cpp
View File

@@ -116,11 +116,10 @@ struct ContentLessThan
{ {
bool operator()(const QChar &a, const QChar &b) bool operator()(const QChar &a, const QChar &b)
{ {
if (a == QLatin1Char('_')) if (a == '_')
return false; return false;
else if (b == QLatin1Char('_')) if (b == '_')
return true; return true;
else
return a < b; return a < b;
} }
}; };
@@ -158,7 +157,7 @@ static QString cleanText(const QString &original)
int ignore = 0; int ignore = 0;
for (int i = clean.length() - 1; i >= 0; --i, ++ignore) { for (int i = clean.length() - 1; i >= 0; --i, ++ignore) {
const QChar &c = clean.at(i); const QChar &c = clean.at(i);
if (c.isLetterOrNumber() || c == QLatin1Char('_') if (c.isLetterOrNumber() || c == '_'
|| c.isHighSurrogate() || c.isLowSurrogate()) { || c.isHighSurrogate() || c.isLowSurrogate()) {
break; break;
} }
@@ -300,7 +299,7 @@ void GenericProposalModel::filter(const QString &prefix)
m_currentItems.clear(); m_currentItems.clear();
const QString lowerPrefix = prefix.toLower(); const QString lowerPrefix = prefix.toLower();
foreach (const auto &item, m_originalItems) { for (const auto &item : qAsConst(m_originalItems)) {
const QString &text = item->text(); const QString &text = item->text();
if (regExp.match(text).capturedStart() == 0) { if (regExp.match(text).capturedStart() == 0) {
m_currentItems.append(item); m_currentItems.append(item);