Collect the instantiated container types from class fields.

2 files changed, 15 insertions, 4 deletions

diff --git a/generator.cpp b/generator.cpp
index df8c721..71964b4 100644
--- a/generator.cpp
+++ b/generator.cpp
@@ -118,14 +118,24 @@ void Generator::collectInstantiatedContainers(const AbstractMetaFunction* func)
         addInstantiatedContainers(arg->type());
 }
 
+void Generator::collectInstantiatedContainers(const AbstractMetaClass* metaClass)
+{
+    if (!metaClass->typeEntry()->generateCode())
+        return;
+    foreach (const AbstractMetaFunction* func, metaClass->functions())
+        collectInstantiatedContainers(func);
+    foreach (const AbstractMetaField* field, metaClass->fields())
+        addInstantiatedContainers(field->type());
+    foreach (AbstractMetaClass* innerClass, metaClass->innerClasses())
+        collectInstantiatedContainers(innerClass);
+}
+
 void Generator::collectInstantiatedContainers()
 {
     foreach (const AbstractMetaFunction* func, globalFunctions())
         collectInstantiatedContainers(func);
-    foreach (const AbstractMetaClass* metaClass, classes()) {
-        foreach (const AbstractMetaFunction* func, metaClass->functions())
-            collectInstantiatedContainers(func);
-    }
+    foreach (const AbstractMetaClass* metaClass, classes())
+        collectInstantiatedContainers(metaClass);
 }
 
 QList<const AbstractMetaType*> Generator::instantiatedContainers() const
diff --git a/generator.h b/generator.h
index 59cef78..14b1fef 100644
--- a/generator.h
+++ b/generator.h
@@ -286,6 +286,7 @@ private:
     struct GeneratorPrivate;
     GeneratorPrivate* m_d;
     void collectInstantiatedContainers(const AbstractMetaFunction* func);
+    void collectInstantiatedContainers(const AbstractMetaClass* metaClass);
     void collectInstantiatedContainers();
 };