1 files changed, 36 insertions, 38 deletions

diff --git a/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp b/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp
index 2dff569cb..f8c5c31d8 100644
--- a/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp
+++ b/sources/shiboken6/ApiExtractor/parser/typeinfo.cpp
@@ -7,6 +7,7 @@
 #include "codemodel.h"
 
 #include <clangparser/clangutils.h>
+#include <debughelpers_p.h>
 
 #include "qtcompat.h"
 
@@ -46,10 +47,10 @@ public:
         };
     };
 
-    ReferenceType m_referenceType;
+    ReferenceType m_referenceType = NoReference;
 };
 
-TypeInfoData::TypeInfoData() : flags(0), m_referenceType(NoReference)
+TypeInfoData::TypeInfoData() : flags(0)
 {
 }
 
@@ -60,9 +61,8 @@ TypeInfo::TypeInfo() : d(new TypeInfoData)
 TypeInfo::~TypeInfo() = default;
 TypeInfo::TypeInfo(const TypeInfo &) = default;
 TypeInfo& TypeInfo::operator=(const TypeInfo &) = default;
-TypeInfo::TypeInfo(TypeInfo &&) = default;
-TypeInfo& TypeInfo::operator=(TypeInfo &&) = default;
-
+TypeInfo::TypeInfo(TypeInfo &&) noexcept = default;
+TypeInfo &TypeInfo::operator=(TypeInfo &&) noexcept = default;
 
 static inline TypeInfo createType(const QString &name)
 {
@@ -98,7 +98,7 @@ TypeInfo TypeInfo::combine(const TypeInfo &__lhs, const TypeInfo &__rhs)
 
     __result.setArrayElements(__result.arrayElements() + __rhs.arrayElements());
 
-    const auto instantiations = __rhs.instantiations();
+    const auto &instantiations = __rhs.instantiations();
     for (const auto &i : instantiations)
         __result.addInstantiation(i);
 
@@ -266,6 +266,12 @@ void TypeInfo::clearInstantiations()
         d->m_instantiations.clear();
 }
 
