--- a/d2/qt/core/QVariant.d	Sun Jul 04 14:17:49 2010 +0100
+++ b/d2/qt/core/QVariant.d	Thu Jul 08 17:19:05 2010 +0300
@@ -139,133 +139,133 @@
 
     public this() {
         void* __qt_return_value = qtd_QVariant_QVariant();
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QDataStream s) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QDataStream(s is null ? null : s.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QDataStream(s is null ? null : s.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(Qt.GlobalColor color) {
         void* __qt_return_value = qtd_QVariant_QVariant_GlobalColor(color);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(bool b) {
         void* __qt_return_value = qtd_QVariant_QVariant_bool(b);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QBitArray bitarray) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QBitArray(bitarray is null ? null : bitarray.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QBitArray(bitarray is null ? null : bitarray.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QByteArray bytearray) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QByteArray(bytearray is null ? null : bytearray.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QByteArray(bytearray is null ? null : bytearray.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QDate date) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QDate(date is null ? null : date.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QDate(date is null ? null : date.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QDateTime datetime) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QDateTime(datetime is null ? null : datetime.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QDateTime(datetime is null ? null : datetime.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(string str) {
         void* __qt_return_value = qtd_QVariant_QVariant_String(str);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QLine line) {
         void* __qt_return_value = qtd_QVariant_QVariant_QLine(&line);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QLineF line) {
         void* __qt_return_value = qtd_QVariant_QVariant_QLineF(&line);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QLocale locale) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QLocale(locale is null ? null : locale.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QLocale(locale is null ? null : locale.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QPoint pt) {
         void* __qt_return_value = qtd_QVariant_QVariant_QPoint(&pt);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QPointF pt) {
         void* __qt_return_value = qtd_QVariant_QVariant_QPointF(&pt);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QRect rect) {
         void* __qt_return_value = qtd_QVariant_QVariant_QRect(&rect);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QRectF rect) {
         void* __qt_return_value = qtd_QVariant_QVariant_QRectF(&rect);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QRegExp regExp) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QRegExp(regExp is null ? null : regExp.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QRegExp(regExp is null ? null : regExp.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QSize size) {
         void* __qt_return_value = qtd_QVariant_QVariant_QSize(&size);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QSizeF size) {
         void* __qt_return_value = qtd_QVariant_QVariant_QSizeF(&size);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QTime time) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QTime(time is null ? null : time.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QTime(time is null ? null : time.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QUrl url) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QUrl(url is null ? null : url.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QUrl(url is null ? null : url.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(QVariant other) {
-        void* __qt_return_value = qtd_QVariant_QVariant_QVariant(other is null ? null : other.__nativeId);
-        super(__qt_return_value);
+        void* __qt_return_value = qtd_QVariant_QVariant_QVariant(other is null ? null : other.qtdNativeId);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 /*
@@ -277,37 +277,37 @@
 
     public this(double d) {
         void* __qt_return_value = qtd_QVariant_QVariant_double(d);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(int i) {
         void* __qt_return_value = qtd_QVariant_QVariant_int(i);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(int typeOrUserType, void* copy) {
         void* __qt_return_value = qtd_QVariant_QVariant_int_nativepointervoid(typeOrUserType, copy);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(long ll) {
         void* __qt_return_value = qtd_QVariant_QVariant_long(ll);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(uint ui) {
         void* __qt_return_value = qtd_QVariant_QVariant_uint(ui);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
 
     public this(ulong ull) {
         void* __qt_return_value = qtd_QVariant_QVariant_ulong(ull);
-        super(__qt_return_value);
+        super(__qt_return_value, QtdObjectInitFlags.createdByD);
     }
 
     // TODO: No need for run time name. Reimplement.
@@ -315,7 +315,7 @@
     {
         int i = QMetaType.type(toStringz(name));
         assert(i > 0);
-        return qtd_QVariant_canConvert(__nativeId, i);
+        return qtd_QVariant_canConvert(qtdNativeId, i);
     }
 
     // TODO: reimplement
@@ -370,20 +370,20 @@
         {
             static if( is( Type == class ) || is( Type == interface ) )
             {
-                Object object = cast(Object)qtd_QVariant_data(__nativeId);
+                Object object = cast(Object)qtd_QVariant_data(qtdNativeId);
                 if(object)
                     return cast(Type)(object) !is null;
                 return false;
             }
             else static if (isDynamicArrayType!(Type) || isStaticArrayType!(Type) )
             {
-                auto array = cast(DArrayToC*)qtd_QVariant_data(__nativeId);
+                auto array = cast(DArrayToC*)qtd_QVariant_data(qtdNativeId);
                 return cast(Type)(array.array) !is null;
             }
             else
             {
                 int i = QMetaType.type(toStringz(typeid(Type).toString));
-                return qtd_QVariant_canConvert(__nativeId, i);
+                return qtd_QVariant_canConvert(qtdNativeId, i);
             }
         }
     }
@@ -437,188 +437,188 @@
 	    return toUrl;
 	else static if( is( Type == class ) || is( Type == interface ) )
 	{
-	    Object object = cast(Object)qtd_QVariant_data(__nativeId);
+	    Object object = cast(Object)qtd_QVariant_data(qtdNativeId);
 	    if(object)
 		return cast(Type)(object);
 	    return null;
 	}
 	else static if (isDynamicArrayType!(Type) || isStaticArrayType!(Type) )
 	{
-	    auto array = cast(DArrayToC*)qtd_QVariant_data(__nativeId);
+	    auto array = cast(DArrayToC*)qtd_QVariant_data(qtdNativeId);
 	    return cast(Type)(array.array);
 	}
 	else
 	{
-	    return *cast(Type*)qtd_QVariant_data(__nativeId);
+	    return *cast(Type*)qtd_QVariant_data(qtdNativeId);
 	}
     }
 
     public final void clear() {
-        qtd_QVariant_clear(__nativeId);
+        qtd_QVariant_clear(qtdNativeId);
     }
 
     protected final bool cmp(QVariant other) {
-        return qtd_QVariant_cmp_QVariant(__nativeId, other is null ? null : other.__nativeId);
+        return qtd_QVariant_cmp_QVariant(qtdNativeId, other is null ? null : other.qtdNativeId);
     }
 
     protected final void create(int type, void* copy) {
-        qtd_QVariant_create_int_nativepointervoid(__nativeId, type, copy);
+        qtd_QVariant_create_int_nativepointervoid(qtdNativeId, type, copy);
     }
 
     public final bool isNull() {
-        return qtd_QVariant_isNull(__nativeId);
+        return qtd_QVariant_isNull(qtdNativeId);
     }
 
     public final bool isValid() {
-        return qtd_QVariant_isValid(__nativeId);
+        return qtd_QVariant_isValid(qtdNativeId);
     }
 
     public final void load(QDataStream ds) {
-        qtd_QVariant_load_QDataStream(__nativeId, ds is null ? null : ds.__nativeId);
+        qtd_QVariant_load_QDataStream(qtdNativeId, ds is null ? null : ds.qtdNativeId);
     }
 
     public final void writeTo(QDataStream s) {
-        qtd_QVariant_writeTo_QDataStream(__nativeId, s is null ? null : s.__nativeId);
+        qtd_QVariant_writeTo_QDataStream(qtdNativeId, s is null ? null : s.qtdNativeId);
     }
 
     public final QVariant operator_assign(QVariant other) {
-        void* __qt_return_value = qtd_QVariant_operator_assign_QVariant(__nativeId, other is null ? null : other.__nativeId);
-        return new QVariant(__qt_return_value, QtdObjectFlags.nativeOwnership);
+        void* __qt_return_value = qtd_QVariant_operator_assign_QVariant(qtdNativeId, other is null ? null : other.qtdNativeId);
+        return new QVariant(__qt_return_value, QtdObjectInitFlags.nativeOwnership);
     }
 
     private final bool operator_equal(QVariant v) {
-        return qtd_QVariant_operator_equal_QVariant(__nativeId, v is null ? null : v.__nativeId);
+        return qtd_QVariant_operator_equal_QVariant(qtdNativeId, v is null ? null : v.qtdNativeId);
     }
 
     public final void readFrom(QDataStream s) {
-        qtd_QVariant_readFrom_QDataStream(__nativeId, s is null ? null : s.__nativeId);
+        qtd_QVariant_readFrom_QDataStream(qtdNativeId, s is null ? null : s.qtdNativeId);
     }
 
     public final void save(QDataStream ds) {
-        qtd_QVariant_save_QDataStream(__nativeId, ds is null ? null : ds.__nativeId);
+        qtd_QVariant_save_QDataStream(qtdNativeId, ds is null ? null : ds.qtdNativeId);
     }
 
     public final QBitArray toBitArray() {
-        void* __qt_return_value = qtd_QVariant_toBitArray(__nativeId);
+        void* __qt_return_value = qtd_QVariant_toBitArray(qtdNativeId);
         return new QBitArray(__qt_return_value);
     }
 
     public final bool toBool() {
-        return qtd_QVariant_toBool(__nativeId);
+        return qtd_QVariant_toBool(qtdNativeId);
     }
 
     public final QByteArray toByteArray() {
-        void* __qt_return_value = qtd_QVariant_toByteArray(__nativeId);
+        void* __qt_return_value = qtd_QVariant_toByteArray(qtdNativeId);
         return new QByteArray(__qt_return_value);
     }
 
     public final QDate toDate() {
-        void* __qt_return_value = qtd_QVariant_toDate(__nativeId);
+        void* __qt_return_value = qtd_QVariant_toDate(qtdNativeId);
         return new QDate(__qt_return_value);
     }
 
     public final QDateTime toDateTime() {
-        void* __qt_return_value = qtd_QVariant_toDateTime(__nativeId);
+        void* __qt_return_value = qtd_QVariant_toDateTime(qtdNativeId);
         return new QDateTime(__qt_return_value);
     }
 
     public final double toDouble(bool* ok = null) {
-        return qtd_QVariant_toDouble_nativepointerbool(__nativeId, ok);
+        return qtd_QVariant_toDouble_nativepointerbool(qtdNativeId, ok);
     }
 
     public final int toInt(bool* ok = null) {
-        return qtd_QVariant_toInt_nativepointerbool(__nativeId, ok);
+        return qtd_QVariant_toInt_nativepointerbool(qtdNativeId, ok);
     }
 
     public final QLine toLine() {
-        return qtd_QVariant_toLine(__nativeId);
+        return qtd_QVariant_toLine(qtdNativeId);
     }
 
     public final QLineF toLineF() {
-        return qtd_QVariant_toLineF(__nativeId);
+        return qtd_QVariant_toLineF(qtdNativeId);
     }
 
     public final QLocale toLocale() {
-        void* __qt_return_value = qtd_QVariant_toLocale(__nativeId);
+        void* __qt_return_value = qtd_QVariant_toLocale(qtdNativeId);
         return new QLocale(__qt_return_value);
     }
 
     public final long toLongLong(bool* ok = null) {
-        return qtd_QVariant_toLongLong_nativepointerbool(__nativeId, ok);
+        return qtd_QVariant_toLongLong_nativepointerbool(qtdNativeId, ok);
     }
 
     public final QPoint toPoint() {
-        return qtd_QVariant_toPoint(__nativeId);
+        return qtd_QVariant_toPoint(qtdNativeId);
     }
 
     public final QPointF toPointF() {
-        return qtd_QVariant_toPointF(__nativeId);
+        return qtd_QVariant_toPointF(qtdNativeId);
     }
 
     public final QRect toRect() {
-        return qtd_QVariant_toRect(__nativeId);
+        return qtd_QVariant_toRect(qtdNativeId);
     }
 
     public final QRectF toRectF() {
-        return qtd_QVariant_toRectF(__nativeId);
+        return qtd_QVariant_toRectF(qtdNativeId);
     }
 
     public final QRegExp toRegExp() {
-        void* __qt_return_value = qtd_QVariant_toRegExp(__nativeId);
+        void* __qt_return_value = qtd_QVariant_toRegExp(qtdNativeId);
         return new QRegExp(__qt_return_value);
     }
 
     public final QSize toSize() {
-        return qtd_QVariant_toSize(__nativeId);
+        return qtd_QVariant_toSize(qtdNativeId);
     }
 
     public final QSizeF toSizeF() {
-        return qtd_QVariant_toSizeF(__nativeId);
+        return qtd_QVariant_toSizeF(qtdNativeId);
     }
 
     public final string toString() {
         string res;
-        qtd_QVariant_toString(__nativeId, &res);
+        qtd_QVariant_toString(qtdNativeId, &res);
         return res;
     }
 
     public final QTime toTime() {
-        void* __qt_return_value = qtd_QVariant_toTime(__nativeId);
+        void* __qt_return_value = qtd_QVariant_toTime(qtdNativeId);
         return new QTime(__qt_return_value);
     }
 
     public final uint toUInt(bool* ok = null) {
-        return qtd_QVariant_toUInt_nativepointerbool(__nativeId, ok);
+        return qtd_QVariant_toUInt_nativepointerbool(qtdNativeId, ok);
     }
 
     public final ulong toULongLong(bool* ok = null) {
-        return qtd_QVariant_toULongLong_nativepointerbool(__nativeId, ok);
+        return qtd_QVariant_toULongLong_nativepointerbool(qtdNativeId, ok);
     }
 
     public final QUrl toUrl() {
-        void* __qt_return_value = qtd_QVariant_toUrl(__nativeId);
+        void* __qt_return_value = qtd_QVariant_toUrl(qtdNativeId);
         return new QUrl(__qt_return_value);
     }
 
     public final char* typeName() {
-        return qtd_QVariant_typeName(__nativeId);
+        return qtd_QVariant_typeName(qtdNativeId);
     }
 
     public final Type type() {
-        return cast(Type)qtd_QVariant_type(__nativeId);
+        return cast(Type)qtd_QVariant_type(qtdNativeId);
     }
 
     public final int userType() {
-        return qtd_QVariant_userType(__nativeId);
+        return qtd_QVariant_userType(qtdNativeId);
     }
 // Field accessors
 
-    public this(void* native_id, QtdObjectFlags flags = QtdObjectFlags.none) {
-        super(native_id, flags);
+    public this(void* native_id, QtdObjectInitFlags initFlags = QtdObjectInitFlags.none) {
+        super(native_id, initFlags);
     }
 
-    protected override void __deleteNative() {
-        qtd_QVariant_destructor(__nativeId);
+    protected override void qtdDeleteNative() {
+        qtd_QVariant_destructor(qtdNativeId);
     }
 
     public alias void __isValueType;