Mercurial > projects > qtd

changeset 185:4fcf7ba2a791

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove unneeded fields
author eldar
date Sat, 04 Jul 2009 13:15:01 +0000
parents 7d9db724ee1d
children d5af7c48b733
files generator/dgenerator.cpp generator/typesystem_core-java.java
diffstat 2 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/generator/dgenerator.cpp	Sat Jul 04 13:04:46 2009 +0000
+++ b/generator/dgenerator.cpp	Sat Jul 04 13:15:01 2009 +0000
@@ -1671,13 +1671,7 @@
         {
             Indentation indent(INDENT);
 
-/*            if(d_class->name() == "QObject")
-                s << INDENT << "if(!__no_real_delete) {" << endl
-                  << INDENT << "    __qobject_is_deleting = true;" << endl
-                  << INDENT << "    scope(exit) __qobject_is_deleting = false;" << endl
-                  << INDENT << "    __free_native_resources();" << endl
-                  << INDENT << "}" << endl;*/
-
+/*
             if(d_class->name() == "QObject")
                 s << INDENT << "if(!__gc_managed)" << endl
                         << INDENT << "    remove(__gc_ref_list, this);" << endl
@@ -1686,6 +1680,13 @@
                         << INDENT << "    scope(exit) __qobject_is_deleting = false;" << endl
                         << INDENT << "    __free_native_resources();" << endl
                         << INDENT << "}" << endl;
+*/
+            if(d_class->name() == "QObject")
+                s << INDENT << "if(!__no_real_delete) {" << endl
+                  << INDENT << "    __qobject_is_deleting = true;" << endl
+                  << INDENT << "    scope(exit) __qobject_is_deleting = false;" << endl
+                  << INDENT << "    __free_native_resources();" << endl
+                  << INDENT << "}" << endl;
             else
                 s << INDENT << "if(!__no_real_delete)" << endl
                   << INDENT << "    __free_native_resources();" << endl;
@@ -2238,9 +2239,9 @@
             {
                 Indentation indent(INDENT);
                 s << "(void* native_id, bool gc_managed) {" << endl
-                  << INDENT << "if(!gc_managed)" << endl
+/*                  << INDENT << "if(!gc_managed)" << endl
                   << INDENT << "    __gc_ref_list ~= this;" << endl
-                  << INDENT << "__gc_managed = gc_managed;" << endl
+                  << INDENT << "__gc_managed = gc_managed;" << endl */
                   << INDENT << "super(native_id);" << endl;
             }
         }
--- a/generator/typesystem_core-java.java	Sat Jul 04 13:04:46 2009 +0000
+++ b/generator/typesystem_core-java.java	Sat Jul 04 13:15:01 2009 +0000
@@ -76,9 +76,6 @@
     // list of QObjects references to prevent them from garbage collecting if they are managed by Qt
     private static QObject[] __gc_ref_list;
     
-    // this flag controls whether QObject is managed by D's GC, or it has a parent and therefore managed by Qt
-    private bool __gc_managed = true;
-    
     // this flag needs to be set false when QObject is deleted from inside Qt so when deleting it from D it won't delete C++ object
     public bool __no_real_delete = false;
 }// class