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

ILocatorFilter: Don't store IndexItem::Ptr as internalData

Browse Source 
Currently it's never read.

Change-Id: If89486ad8ad74c3431fe420d83fbec9a22855f04
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2023-03-20 23:46:47 +01:00
parent a854c3d273
commit 605dfa23cd
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppeditor/cpplocatorfilter.cpp
View File

@@ -25,8 +25,7 @@ CppLocatorFilter::CppLocatorFilter()
LocatorFilterEntry CppLocatorFilter::filterEntryFromIndexItem(IndexItem::Ptr info) LocatorFilterEntry CppLocatorFilter::filterEntryFromIndexItem(IndexItem::Ptr info)
{ {
const QVariant id = QVariant::fromValue(info); LocatorFilterEntry filterEntry(this, info->scopedSymbolName(), {}, info->icon());
LocatorFilterEntry filterEntry(this, info->scopedSymbolName(), id, info->icon());
filterEntry.linkForEditor = {info->filePath(), info->line(), info->column()}; filterEntry.linkForEditor = {info->filePath(), info->line(), info->column()};
if (info->type() == IndexItem::Class || info->type() == IndexItem::Enum) if (info->type() == IndexItem::Class || info->type() == IndexItem::Enum)
filterEntry.extraInfo = info->shortNativeFilePath(); filterEntry.extraInfo = info->shortNativeFilePath();
@@ -121,8 +120,7 @@ CppClassesFilter::CppClassesFilter()
LocatorFilterEntry CppClassesFilter::filterEntryFromIndexItem(IndexItem::Ptr info) LocatorFilterEntry CppClassesFilter::filterEntryFromIndexItem(IndexItem::Ptr info)
{ {
const QVariant id = QVariant::fromValue(info); LocatorFilterEntry filterEntry(this, info->symbolName(), {}, info->icon());
LocatorFilterEntry filterEntry(this, info->symbolName(), id, info->icon());
filterEntry.linkForEditor = {info->filePath(), info->line(), info->column()}; filterEntry.linkForEditor = {info->filePath(), info->line(), info->column()};
filterEntry.extraInfo = info->symbolScope().isEmpty() filterEntry.extraInfo = info->symbolScope().isEmpty()
? info->shortNativeFilePath() ? info->shortNativeFilePath()
@@ -141,8 +139,6 @@ CppFunctionsFilter::CppFunctionsFilter()
LocatorFilterEntry CppFunctionsFilter::filterEntryFromIndexItem(IndexItem::Ptr info) LocatorFilterEntry CppFunctionsFilter::filterEntryFromIndexItem(IndexItem::Ptr info)
{ {
const QVariant id = QVariant::fromValue(info);
QString name = info->symbolName(); QString name = info->symbolName();
QString extraInfo = info->symbolScope(); QString extraInfo = info->symbolScope();
info->unqualifiedNameAndScope(name, &name, &extraInfo); info->unqualifiedNameAndScope(name, &name, &extraInfo);
@@ -152,7 +148,7 @@ LocatorFilterEntry CppFunctionsFilter::filterEntryFromIndexItem(IndexItem::Ptr i
extraInfo.append(" (" + info->filePath().fileName() + ')'); extraInfo.append(" (" + info->filePath().fileName() + ')');
} }
LocatorFilterEntry filterEntry(this, name + info->symbolType(), id, info->icon()); LocatorFilterEntry filterEntry(this, name + info->symbolType(), {}, info->icon());
filterEntry.linkForEditor = {info->filePath(), info->line(), info->column()}; filterEntry.linkForEditor = {info->filePath(), info->line(), info->column()};
filterEntry.extraInfo = extraInfo; filterEntry.extraInfo = extraInfo;

3
src/plugins/qmljstools/qmljsfunctionfilter.cpp
View File

@@ -47,8 +47,7 @@ QList<LocatorFilterEntry> FunctionFilter::matchesFor(QFutureInterface<LocatorFil
const QRegularExpressionMatch match = regexp.match(info.symbolName); const QRegularExpressionMatch match = regexp.match(info.symbolName);
if (match.hasMatch()) { if (match.hasMatch()) {
QVariant id = QVariant::fromValue(info); LocatorFilterEntry filterEntry(this, info.displayName);
LocatorFilterEntry filterEntry(this, info.displayName, id/*, info.icon*/);
filterEntry.linkForEditor = {info.fileName, info.line, info.column}; filterEntry.linkForEditor = {info.fileName, info.line, info.column};
filterEntry.extraInfo = info.extraInfo; filterEntry.extraInfo = info.extraInfo;
filterEntry.highlightInfo = highlightInfo(match); filterEntry.highlightInfo = highlightInfo(match);