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

@@ -570,15 +570,11 @@ void CppModelManager::findUnusedFunctions(const FilePath &folder)
continue;
}
Link link;
if (entry.internalData.canConvert<Link>()) {
if (entry.internalData.canConvert<Link>())
link = qvariant_cast<Link>(entry.internalData);
} else {
const auto item = qvariant_cast<IndexItem::Ptr>(entry.internalData);
if (item) {
link = Link(FilePath::fromString(item->fileName()), item->line(),
item->column());
}
}
else if (const auto item = qvariant_cast<IndexItem::Ptr>(entry.internalData))
link = Link(item->filePath(), item->line(), item->column());
if (link.hasValidTarget() && link.targetFilePath.isReadableFile()
&& (folder.isEmpty() || link.targetFilePath.isChildOf(folder))
&& SessionManager::projectForFile(link.targetFilePath)) {