aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2022-12-12 09:52:28 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2022-12-12 15:20:04 +0000
commit168ff2c68c1aedd814dc3769b1b79cbe3ec6f86d (patch)
tree29d7fe9e03901db9e0e382af3b4a6355d349fe3c
parent8addb599a91f62036d040ac30368e65915c6077c (diff)
CppTypeHierarchy: Fix showing type hierarchy
Don't repeat the main symbol as its child inside derived hierarchy. The regression was introduced when addDerivedHierarchy() was added. Amends e2155a91df81e812c4f086d4558ead70c0ed2551 Change-Id: I34cd19be4307d355ea84fbdb64a06d0d3505e8a9 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/plugins/cppeditor/cppelementevaluator.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index 56677c7b29..98c31606e5 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -183,11 +183,12 @@ void CppClass::lookupDerived(QFutureInterfaceBase &futureInterface,
void CppClass::addDerivedHierarchy(const TypeHierarchy &hierarchy)
{
- CppClass classSymbol(hierarchy.symbol());
const QList<TypeHierarchy> derivedHierarchies = hierarchy.hierarchy();
- for (const TypeHierarchy &derivedHierarchy : derivedHierarchies)
+ for (const TypeHierarchy &derivedHierarchy : derivedHierarchies) {
+ CppClass classSymbol(derivedHierarchy.symbol());
classSymbol.addDerivedHierarchy(derivedHierarchy);
- derived.append(classSymbol);
+ derived.append(classSymbol);
+ }
}
class CppFunction : public CppDeclarableElement