Mercurial > projects > qtd

comparison include/QObjectEntity.h @ 354:18bd68f586c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed superfluous destructors
author Max Samukha <maxter@spambox.com>
date Mon, 24 May 2010 23:43:30 +0300
parents 34a37904ff77
children
comparison
equal deleted inserted replaced
353:0a671b1382d7 354:18bd68f586c6
4 #include "qtd_core.h" 4 #include "qtd_core.h"
5 #include <qobject.h> 5 #include <qobject.h>
6 #include <iostream> 6 #include <iostream>
7 7
8 QTD_EXPORT(void, qtd_delete_d_qobject, (void* dPtr)) 8 QTD_EXPORT(void, qtd_delete_d_qobject, (void* dPtr))
9
10 #ifdef CPP_SHARED
11 #define qtd_delete_d_qobject qtd_get_qtd_delete_d_qobject()
12 #endif
13 9
14 //TODO: user data ID must be registered with QObject::registerUserData; 10 //TODO: user data ID must be registered with QObject::registerUserData;
15 #define userDataId 0 11 #define userDataId 0
16 12
17 class QtD_QObjectEntity : public QtD_Entity, public QObjectUserData 13 class QtD_QObjectEntity : public QtD_Entity, public QObjectUserData
30 } 26 }
31 27
32 inline void destroyEntity(QObject *qObject = NULL) 28 inline void destroyEntity(QObject *qObject = NULL)
33 { 29 {
34 Q_ASSERT(dId); 30 Q_ASSERT(dId);
35 qtd_delete_d_qobject(dId); 31 qtd_QtdObject_delete(dId);
36 if (qObject) 32 if (qObject)
37 { 33 {
38 qObject->setUserData(userDataId, NULL); 34 qObject->setUserData(userDataId, NULL);
39 dId = NULL; 35 dId = NULL;
40 } 36 }