diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-12-17 10:24:47 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-12-17 11:07:06 +0000 |
| commit | 265ee14c8922da3708492542802d93e7ed233654 (patch) | |
| tree | a427b8a7db8c6d47d69eb82824a5de6f903dd940 /src/plugins/cpptools/cppelementevaluator.cpp | |
| parent | 5797b355a766e902ad7813e4d46dc9460609f86f (diff) | |
| download | qt-creator-265ee14c8922da3708492542802d93e7ed233654.tar.gz | |
Make buildDerivedTypeHierarchy() a static method
Drop CppTools namespace when being in this namespace.
Move a call to filesDependingOn() into buildDerived().
Make filesDependingOn() a static method.
Change-Id: I6139f87597286bddf8298b06f8cf492066c8bedd
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppelementevaluator.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppelementevaluator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cppelementevaluator.cpp b/src/plugins/cpptools/cppelementevaluator.cpp index 0e739ddeab..27c6f25ad0 100644 --- a/src/plugins/cpptools/cppelementevaluator.cpp +++ b/src/plugins/cpptools/cppelementevaluator.cpp @@ -50,7 +50,7 @@ static void handleLookupItemMatch(QFutureInterface<QSharedPointer<CppElement>> & const Snapshot &snapshot, const LookupItem &lookupItem, const LookupContext &context, - CppTools::SymbolFinder symbolFinder, + SymbolFinder symbolFinder, bool lookupBaseClasses, bool lookupDerivedClasses); @@ -211,13 +211,13 @@ void CppClass::lookupBases(QFutureInterfaceBase &futureInterface, void CppClass::lookupDerived(QFutureInterfaceBase &futureInterface, Symbol *declaration, const Snapshot &snapshot) { - using Data = QPair<CppClass*, CppTools::TypeHierarchy>; + using Data = QPair<CppClass*, TypeHierarchy>; snapshot.updateDependencyTable(futureInterface); if (futureInterface.isCanceled()) return; - CppTools::TypeHierarchyBuilder builder(declaration, snapshot); - const CppTools::TypeHierarchy &completeHierarchy = builder.buildDerivedTypeHierarchy(futureInterface); + const TypeHierarchy &completeHierarchy + = TypeHierarchyBuilder::buildDerivedTypeHierarchy(futureInterface, declaration, snapshot); QQueue<Data> q; q.enqueue(qMakePair(this, completeHierarchy)); @@ -226,8 +226,8 @@ void CppClass::lookupDerived(QFutureInterfaceBase &futureInterface, return; const Data ¤t = q.dequeue(); CppClass *clazz = current.first; - const CppTools::TypeHierarchy &classHierarchy = current.second; - foreach (const CppTools::TypeHierarchy &derivedHierarchy, classHierarchy.hierarchy()) { + const TypeHierarchy &classHierarchy = current.second; + foreach (const TypeHierarchy &derivedHierarchy, classHierarchy.hierarchy()) { clazz->derived.append(CppClass(derivedHierarchy.symbol())); q.enqueue(qMakePair(&clazz->derived.last(), derivedHierarchy)); } @@ -349,7 +349,7 @@ public: CppElementEvaluator::CppElementEvaluator(TextEditor::TextEditorWidget *editor) : m_editor(editor), - m_modelManager(CppTools::CppModelManager::instance()), + m_modelManager(CppModelManager::instance()), m_tc(editor->textCursor()), m_lookupBaseClasses(false), m_lookupDerivedClasses(false) @@ -497,7 +497,7 @@ static void handleLookupItemMatch(QFutureInterface<QSharedPointer<CppElement>> & const Snapshot &snapshot, const LookupItem &lookupItem, const LookupContext &context, - CppTools::SymbolFinder symbolFinder, + SymbolFinder symbolFinder, bool lookupBaseClasses, bool lookupDerivedClasses) { |