From 168ff2c68c1aedd814dc3769b1b79cbe3ec6f86d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 12 Dec 2022 09:52:28 +0100 Subject: [PATCH] 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: Reviewed-by: Christian Kandeler --- src/plugins/cppeditor/cppelementevaluator.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp index 56677c7b29f..98c31606e5f 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 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