Mercurial > projects > qtd

diff generator/abstractmetabuilder.cpp @ 257:17b5e13364b7 lifetime

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(none)
author maxter
date Wed, 16 Sep 2009 13:56:02 +0000
parents ae34188ddd84
children 515d6e1c7b10
line wrap: on
line diff
--- a/generator/abstractmetabuilder.cpp	Mon Aug 31 12:07:28 2009 +0000
+++ b/generator/abstractmetabuilder.cpp	Wed Sep 16 13:56:02 2009 +0000
@@ -1310,10 +1310,8 @@
                 meta_class->setHasNonPrivateConstructor(true);
             }
 
-            // Classes with virtual destructors should always have a shell class
-            // (since we aren't registering the destructors, we need this extra check)
-            if (meta_function->isDestructor() && !meta_function->isFinal())
-                meta_class->setForceShellClass(true);
+            if (meta_function->isDestructor() && !meta_function->isFinal())                            
+                meta_class->setHasVirtualDestructor(true);            
 
             if (!meta_function->isDestructor()
                 && !meta_function->isInvalid()
@@ -1563,8 +1561,8 @@
 
     TypeInfo function_type = function_item->type();
     if (function_name.startsWith('~')) {
-        meta_function->setFunctionType(AbstractMetaFunction::DestructorFunction);
-        meta_function->setInvalid(true);
+        meta_function->setFunctionType(AbstractMetaFunction::DestructorFunction);              
+        //meta_function->setInvalid(true);
     } else if (strip_template_args(function_name) == stripped_class_name) {
         meta_function->setFunctionType(AbstractMetaFunction::ConstructorFunction);
         meta_function->setName(m_current_class->name());