From b55c812e620e4c31c0b4658534c74930124995a4 Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Mon, 30 Aug 2010 15:44:46 -0300
Subject: If a class have a non final method doesn't mean that class is
 polymorphic.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Renato Araújo <renato.araujo@openbossa.org>
---
 abstractmetalang.cpp            |  2 +-
 tests/testabstractmetaclass.cpp | 32 ++++++++++++++++++++++++++++++++
 tests/testabstractmetaclass.h   |  1 +
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/abstractmetalang.cpp b/abstractmetalang.cpp
index df26dda9b..fe6c6b372 100644
--- a/abstractmetalang.cpp
+++ b/abstractmetalang.cpp
@@ -1283,7 +1283,7 @@ void AbstractMetaClass::setFunctions(const AbstractMetaFunctionList &functions)
         f->setOwnerClass(this);
 
         m_hasVirtualSlots = m_hasVirtualSlots || f->isVirtualSlot();
-        m_hasVirtuals = m_hasVirtuals || !f->isFinal() || f->isVirtualSlot() || hasVirtualDestructor();
+        m_hasVirtuals = m_hasVirtuals || f->isVirtualSlot() || hasVirtualDestructor();
         m_isPolymorphic = m_isPolymorphic || m_hasVirtuals;
         m_hasNonpublic = m_hasNonpublic || !f->isPublic();
 
diff --git a/tests/testabstractmetaclass.cpp b/tests/testabstractmetaclass.cpp
index f412b19ca..11e17d989 100644
--- a/tests/testabstractmetaclass.cpp
+++ b/tests/testabstractmetaclass.cpp
@@ -408,6 +408,38 @@ void TestAbstractMetaClass::testObjectTypesMustNotHaveCopyConstructors()
     QCOMPARE(ctors.first()->minimalSignature(), QString("A()"));
 }
 
+void TestAbstractMetaClass::testIsPolymorphic()
+{
+    const char* cppCode = "\
+    class A\
+    {\
+    public:\
+        A();\
+        inline bool abc() const {}\
+    };\
+    \
+    class B : public A\
+    {\
+    public:\
+        B();\
+        inline bool abc() const {}\
+    };";
+    const char* xmlCode = "\
+    <typesystem package='Foo'>\
+        <primitive-type name='bool' />\
+        <value-type name='A' />\
+        <value-type name='B' />\
+    </typesystem>";
+
+    TestUtil t(cppCode, xmlCode);
+    AbstractMetaClassList classes = t.builder()->classes();
+    QCOMPARE(classes.count(), 2);
+    AbstractMetaClass* b = classes.findClass("A");
+
+    QVERIFY(!b->isPolymorphic());
+    AbstractMetaClass* a = classes.findClass("B");
+    QVERIFY(!a->isPolymorphic());
+}
 
 QTEST_APPLESS_MAIN(TestAbstractMetaClass)
 
diff --git a/tests/testabstractmetaclass.h b/tests/testabstractmetaclass.h
index 03b5721a3..d725c46ed 100644
--- a/tests/testabstractmetaclass.h
+++ b/tests/testabstractmetaclass.h
@@ -42,6 +42,7 @@ private slots:
     void testClassInheritedDefaultConstructors();
     void testAbstractClassDefaultConstructors();
     void testObjectTypesMustNotHaveCopyConstructors();
+    void testIsPolymorphic();
 };
 
 #endif // TESTABSTRACTMETACLASS_H
-- 
cgit v1.2.3