1 files changed, 9 insertions, 24 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h
index 26702d3a2..a16f79c30 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h
@@ -135,6 +135,8 @@ public:
 
         Invokable                   = 0x00040000,
 
+        HasRejectedConstructor      = 0x00080000,
+
         Final                       = FinalInTargetLang | FinalInCpp
     };
     Q_DECLARE_FLAGS(Attributes, Attribute)
@@ -842,7 +844,6 @@ public:
             m_declaringClass(0),
             m_propertySpec(0),
             m_constant(false),
-            m_invalid(false),
             m_reverse(false),
             m_userAdded(false),
             m_explicit(false),
@@ -956,7 +957,7 @@ public:
     // true if one or more of the arguments are of QtJambiObject subclasses
     bool argumentsHaveNativeId() const
     {
-        foreach (const AbstractMetaArgument *arg, m_arguments) {
+        for (const AbstractMetaArgument *arg : m_arguments) {
             if (arg->type()->hasNativeId())
                 return true;
         }
@@ -1029,14 +1030,6 @@ public:
     }
     int actualMinimumArgumentCount() const;
 
-    void setInvalid(bool on)
-    {
-        m_invalid = on;
-    }
-    bool isInvalid() const
-    {
-        return m_invalid;
-    }
     bool isDeprecated() const;
     bool isDestructor() const
     {
@@ -1122,7 +1115,7 @@ public:
     QString replacedDefaultExpression(const AbstractMetaClass *cls, int idx) const;
     bool removedDefaultExpression(const AbstractMetaClass *cls, int idx) const;
     QString conversionRule(TypeSystem::Language language, int idx) const;
-    QList<ReferenceCount> referenceCounts(const AbstractMetaClass *cls, int idx = -2) const;
+    QVector<ReferenceCount> referenceCounts(const AbstractMetaClass *cls, int idx = -2) const;
     ArgumentOwner argumentOwner(const AbstractMetaClass *cls, int idx) const;
 
     bool nullPointersDisabled(const AbstractMetaClass *cls = 0, int argument_idx = 0) const;
@@ -1215,7 +1208,6 @@ private:
     QPropertySpec *m_propertySpec;
     AbstractMetaArgumentList m_arguments;
     uint m_constant                 : 1;
-    uint m_invalid                  : 1;
     uint m_reverse                  : 1;
     uint m_userAdded                : 1;
     uint m_explicit                 : 1;
@@ -1293,13 +1285,6 @@ private:
     Documentation m_doc;
 };
 
-
-class AbstractMetaEnumValueList : public QList<AbstractMetaEnumValue *>
-{
-public:
-    AbstractMetaEnumValue *find(const QString &name) const;
-};
-
 class AbstractMetaEnum : public AbstractMetaAttributes
 {
 public:
@@ -1698,12 +1683,12 @@ public:
     bool hasProtectedMembers() const;
 
 
-    QList<TypeEntry *> templateArguments() const
+    QVector<TypeEntry *> templateArguments() const
     {
         return m_templateArgs;
     }
 
-    void setTemplateArguments(const QList<TypeEntry *> &args)
+    void setTemplateArguments(const QVector<TypeEntry *> &args)
     {
         m_templateArgs = args;
     }
@@ -1772,7 +1757,7 @@ public:
         m_propertySpecs << spec;
     }
 
-    QList<QPropertySpec *> propertySpecs() const
+    QVector<QPropertySpec *> propertySpecs() const
     {
         return m_propertySpecs;
     }
@@ -1874,13 +1859,13 @@ private:
     AbstractMetaEnumList m_enums;
     AbstractMetaClassList m_interfaces;
     AbstractMetaClass *m_extractedInterface;
-    QList<QPropertySpec *> m_propertySpecs;
+    QVector<QPropertySpec *> m_propertySpecs;
     AbstractMetaClassList m_innerClasses;
 
     AbstractMetaFunctionList m_externalConversionOperators;
 
     QStringList m_baseClassNames;
-    QList<TypeEntry *> m_templateArgs;
+    QVector<TypeEntry *> m_templateArgs;
     ComplexTypeEntry *m_typeEntry;
 //     FunctionModelItem m_qDebugStreamFunction;