Fixes setting of template argument's usage pattern.

Comes with an unit test.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>

3 files changed, 43 insertions, 1 deletions

diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp
index c3ebe3b07..9d55c49d3 100644
--- a/abstractmetabuilder.cpp
+++ b/abstractmetabuilder.cpp
@@ -2538,6 +2538,7 @@ bool AbstractMetaBuilder::inheritTemplate(AbstractMetaClass* subclass,
             temporaryType->setConstant(i.is_constant);
             temporaryType->setReference(i.is_reference);
             temporaryType->setIndirections(i.indirections);
+            temporaryType->decideUsagePattern();
             templateTypes << temporaryType;
         } else {
             ReportHandler::warning("Ignoring template parameter " + templateParamName + " from " + info.instantiationName() + ", because I don't know what it is.");
diff --git a/tests/testcontainer.cpp b/tests/testcontainer.cpp
index 563b75c20..3d31f8a61 100644
--- a/tests/testcontainer.cpp
+++ b/tests/testcontainer.cpp
@@ -38,7 +38,7 @@ void TestContainer::testContainerType()
     };\
     ";
     const char* xmlCode = "\
-    <typesystem package=\"Foo\"> \
+    <typesystem package='Foo'> \
         <namespace-type name='std' generate='no' /> \
         <container-type name='std::list' type='list' /> \
         <object-type name='A'/> \
@@ -54,6 +54,46 @@ void TestContainer::testContainerType()
     QCOMPARE(reinterpret_cast<const ContainerTypeEntry*>(classA->typeEntry()->baseContainerType())->type(), ContainerTypeEntry::ListContainer);
 }
 
+void TestContainer::testListOfValueType()
+{
+    const char* cppCode ="\
+    namespace std {\
+    template<class T>\
+    class list { \
+        T get(int x) { return 0; }\
+    };\
+    }\
+    class ValueType {};\
+    class A : public std::list<ValueType> {\
+    };\
+    ";
+    const char* xmlCode = "\
+    <typesystem package='Foo'> \
+        <namespace-type name='std' generate='no' /> \
+        <container-type name='std::list' type='list' /> \
+        <value-type name='ValueType'/> \
+        <value-type name='A'/> \
+    </typesystem>";
+
+    TestUtil t(cppCode, xmlCode, true);
+    AbstractMetaClassList classes = t.builder()->classes();
+    QCOMPARE(classes.count(), 3);
+
+    AbstractMetaClass* classA = classes.findClass("A");
+    QVERIFY(classA);
+    QCOMPARE(classA->templateBaseClassInstantiations().count(), 1);
+    const AbstractMetaType* templateInstanceType = classA->templateBaseClassInstantiations().first();
+    QVERIFY(templateInstanceType);
+
+    QCOMPARE(templateInstanceType->indirections(), 0);
+    QVERIFY(!templateInstanceType->typeEntry()->isObject());
+    QVERIFY(templateInstanceType->typeEntry()->isValue());
+    QVERIFY(!templateInstanceType->isReference());
+    QVERIFY(!templateInstanceType->isObject());
+    QVERIFY(!templateInstanceType->isValuePointer());
+    QVERIFY(templateInstanceType->isValue());
+}
+
 QTEST_APPLESS_MAIN(TestContainer)
 
 #include "testcontainer.moc"
diff --git a/tests/testcontainer.h b/tests/testcontainer.h
index d760c5a68..22e47eeba 100644
--- a/tests/testcontainer.h
+++ b/tests/testcontainer.h
@@ -30,6 +30,7 @@ class TestContainer : public QObject
     Q_OBJECT
 private slots:
     void testContainerType();
+    void testListOfValueType();
 };
 
 #endif