shiboken6: Make some TypeEntry query functions free functions

Some query functions like TypeEntry::typeSystemTypeEntry() search in
the hierarchy, starting with "this". This cannot be ported to smart
pointers, so the functions are changed to be free functions where the
first element has to be passed in.

Change-Id: I3122b648ad499a2236577f6a101e8637a2f87d55
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/sources/shiboken6/ApiExtractor/apiextractor.cpp b/sources/shiboken6/ApiExtractor/apiextractor.cpp
index 8c0286f7d..62b12362e 100644
--- a/sources/shiboken6/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken6/ApiExtractor/apiextractor.cpp
@@ -602,9 +602,9 @@ static bool generateOpaqueContainer(const AbstractMetaType &type,
                                     const TypeSystemTypeEntry *moduleEntry)
 {
     auto *te = type.instantiations().constFirst().typeEntry();
-    auto *typeModuleEntry = te->typeSystemTypeEntry();
+    auto *typeModuleEntry = typeSystemTypeEntry(te);
     return typeModuleEntry == moduleEntry
-           || (te->isPrimitive() && type.typeEntry()->typeSystemTypeEntry() == moduleEntry);
+           || (te->isPrimitive() && typeSystemTypeEntry(type.typeEntry()) == moduleEntry);
 }
 
 void ApiExtractorPrivate::collectInstantiatedOpqaqueContainers(InstantiationCollectContext &context)