summaryrefslogtreecommitdiff
path: root/src/plugins/qmljstools/qmljsfunctionfilter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qmljstools/qmljsfunctionfilter.cpp')
-rw-r--r--src/plugins/qmljstools/qmljsfunctionfilter.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index 9da8cc3c68..32e709b562 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -39,7 +39,7 @@ using namespace QmlJSTools::Internal;
Q_DECLARE_METATYPE(LocatorData::Entry)
FunctionFilter::FunctionFilter(LocatorData *data, QObject *parent)
- : Locator::ILocatorFilter(parent)
+ : Core::ILocatorFilter(parent)
, m_data(data)
{
setId("Functions");
@@ -55,17 +55,17 @@ void FunctionFilter::refresh(QFutureInterface<void> &)
{
}
-static bool compareLexigraphically(const Locator::FilterEntry &a,
- const Locator::FilterEntry &b)
+static bool compareLexigraphically(const Core::LocatorFilterEntry &a,
+ const Core::LocatorFilterEntry &b)
{
return a.displayName < b.displayName;
}
-QList<Locator::FilterEntry> FunctionFilter::matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &origEntry)
+QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &origEntry)
{
QString entry = trimWildcards(origEntry);
- QList<Locator::FilterEntry> goodEntries;
- QList<Locator::FilterEntry> betterEntries;
+ QList<Core::LocatorFilterEntry> goodEntries;
+ QList<Core::LocatorFilterEntry> betterEntries;
const QChar asterisk = QLatin1Char('*');
QStringMatcher matcher(entry, Qt::CaseInsensitive);
QRegExp regexp(asterisk + entry+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
@@ -89,7 +89,7 @@ QList<Locator::FilterEntry> FunctionFilter::matchesFor(QFutureInterface<Locator:
|| (!hasWildcard && matcher.indexIn(info.symbolName) != -1)) {
QVariant id = qVariantFromValue(info);
- Locator::FilterEntry filterEntry(this, info.displayName, id/*, info.icon*/);
+ Core::LocatorFilterEntry filterEntry(this, info.displayName, id/*, info.icon*/);
filterEntry.extraInfo = info.extraInfo;
if (info.symbolName.startsWith(entry, caseSensitivityForPrefix))
@@ -109,7 +109,7 @@ QList<Locator::FilterEntry> FunctionFilter::matchesFor(QFutureInterface<Locator:
return betterEntries;
}
-void FunctionFilter::accept(Locator::FilterEntry selection) const
+void FunctionFilter::accept(Core::LocatorFilterEntry selection) const
{
const LocatorData::Entry entry = qvariant_cast<LocatorData::Entry>(selection.internalData);
Core::EditorManager::openEditorAt(entry.fileName, entry.line, entry.column);