--- a/include/QObjectEntity.h	Thu Aug 20 19:08:32 2009 +0000
+++ b/include/QObjectEntity.h	Sat Aug 22 12:50:58 2009 +0000
@@ -1,37 +1,16 @@
 #ifndef QQOBJECTENTITY_H
 #define QQOBJECTENTITY_H
 
-#include "qtd_core.h"
-#include <qobject.h>
-#include <iostream>
-
-QTD_EXPORT(void, qtd_delete_d_qobject, (void* dPtr))
+#include <cstdlib>
 
-#ifdef CPP_SHARED
-#define qtd_delete_d_qobject qtd_get_qtd_delete_d_qobject()
-#endif
-
-//TODO: user data ID must be registered with QObject::registerUserData;
-#define userDataId 0
-
-class QtD_QObjectEntity : public QtD_Entity, public QObjectUserData
+class Qtd_QObjectEntity
 {
 public:
-
-    QtD_QObjectEntity(QObject *qObject, void *dId) : QtD_Entity(dId)
-    {
-        qObject->setUserData(userDataId, this);
-    }
+	Qtd_QObjectEntity(void *d_ptr) { _d_ptr = d_ptr; }
+	void *d_entity() const { return _d_ptr; }
 
-    virtual ~QtD_QObjectEntity()
-    {
-        qtd_delete_d_qobject(dId);
-    }
-
-    inline static QtD_QObjectEntity* getQObjectEntity(const QObject *qObject)
-    {
-        return static_cast<QtD_QObjectEntity*>(qObject->userData(userDataId));
-    }
+private:
+	void *_d_ptr;
 };
 
 #endif // QQOBJECTENTITY_H