changeset 407:eb959324f82a

merge
author Eldar Insafutdinov
date Fri, 18 Mar 2011 00:31:03 +0000
parents 778ef7374fb5 (current diff) 9d6e4703a458 (diff)
children ba1abf81d0e0
files
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/d2/qtd/QMetaTypeImpl.d	Fri Mar 18 00:30:48 2011 +0000
+++ b/d2/qtd/QMetaTypeImpl.d	Fri Mar 18 00:31:03 2011 +0000
@@ -31,7 +31,7 @@
 {
     static void* construct(void* copy)
     {
-        auto T* p = cast(T*)GC.malloc(T.sizeof);
+        T* p = cast(T*)GC.malloc(T.sizeof);
         if (!p)
             onOutOfMemoryError();
 
--- a/generator/typesystem_core-java.java	Fri Mar 18 00:30:48 2011 +0000
+++ b/generator/typesystem_core-java.java	Fri Mar 18 00:31:03 2011 +0000
@@ -145,6 +145,14 @@
     {
         QMetaObject.connectImpl(sender, signal, receiver, method, type);
     }
+
+    public final QVariant property(string name) {
+        return property(name is null? null : toStringz(name));
+    }
+
+    public final bool setProperty(string name, QVariant value) {
+        return setProperty(name is null? null : toStringz(name), value);
+    }
 }// class
 
 abstract class QAbstractItemModel___ extends QAbstractItemModel {