diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2017-09-28 20:09:27 +0200 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2017-09-29 07:03:43 +0000 |
commit | 8730dbd4e6861e425ab8ecaa8890b313c21025c3 (patch) | |
tree | ac9bec99d64ca8171cb2451a2307609ffe37f598 /src/plugins/coreplugin/locator/ilocatorfilter.cpp | |
parent | e0639d0696cdac7babc31893a7f5d65619ec7b85 (diff) |
Locator: De-duplicate RegExp pattern generation
Change-Id: I3576e1507aebed15245e1f197995bfe9e345e32b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/locator/ilocatorfilter.cpp')
-rw-r--r-- | src/plugins/coreplugin/locator/ilocatorfilter.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp index 3a0d897a63..1681544608 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp @@ -26,6 +26,7 @@ #include "ilocatorfilter.h" #include <coreplugin/coreconstants.h> +#include <utils/camelhumpmatcher.h> #include <QBoxLayout> #include <QCheckBox> @@ -212,7 +213,7 @@ bool ILocatorFilter::containsWildcard(const QString &str) * The regular expression contains capture groups to allow highlighting * matched characters after a match. */ -QRegularExpression ILocatorFilter::createWildcardRegExp(const QString &text) +static QRegularExpression createWildcardRegExp(const QString &text) { QString pattern = '(' + text + ')'; pattern.replace('?', ").("); @@ -221,6 +222,12 @@ QRegularExpression ILocatorFilter::createWildcardRegExp(const QString &text) return QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption); } +QRegularExpression ILocatorFilter::createRegExp(const QString &text) +{ + return containsWildcard(text) ? createWildcardRegExp(text) + : CamelHumpMatcher::createCamelHumpRegExp(text); +} + /*! Specifies a title for configuration dialogs. */ |