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

CppEditor: Re-use Symbol::filePath()

Browse Source 
Change-Id: Ic958fc0b8916c1afe8b955b140a5cf76e971623d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-11-24 17:20:48 +01:00
parent 8ee463f311
commit a2d2150261
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cppeditor/cppfindreferences.cpp
View File

@@ -329,9 +329,8 @@ static void find_helper(QFutureInterface<CPlusPlus::Usage> &future,
const CPlusPlus::Snapshot snapshot = context.snapshot();
const Utils::FilePath sourceFile = Utils::FilePath::fromUtf8(symbol->fileName(),
symbol->fileNameLength());
Utils::FilePaths files{sourceFile};
const FilePath sourceFile = symbol->filePath();
FilePaths files{sourceFile};
if (symbol->asClass()
|| symbol->asForwardClassDeclaration()

14
src/plugins/cppeditor/typehierarchybuilder.cpp
View File

@@ -6,6 +6,7 @@
#include <cplusplus/FindUsages.h>
using namespace CPlusPlus;
using namespace Utils;
namespace CppEditor::Internal {
namespace {
@@ -162,14 +163,13 @@ LookupItem TypeHierarchyBuilder::followTypedef(const LookupContext &context, con
return matchingItem;
}
static Utils::FilePaths filesDependingOn(const Snapshot &snapshot,
Symbol *symbol)
static FilePaths filesDependingOn(const Snapshot &snapshot, Symbol *symbol)
{
if (!symbol)
return Utils::FilePaths();
return {};
const Utils::FilePath file = Utils::FilePath::fromUtf8(symbol->fileName(), symbol->fileNameLength());
return Utils::FilePaths { file } + snapshot.filesDependingOn(file);
const FilePath file = symbol->filePath();
return FilePaths{file} + snapshot.filesDependingOn(file);
}
void TypeHierarchyBuilder::buildDerived(QFutureInterfaceBase &futureInterface,
@@ -187,12 +187,12 @@ void TypeHierarchyBuilder::buildDerived(QFutureInterfaceBase &futureInterface,
const QString &symbolName = _overview.prettyName(LookupContext::fullyQualifiedName(symbol));
DerivedHierarchyVisitor visitor(symbolName, cache);
const Utils::FilePaths &dependingFiles = filesDependingOn(snapshot, symbol);
const FilePaths dependingFiles = filesDependingOn(snapshot, symbol);
if (depth == 0)
futureInterface.setProgressRange(0, dependingFiles.size());
int i = -1;
for (const Utils::FilePath &fileName : dependingFiles) {
for (const FilePath &fileName : dependingFiles) {
if (futureInterface.isCanceled())
return;
if (depth == 0)