Merged with multipleinheritance branch

1 files changed, 8 insertions, 1 deletions

diff --git a/shibokengenerator.h b/shibokengenerator.h
index 78a5498c2..af0b80a95 100644
--- a/shibokengenerator.h
+++ b/shibokengenerator.h
@@ -175,7 +175,14 @@ public:
                               int arg_count = -1) const;
 
     bool hasInjectedCodeOrSignatureModification(const AbstractMetaFunction* func);
-    QStringList getBaseClasses(const AbstractMetaClass* metaClass);
+
+    /// Returns true if there are cases of multiple inheritance in any of its ancestors.
+    bool hasMultipleInheritanceInAncestry(const AbstractMetaClass* metaClass);
+
+    /// Returns a list of parent classes for a method.
+    AbstractMetaClassList getBaseClasses(const AbstractMetaClass* metaClass);
+
+    const AbstractMetaClass* getMultipleInheritingClass(const AbstractMetaClass* metaClass);
 
     void writeBaseConversion(QTextStream& s, const AbstractMetaType* type,
                              const AbstractMetaClass* context);