1 files changed, 23 insertions, 37 deletions

diff --git a/sources/shiboken6/ApiExtractor/apiextractorresult.cpp b/sources/shiboken6/ApiExtractor/apiextractorresult.cpp
index 8067290d1..2a48a30d1 100644
--- a/sources/shiboken6/ApiExtractor/apiextractorresult.cpp
+++ b/sources/shiboken6/ApiExtractor/apiextractorresult.cpp
@@ -2,98 +2,84 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "apiextractorresult.h"
-#include "apiextractorresultdata_p.h"
 #include "abstractmetalang.h"
 #include "abstractmetaenum.h"
 
 #include "enumtypeentry.h"
 #include "flagstypeentry.h"
 
-ApiExtractorResultData::ApiExtractorResultData() = default;
-
-ApiExtractorResultData::~ApiExtractorResultData()
-{
-    qDeleteAll(m_smartPointers);
-    qDeleteAll(m_metaClasses);
-    qDeleteAll(m_templates);
-    for (auto &smp : m_instantiatedSmartPointers)
-        delete smp.specialized;
-    qDeleteAll(m_synthesizedTypeEntries);
-}
-
-ApiExtractorResult::ApiExtractorResult() : d(new ApiExtractorResultData)
-{
-}
-
-ApiExtractorResult::ApiExtractorResult(ApiExtractorResultData *data) :
-    d(data)
-{
-}
+ApiExtractorResult::ApiExtractorResult() = default;
 
 ApiExtractorResult::ApiExtractorResult(const ApiExtractorResult &) = default;
 
 ApiExtractorResult &ApiExtractorResult::operator=(const ApiExtractorResult &) = default;
 
-ApiExtractorResult::ApiExtractorResult(ApiExtractorResult &&) = default;
+ApiExtractorResult::ApiExtractorResult(ApiExtractorResult &&) noexcept = default;
 
-ApiExtractorResult &ApiExtractorResult::operator=(ApiExtractorResult &&) = default;
+ApiExtractorResult &ApiExtractorResult::operator=(ApiExtractorResult &&) noexcept = default;
 
 ApiExtractorResult::~ApiExtractorResult() = default;
 
 const AbstractMetaEnumList &ApiExtractorResult::globalEnums() const
 {
-    return d->m_globalEnums;
+    return m_globalEnums;
 }
 
 const AbstractMetaFunctionCList &ApiExtractorResult::globalFunctions() const
 {
-    return d->m_globalFunctions;
+    return m_globalFunctions;
 }
 
 const AbstractMetaClassCList &ApiExtractorResult::classes() const
 {
-    return d->m_metaClasses;
+    return m_metaClasses;
 }
 
 const AbstractMetaClassCList &ApiExtractorResult::smartPointers() const
 {
-    return d->m_smartPointers;
+    return m_smartPointers;
 }
 
 const AbstractMetaTypeList &ApiExtractorResult::instantiatedContainers() const
 {
-    return d->m_instantiatedContainers;
+    return m_instantiatedContainers;
 }
 
 const InstantiatedSmartPointers &ApiExtractorResult::instantiatedSmartPointers() const
 {
-    return d->m_instantiatedSmartPointers;
+    return m_instantiatedSmartPointers;
+}
+
+const QMultiHash<QString, QString> &ApiExtractorResult::typedefTargetToName() const
+{
+    return m_typedefTargetToName;
 }
 
 ApiExtractorFlags ApiExtractorResult::flags() const
 {
-    return d->m_flags;
+    return m_flags;
 }
 
 void ApiExtractorResult::setFlags(ApiExtractorFlags f)
 {
-    d->m_flags = f;
+    m_flags = f;
 }
 
-std::optional<AbstractMetaEnum> ApiExtractorResult::findAbstractMetaEnum(const TypeEntry *typeEntry) const
+std::optional<AbstractMetaEnum>
+    ApiExtractorResult::findAbstractMetaEnum(TypeEntryCPtr typeEntry) const
 {
     if (typeEntry && typeEntry->isFlags())
-        typeEntry = static_cast<const FlagsTypeEntry *>(typeEntry)->originator();
-    const auto it = d->m_enums.constFind(typeEntry);
-    if (it == d->m_enums.constEnd())
+        typeEntry = std::static_pointer_cast<const FlagsTypeEntry>(typeEntry)->originator();
+    const auto it = m_enums.constFind(typeEntry);
+    if (it == m_enums.constEnd())
         return {};
     return it.value();
 }
 
-AbstractMetaFunctionCList ApiExtractorResult::implicitConversions(const TypeEntry *type) const
+AbstractMetaFunctionCList ApiExtractorResult::implicitConversions(const TypeEntryCPtr &type) const
 {
     if (type->isValue()) {
-        if (auto metaClass = AbstractMetaClass::findClass(d->m_metaClasses, type))
+        if (auto metaClass = AbstractMetaClass::findClass(m_metaClasses, type))
             return metaClass->implicitConversions();
     }
     return {};