1 files changed, 28 insertions, 10 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h
index d1a0fbf88..d84a82af3 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h
@@ -288,6 +288,7 @@ class AbstractMetaType
 {
     Q_GADGET
 public:
+    typedef QVector<Indirection> Indirections;
 
     enum TypeUsagePattern {
         InvalidPattern,
@@ -436,6 +437,9 @@ public:
         m_constant = constant;
     }
 
+    bool isVolatile() const { return m_volatile; }
+    void setVolatile(bool v) { m_volatile = v; }
+
     bool isConstRef() const;
 
     ReferenceType referenceType() const { return m_referenceType; }
@@ -443,16 +447,21 @@ public:
 
     int actualIndirections() const
     {
-        return m_indirections + (m_referenceType == LValueReference ? 1 : 0);
-    }
-    int indirections() const
-    {
-        return m_indirections;
+        return m_indirections.size() + (m_referenceType == LValueReference ? 1 : 0);
     }
+
+    Indirections indirectionsV() const { return m_indirections; }
+    void setIndirectionsV(const Indirections &i) { m_indirections = i; }
+    void clearIndirections() { m_indirections.clear(); }
+
+    // "Legacy"?
+    int indirections() const { return m_indirections.size(); }
     void setIndirections(int indirections)
     {
-        m_indirections = indirections;
+        m_indirections = Indirections(indirections, Indirection::Pointer);
     }
+    void addIndirection(Indirection i = Indirection::Pointer)
+        { m_indirections.append(i); }
 
     void setArrayElementCount(int n)
     {
@@ -527,6 +536,8 @@ public:
 
     bool hasTemplateChildren() const;
 
+    bool equals(const AbstractMetaType &rhs) const;
+
 private:
     TypeUsagePattern determineUsagePattern() const;
     QString formatSignature(bool minimal) const;
@@ -541,18 +552,25 @@ private:
     int m_arrayElementCount = -1;
     const AbstractMetaType *m_arrayElementType = nullptr;
     const AbstractMetaType *m_originalTemplateType = nullptr;
+    Indirections m_indirections;
 
     TypeUsagePattern m_pattern = InvalidPattern;
     uint m_constant : 1;
+    uint m_volatile : 1;
     uint m_cppInstantiation : 1;
-    int m_indirections : 4;
-    uint m_reserved : 26; // unused
+    uint m_reserved : 29; // unused
+
     ReferenceType m_referenceType = NoReference;
     AbstractMetaTypeList m_children;
 
     Q_DISABLE_COPY(AbstractMetaType)
 };
 
+inline bool operator==(const AbstractMetaType &t1, const AbstractMetaType &t2)
+{ return t1.equals(t2); }
+inline bool operator!=(const AbstractMetaType &t1, const AbstractMetaType &t2)
+{ return !t1.equals(t2); }
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug d, const AbstractMetaType *at);
 #endif
@@ -816,13 +834,13 @@ public:
         return m_explicit;
     }
 
-    static bool isConversionOperator(QString funcName);
+    static bool isConversionOperator(const QString& funcName);
     bool isConversionOperator() const
     {
         return isConversionOperator(originalName());
     }
 
-    static bool isOperatorOverload(QString funcName);
+    static bool isOperatorOverload(const QString& funcName);
     bool isOperatorOverload() const
     {
         return isOperatorOverload(originalName());