CppEditor: Switch to FilePath in IndexItem

... and fix fallout.

Change-Id: I45d27146806bdcb5ceb728b710eca51c7cd32ee2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-11-23 17:11:20 +01:00
parent dbdabf9c27
commit 038771051d
12 changed files with 34 additions and 44 deletions

View File

@@ -19,6 +19,7 @@
#include <tuple>
using namespace LanguageServerProtocol;
using namespace Utils;
namespace ClangCodeModel {
namespace Internal {
@@ -157,9 +158,7 @@ QList<Core::LocatorFilterEntry> ClangGlobalSymbolFilter::matchesFor(
for (const auto &entry : std::as_const(matches)) {
const CppEditor::IndexItem::Ptr item
= qvariant_cast<CppEditor::IndexItem::Ptr>(entry.internalData);
locations.insert(std::make_tuple(Utils::FilePath::fromString(item->fileName()),
item->line(),
item->column()));
locations.insert(std::make_tuple(item->filePath(), item->line(), item->column()));
}
for (const auto &entry : lspMatches) {
if (!entry.internalData.canConvert<Utils::Link>())