Also consider interfaces of super classes (issue #75)

Author: usiems

generator/abstractmetalang.cpp

@@ -1640,20 +1640,21 @@ void AbstractMetaClass::fixFunctions()
 
     AbstractMetaClass *super_class = baseClass();
     AbstractMetaFunctionList funcs = functions();
+    AbstractMetaClassList interfaceClasses = interfaces();
 
 //     printf("fix functions for %s\n", qPrintable(name()));
 
     if (super_class != 0)
         super_class->fixFunctions();
     int iface_idx = 0;
-    while (super_class || iface_idx < interfaces().size()) {
-//         printf(" - base: %s\n", qPrintable(super_class->name()));
+    while (super_class || iface_idx < interfaceClasses.size()) {
 
         // Since we always traverse the complete hierarchy we are only
         // interested in what each super class implements, not what
         // we may have propagated from their base classes again.
         AbstractMetaFunctionList super_funcs;
         if (super_class) {
+//             printf(" - base: %s\n", qPrintable(super_class->name()));
 
             // Super classes can never be final
             if (super_class->isFinalInTargetLang()) {
@@ -1662,7 +1663,10 @@ void AbstractMetaClass::fixFunctions()
             }
             super_funcs = super_class->queryFunctions(AbstractMetaClass::ClassImplements);
         } else {
-            super_funcs = interfaces().at(iface_idx)->queryFunctions(AbstractMetaClass::NormalFunctions);
+            AbstractMetaClass *iface_class = interfaceClasses.at(iface_idx);
+//             printf(" - iface: %s\n", qPrintable(iface_class->name()));
+            iface_class->fixFunctions();
+            super_funcs = iface_class->queryFunctions(AbstractMetaClass::NormalFunctions);
         }
 
         QSet<AbstractMetaFunction *> funcs_to_add;
@@ -1819,12 +1823,16 @@ void AbstractMetaClass::fixFunctions()
         foreach (AbstractMetaFunction *f, funcs_to_add)
             funcs << f->copy();
 
-        if (super_class)
+        if (super_class) {
+            interfaceClasses += super_class->interfaces();
             super_class = super_class->baseClass();
-        else
+        } else {
             iface_idx++;
+        }
     }
 
+//     printf("end fix functions for %s\n", qPrintable(name()));
+
     bool hasPrivateConstructors = false;
     bool hasPublicConstructors = false;
     foreach (AbstractMetaFunction *func, funcs) {