--- a/generator/typesystem_gui.xml	Sun Jul 04 14:17:49 2010 +0100
+++ b/generator/typesystem_gui.xml	Thu Jul 08 17:19:05 2010 +0300
@@ -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.qtdNativeId);
         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(qtdNativeId, 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(qtdNativeId, 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(qtdNativeId, 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(qtdNativeId, i, n, t);
     }
     </inject-code>
     <inject-code class="java-free">
@@ -5778,7 +5778,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(qtdNativeId(), %1.value());
                 return ;
             }
             </inject-code>