Mercurial > projects > qtd

diff generator/abstractmetalang.cpp @ 310:5bcfe9e7db7f lifetime

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Committing local changes
author maxter <spambox@d-coding.com>
date Wed, 23 Dec 2009 16:10:46 +0200
parents b5773ccab07d
children
line wrap: on
line diff
--- a/generator/abstractmetalang.cpp	Tue Sep 22 15:22:37 2009 +0000
+++ b/generator/abstractmetalang.cpp	Wed Dec 23 16:10:46 2009 +0200
@@ -1159,13 +1159,15 @@
 
 bool AbstractMetaClass::generateShellClass() const
 {
-    return m_force_shell_class ||
-        m_has_virtual_destructor ||
-    (!isFinal()
-        && (hasVirtualFunctions()
+    return m_force_shell_class ||         
+    ( /*!isFinal()
+        && ( */
+        isPolymorphic()
         || hasProtectedFunctions()
         || hasFieldAccessors()
-        || typeEntry()->isObject())); // qtd2 for being more consistent
+        //|| typeEntry()->isObject() // qtd2 for being more consistent
+        /*)*/
+        );
 }
 
 QPropertySpec *AbstractMetaClass::propertySpecForRead(const QString &name) const
@@ -1340,7 +1342,7 @@
     f->setImplementingClass(this);
     f->setOriginalAttributes(f->attributes());
 
-    /*addFunction*/(f);
+    addFunction(f);
 }
 
 bool AbstractMetaClass::hasFunction(const AbstractMetaFunction *f) const