Mercurial > projects > qtd

diff generator/containergenerator.cpp @ 248:7664de4a55e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed #23. QtD_QObjectEntity is not created dynamically for shell classes any more. Class initialization is now performed by static constructors. When wrapping QObjects returned from functions, their run-time types are now taken into account. QObjects are allocated on GC heap, a doubly-linked list is used to prevent them from been collected (arguably a better solution than allocating on C heap and adding GC ranges) Minor changes (including unnecessary).
author maxter
date Thu, 20 Aug 2009 14:47:17 +0000
parents d69b58c01131
children 37eed70de029
line wrap: on
line diff
--- a/generator/containergenerator.cpp	Fri Jul 31 11:05:22 2009 +0000
+++ b/generator/containergenerator.cpp	Thu Aug 20 14:47:17 2009 +0000
@@ -447,7 +447,7 @@
         d_type = cls_name;
         if (centry->designatedInterface())
             d_type = centry->designatedInterface()->name();
-        nativeId = ".nativeId";
+        nativeId = ".__nativeId";
     }
 
     if (centry->designatedInterface()) {
@@ -470,7 +470,7 @@
       << INDENT << "*elem = arr[pos]" << nativeId << ";" << endl
       << "}" << endl << endl
 
-      << "package " << d_type << " qtd_" << cls_name << "_cpp_to_d(" << cpp_type << " __qt_return_value)" << endl
+      << "package " << d_type << " qtd_" << cls_name << "_cpp_to_d(" << cpp_type << " ret)" << endl
       << "{" << endl;
 
     marshallFromCppToD(s, centry);