Mercurial > projects > qtd
diff generator/typesystem_gui.xml @ 248:7664de4a55e5
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 | f7dca08fc816 |
children | 37eed70de029 |
line wrap: on
line diff
--- a/generator/typesystem_gui.xml Fri Jul 31 11:05:22 2009 +0000 +++ b/generator/typesystem_gui.xml Thu Aug 20 14:47:17 2009 +0000 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<typesystem package="qt.gui" default-superclass="QtDObject"> +<typesystem package="qt.gui" default-superclass="QtdObject"> <depend package="qt.core" /> <inject-code> qt.Utilities.loadQtLibrary("QtGui"); @@ -7,7 +7,7 @@ <template name="gui.class_from_variant_java"> public this(QVariant arg__1) { - void* __qt_return_value = qtd_%CLASS_NAME_%CLASS_NAME_QVariant(cast(void*) this, arg__1 is null ? null : arg__1.nativeId); + void* __qt_return_value = qtd_%CLASS_NAME_%CLASS_NAME_QVariant(cast(void*) this, arg__1 is null ? null : arg__1.__nativeId); super(__qt_return_value); } </template> @@ -1138,11 +1138,11 @@ <inject-code class="java"> public final void insert(int i, QPoint t) { - qtd_QPolygon_insert_int_QPoint(nativeId, i, t); + qtd_QPolygon_insert_int_QPoint(__nativeId, i, t); } public final void insert(int i, int n, QPoint t) { - qtd_QPolygon_insert_int_int_QPoint(nativeId, i, n, t); + qtd_QPolygon_insert_int_int_QPoint(__nativeId, i, n, t); } </inject-code> <inject-code class="java-free"> @@ -1223,11 +1223,11 @@ --> <inject-code class="java"> public final void insert(int i, QPointF t) { - qtd_QPolygonF_insert_int_QPointF(nativeId, i, t); + qtd_QPolygonF_insert_int_QPointF(__nativeId, i, t); } public final void insert(int i, int n, QPointF t) { - qtd_QPolygonF_insert_int_int_QPointF(nativeId, i, n, t); + qtd_QPolygonF_insert_int_int_QPointF(__nativeId, i, n, t); } </inject-code> <inject-code class="java-free"> @@ -5772,7 +5772,7 @@ qt.GeneratorUtilities.threadCheck(this); if (nativeId() == 0) throw new QNoNativeResourcesException("Function call on incomplete object of type: " +getClass().getName()); - __qt_QMessageBox_setWindowModality(nativeId(), %1.value()); + __qt_QMessageBox_setWindowModality(__nativeId(), %1.value()); return ; } </inject-code>