1 files changed, 8 insertions, 37 deletions
diff --git a/sources/shiboken6/ApiExtractor/typesystem.cpp b/sources/shiboken6/ApiExtractor/typesystem.cpp
index 0a1f4b888..407d63b0c 100644
--- a/sources/shiboken6/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystem.cpp
@@ -71,6 +71,7 @@ public:
 
     const TypeEntry *m_parent;
     QString m_name; // C++ fully qualified
+    QString m_targetLangApiName;
     mutable QString m_cachedShortName; // C++ excluding inline namespaces
     QString m_entryName;
     QString m_targetLangPackage;
@@ -430,7 +431,13 @@ QString TypeEntry::qualifiedCppName() const
 
 QString TypeEntry::targetLangApiName() const
 {
-    return m_d->m_name;
+    return m_d->m_targetLangApiName.isEmpty()
+        ? m_d->m_name : m_d->m_targetLangApiName;
+}
+
+void TypeEntry::setTargetLangApiName(const QString &t)
+{
+    m_d->m_targetLangApiName = t;
 }
 
 QString TypeEntry::targetLangName() const
@@ -778,14 +785,6 @@ QString ArrayTypeEntry::buildTargetLangName() const
     return d->m_nestedType->targetLangName() + QLatin1String("[]");
 }
 
-QString ArrayTypeEntry::targetLangApiName() const
-{
-    S_D(const ArrayTypeEntry);
-    return d->m_nestedType->isPrimitive()
-        ? d->m_nestedType->targetLangApiName() + QLatin1String("Array")
-        : QLatin1String("jobjectArray");
-}
-
 TypeEntry *ArrayTypeEntry::clone() const
 {
     S_D(const ArrayTypeEntry);
@@ -808,7 +807,6 @@ public:
     {
     }
 
-    QString m_targetLangApiName;
     QString m_defaultConstructor;
     uint m_preferredTargetLangType : 1;
     PrimitiveTypeEntry* m_referencedTypeEntry = nullptr;
@@ -820,18 +818,6 @@ PrimitiveTypeEntry::PrimitiveTypeEntry(const QString &entryName, const QVersionN
 {
 }
 
-QString PrimitiveTypeEntry::targetLangApiName() const
-{
-    S_D(const PrimitiveTypeEntry);
-    return d->m_targetLangApiName;
-}
-
-void PrimitiveTypeEntry::setTargetLangApiName(const QString &targetLangApiName)
-{
-    S_D(PrimitiveTypeEntry);
-    d->m_targetLangApiName = targetLangApiName;
-}
-
 QString PrimitiveTypeEntry::defaultConstructor() const
 {
     S_D(const PrimitiveTypeEntry);
@@ -972,11 +958,6 @@ QStringList EnumTypeEntry::enumValueRejections() const
     return d->m_rejectedEnums;
 }
 
-QString EnumTypeEntry::targetLangApiName() const
-{
-    return QLatin1String("jint");
-}
-
 TypeEntry *EnumTypeEntry::clone() const
 {
     S_D(const EnumTypeEntry);
@@ -1068,11 +1049,6 @@ FlagsTypeEntry::FlagsTypeEntry(FlagsTypeEntryPrivate *d) :
 {
 }
 
-QString FlagsTypeEntry::targetLangApiName() const
-{
-    return QLatin1String("jint");
-}
-
 QString FlagsTypeEntry::originalName() const
 {
     S_D(const FlagsTypeEntry);
@@ -1179,11 +1155,6 @@ bool ComplexTypeEntry::isComplex() const
     return true;
 }
 
-QString ComplexTypeEntry::targetLangApiName() const
-{
-    return QStringLiteral("jobject");
-}
-
 void ComplexTypeEntry::setTypeFlags(TypeFlags flags)
 {
     S_D(ComplexTypeEntry);