+bool TypeInfo::isPlain() const
+{
+    return d->m_constant == 0 && d->m_volatile == 0 && d->m_referenceType == NoReference
+        &&  d->m_indirections.isEmpty() && d->m_arrayElements.isEmpty();
+}
+
 TypeInfo TypeInfo::resolveType(TypeInfo const &__type, const ScopeModelItem &__scope)
 {
     CodeModel *__model = __scope->model();
@@ -286,14 +292,14 @@ TypeInfo TypeInfo::resolveType(CodeModelItem __item, TypeInfo const &__type, con
         otherType.setQualifiedName(__item->qualifiedName());
     }
 
-    if (TypeDefModelItem __typedef = qSharedPointerDynamicCast<_TypeDefModelItem>(__item)) {
+    if (TypeDefModelItem __typedef = std::dynamic_pointer_cast<_TypeDefModelItem>(__item)) {
         const TypeInfo combined = TypeInfo::combine(__typedef->type(), otherType);
         const CodeModelItem nextItem = __scope->model()->findItem(combined.qualifiedName(), __scope);
         if (!nextItem)
             return combined;
         // PYSIDE-362, prevent recursion on opaque structs like
         // typedef struct xcb_connection_t xcb_connection_t;
-        if (nextItem.data() ==__item.data()) {
+        if (nextItem.get() ==__item.get()) {
             std::cerr << "** WARNING Bailing out recursion of " << __FUNCTION__
                 << "() on " << qPrintable(__type.qualifiedName().join(u"::"_s))
                 << std::endl;
@@ -302,18 +308,18 @@ TypeInfo TypeInfo::resolveType(CodeModelItem __item, TypeInfo const &__type, con
         return resolveType(nextItem, combined, __scope);
     }
 
-    if (TemplateTypeAliasModelItem templateTypeAlias = qSharedPointerDynamicCast<_TemplateTypeAliasModelItem>(__item)) {
+    if (TemplateTypeAliasModelItem templateTypeAlias = std::dynamic_pointer_cast<_TemplateTypeAliasModelItem>(__item)) {
 
         TypeInfo combined = TypeInfo::combine(templateTypeAlias->type(), otherType);
         // For the alias "template<typename T> using QList = QVector<T>" with
         // other="QList<int>", replace the instantiations to obtain "QVector<int>".
         auto aliasInstantiations = templateTypeAlias->type().instantiations();
         const auto &concreteInstantiations = otherType.instantiations();
-        const int count = qMin(aliasInstantiations.size(), concreteInstantiations.size());
-        for (int i = 0; i < count; ++i)
-            aliasInstantiations[i] = concreteInstantiations[i];
+        const auto count = qMin(aliasInstantiations.size(), concreteInstantiations.size());
+        for (qsizetype i = 0; i < count; ++i)
+            aliasInstantiations[i] = concreteInstantiations.at(i);
         combined.setInstantiations(aliasInstantiations);
-        const CodeModelItem nextItem = __scope->model()->findItem(combined.qualifiedName(), __scope);
+        const CodeModelItem nextItem = CodeModel::findItem(combined.qualifiedName(), __scope);
         if (!nextItem)
             return combined;
         return resolveType(nextItem, combined, __scope);
@@ -341,6 +347,10 @@ public:
         while (level < m_parseStack.size())
             m_parseStack.pop();
         TypeInfo instantiation;
+        if (name.startsWith(u"const ")) {
+            instantiation.setConstant(true);
+            name = name.mid(6);
+        }
         instantiation.setQualifiedName(qualifiedName(name));
         top()->addInstantiation(instantiation);
    }
@@ -361,7 +371,8 @@ private:
     QStack<TypeInfo *> m_parseStack;
 };
 
-QPair<int, int> TypeInfo::parseTemplateArgumentList(const QString &l, int from)
+std::pair<qsizetype, qsizetype>
+    TypeInfo::parseTemplateArgumentList(const QString &l, qsizetype from)
 {
     return clang::parseTemplateArgumentList(l, clang::TemplateArgumentHandler(TypeInfoTemplateArgumentHandler(this)), from);
 }
@@ -377,9 +388,9 @@ QString TypeInfo::toString() const
 
     tmp += d->m_qualifiedName.join(u"::"_s);
 
-    if (const int instantiationCount = d->m_instantiations.size()) {
+    if (const auto instantiationCount = d->m_instantiations.size()) {
         tmp += u'<';
-        for (int i = 0; i < instantiationCount; ++i) {
+        for (qsizetype i = 0; i < instantiationCount; ++i) {
             if (i)
                 tmp += u", "_s;
             tmp += d->m_instantiations.at(i).toString();
@@ -441,34 +452,31 @@ bool TypeInfoData::equals(const TypeInfoData &other) const
            && m_instantiations == other.m_instantiations;
 }
 
-bool TypeInfo::equals(const TypeInfo &other) const
+
+bool comparesEqual(const TypeInfo &lhs, const TypeInfo &rhs) noexcept
 {
-    return d.data() == other.d.data() || d->equals(*other.d);
+   return lhs.d.data() == rhs.d.data() || lhs.d->equals(*rhs.d);
 }
 
 QString TypeInfo::indirectionKeyword(Indirection i)
 {
-    return i == Indirection::Pointer
-        ? QStringLiteral("*") : QStringLiteral("*const");
+    return i == Indirection::Pointer ? "*"_L1 : "*const"_L1;
 }
 
-static inline QString constQualifier() { return QStringLiteral("const"); }
-static inline QString volatileQualifier() { return QStringLiteral("volatile"); }
-
 bool TypeInfo::stripLeadingConst(QString *s)
 {
-    return stripLeadingQualifier(constQualifier(), s);
+    return stripLeadingQualifier("const"_L1, s);
 }
 
 bool TypeInfo::stripLeadingVolatile(QString *s)
 {
-    return stripLeadingQualifier(volatileQualifier(), s);
+    return stripLeadingQualifier("volatile"_L1, s);
 }
 
-bool TypeInfo::stripLeadingQualifier(const QString &qualifier, QString *s)
+bool TypeInfo::stripLeadingQualifier(QLatin1StringView qualifier, QString *s)
 {
     // "const int x"
-    const int qualifierSize = qualifier.size();
+    const auto qualifierSize = qualifier.size();
     if (s->size() < qualifierSize + 1 || !s->startsWith(qualifier)
         || !s->at(qualifierSize).isSpace()) {
         return false;
@@ -514,7 +522,7 @@ void TypeInfoData::simplifyStdType()
     Q_ASSERT(isStdType());
     if (m_qualifiedName.at(1).startsWith(u"__"))
         m_qualifiedName.removeAt(1);
-    for (int t = m_instantiations.size() - 1; t >= 0; --t) {
+    for (auto t = m_instantiations.size() - 1; t >= 0; --t) {
         if (m_instantiations.at(t).isStdType()) {
             if (discardStdType(m_instantiations.at(t).qualifiedName().constLast()))
                 m_instantiations.removeAt(t);
@@ -558,16 +566,6 @@ void TypeInfo::formatTypeSystemSignature(QTextStream &str) const
 }
 
 #ifndef QT_NO_DEBUG_STREAM
-template <class It>
-void formatSequence(QDebug &d, It i1, It i2, const char *separator=", ")
-{
-    for (It i = i1; i != i2; ++i) {
-        if (i != i1)
-            d << separator;
-        d << *i;
-    }
-}
-
 void TypeInfo::formatDebug(QDebug &debug) const
 {
     debug << '"';