Eo: Removed "type" property from event/op descriptions.

[profile/ivi/eobj.git] / examples / constructors / simple6.c

diff --git a/examples/constructors/simple6.c b/examples/constructors/simple6.c
index d142c3d..b5c143a 100644 (file)
--- a/examples/constructors/simple6.c
+++ b/examples/constructors/simple6.c
@@ -1,36 +1,30 @@
-#include "Eobj.h"
+#include "Eo.h"
 #include "mixin.h"
 #include "simple6.h"
 
 #include "config.h"
 
-static const Eobj_Class *_my_class = NULL;
+#define MY_CLASS SIMPLE6_CLASS
 
 static void
-_destructor(Eobj *obj, void *class_data __UNUSED__)
+_destructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   eobj_constructor_super(obj);
+   eo_constructor_super(obj);
 
-   eobj_constructor_error_set(obj);
+   eo_error_set(obj);
 }
 
-const Eobj_Class *
-simple6_class_get(void)
-{
-   if (_my_class) return _my_class;
+static const Eo_Class_Description class_desc = {
+     "Simple6",
+     EO_CLASS_TYPE_REGULAR,
+     EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
+     NULL,
+     0,
+     NULL,
+     _destructor,
+     NULL,
+     NULL
+};
 
-   static const Eobj_Class_Description class_desc = {
-        "Simple6",
-        EOBJ_CLASS_TYPE_REGULAR,
-        EOBJ_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
-        NULL,
-        0,
-        NULL,
-        _destructor,
-        NULL,
-        NULL
-   };
+EO_DEFINE_CLASS(simple6_class_get, &class_desc, EO_BASE_CLASS, NULL);
 
-   _my_class = eobj_class_new(&class_desc, EOBJ_CLASS_BASE, NULL);
-   return _my_class;
-}