1 files changed, 3 insertions, 102 deletions
diff --git a/sources/shiboken6/libshiboken/basewrapper_p.h b/sources/shiboken6/libshiboken/basewrapper_p.h
index 526bf9fa3..fb9140793 100644
--- a/sources/shiboken6/libshiboken/basewrapper_p.h
+++ b/sources/shiboken6/libshiboken/basewrapper_p.h
@@ -114,7 +114,8 @@ struct SbkObjectTypePrivate
 
     /// True if this type holds two or more C++ instances, e.g.: a Python class which inherits from two C++ classes.
     unsigned int is_multicpp : 1;
-    /// True if this type was defined by the user.
+    /// True if this type was defined by the user (a class written in Python inheriting
+    /// a class provided by a Shiboken binding).
     unsigned int is_user_type : 1;
     /// Tells is the type is a value type or an object-type, see BEHAVIOUR_ *constants.
     unsigned int type_behaviour : 2;
@@ -142,107 +143,7 @@ struct DestructorEntry
  **/
 std::vector<SbkObject *> splitPyObject(PyObject *pyObj);
 
-/**
-*   Visitor class used by walkOnClassHierarchy function.
-*/
-class HierarchyVisitor
-{
-public:
-    HierarchyVisitor(const HierarchyVisitor &) = delete;
-    HierarchyVisitor(HierarchyVisitor &&) = delete;
-    HierarchyVisitor &operator=(const HierarchyVisitor &) = delete;
-    HierarchyVisitor &operator=(HierarchyVisitor &&) = delete;
-
-    HierarchyVisitor();
-    virtual ~HierarchyVisitor();
-
-    virtual bool visit(PyTypeObject *node) = 0; // return true to terminate
-};
-
-class BaseCountVisitor : public HierarchyVisitor
-{
-public:
-    bool visit(PyTypeObject *) override;
-
-    int count() const { return m_count; }
-
-private:
-    int m_count = 0;
-};
-
-class BaseAccumulatorVisitor : public HierarchyVisitor
-{
-public:
-    using Result = std::vector<PyTypeObject *>;
-
-    bool visit(PyTypeObject *node) override;
-
-    Result bases() const { return m_bases; }
-
-private:
-    Result m_bases;
-};
-
-class GetIndexVisitor : public HierarchyVisitor
-{
-public:
-    explicit GetIndexVisitor(PyTypeObject *desiredType) : m_desiredType(desiredType) {}
-
-    bool visit(PyTypeObject *node) override;
-
-    int index() const { return m_index; }
-
-private:
-    int m_index = -1;
-    PyTypeObject *m_desiredType;
-};
-
-/// Collect destructors and C++ instances of each C++ object held by a Python
-/// object
-class DtorAccumulatorVisitor : public HierarchyVisitor
-{
-public:
-    explicit DtorAccumulatorVisitor(SbkObject *pyObj) : m_pyObject(pyObj) {}
-
-    bool visit(PyTypeObject *node) override;
-
-    using DestructorEntries = std::vector<DestructorEntry>;
-
-    const DestructorEntries &entries() const { return m_entries; }
-
-private:
-    DestructorEntries m_entries;
-    SbkObject *m_pyObject;
-};
-
-/// \internal Internal function used to walk on classes inheritance trees.
-/**
-*   Walk on class hierarchy using a DFS algorithm.
-*   For each pure Shiboken type found, HierarchyVisitor::visit is called and the algorithm
-*   considers all children of this type as visited.
-*/
-bool walkThroughClassHierarchy(PyTypeObject *currentType, HierarchyVisitor *visitor);
-
-inline int getTypeIndexOnHierarchy(PyTypeObject *baseType, PyTypeObject *desiredType)
-{
-    GetIndexVisitor visitor(desiredType);
-    walkThroughClassHierarchy(baseType, &visitor);
-    return visitor.index();
-}
-
-inline int getNumberOfCppBaseClasses(PyTypeObject *baseType)
-{
-    BaseCountVisitor visitor;
-    walkThroughClassHierarchy(baseType, &visitor);
-    return visitor.count();
-}
-
-inline std::vector<PyTypeObject *> getCppBaseClasses(PyTypeObject *baseType)
-{
-    BaseAccumulatorVisitor visitor;
-    walkThroughClassHierarchy(baseType, &visitor);
-    return visitor.bases();
-}
+int getNumberOfCppBaseClasses(PyTypeObject *baseType);
 
 namespace Object
 {