Mercurial > projects > qtd
diff generator/typesystem_core.xml @ 354:18bd68f586c6
removed superfluous destructors
author | Max Samukha <maxter@spambox.com> |
---|---|
date | Mon, 24 May 2010 23:43:30 +0300 |
parents | 96a75b1e5b26 |
children | 08c1ca7975ab |
line wrap: on
line diff
--- a/generator/typesystem_core.xml Fri May 21 14:16:02 2010 +0300 +++ b/generator/typesystem_core.xml Mon May 24 23:43:30 2010 +0300 @@ -2363,27 +2363,12 @@ <object-type name="QObject"> <inject-code class="native"> -#ifdef CPP_SHARED -QTD_EXPORT_VAR(qtd_delete_d_qobject); - -extern "C" DLL_PUBLIC void qtd_QObjectEntity_initCallBacks(pfunc_abstr del_d_qobj) -{ - QTD_EXPORT_VAR_SET(qtd_delete_d_qobject, del_d_qobj); -} -#endif - - extern "C" DLL_PUBLIC void* qtd_get_d_qobject(void *nativeId) { QtD_QObjectEntity *entity = QtD_QObjectEntity::getQObjectEntity((QObject*)nativeId); return entity ? entity->dId : NULL; } -extern "C" DLL_PUBLIC void qtd_delete_qobject(void *nativeId) -{ - delete (QObject*)nativeId; -} - extern "C" DLL_PUBLIC void qtd_create_qobject_entity(void* nativeId, void *dId) { new QtD_QObjectEntity((QObject*)nativeId, dId); @@ -2416,23 +2401,11 @@ <inject-code class="java-free"> extern(C) void* qtd_get_d_qobject(void* nativeId); -extern(C) void qtd_delete_qobject(void* nativeId); extern(C) void* qtd_create_qobject_entity(void* nativeId, void* dId); extern(C) void* qtd_QObject_metaObject(void* nativeId); extern(C) void qtd_connect(void *nativeId, cstringz signal, int id, bool dynamicEntity); extern(C) void qtd_disconnect(void *nativeId, cstringz signal, int id, bool dynamicEntity); -extern(C) void qtd_delete_d_qobject(void* dId) -{ - auto obj = cast(QObject)dId; - - if (!(obj.__flags & QtdObjectFlags.dOwnership)) - { - // Avoid deleting native object twice - obj.__setFlags(QtdObjectFlags.nativeOwnership, true); - delete obj; - } -} </inject-code> <modify-function signature="childEvent(QChildEvent*)">