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

CamelHumpMatcher: Modernize

Browse Source 
* Use QRegularExpression instead QRegExp
* Use range-for instead foreach
* Remove QLatin1String/Char

Change-Id: I27516a4e3ca724c1f3cfab5b729d545547df873f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2017-07-27 06:44:35 +02:00
committed by André Hartmann
parent eb5de6a897
commit 95310b28f3
4 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@
#include <texteditor/completionsettings.h>
#include <QDebug>
#include <QRegExp>
#include <QRegularExpression>
#include <QtAlgorithms>
#include <QHash>
@@ -257,13 +257,13 @@ void GenericProposalModel::filter(const QString &prefix)
const CamelHumpMatcher::CaseSensitivity caseSensitivity =
convertCaseSensitivity(TextEditorSettings::completionSettings().m_caseSensitivity);
const QRegExp regExp = CamelHumpMatcher::createCamelHumpRegExp(prefix, caseSensitivity);
const QRegularExpression regExp = CamelHumpMatcher::createCamelHumpRegExp(prefix, caseSensitivity);
m_currentItems.clear();
const QString lowerPrefix = prefix.toLower();
foreach (const auto &item, m_originalItems) {
const QString &text = item->text();
if (regExp.indexIn(text) == 0) {
if (regExp.match(text).hasMatch()) {
m_currentItems.append(item);
if (text.startsWith(prefix)) {
// Direct match