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

[profile/ivi/eobj.git] / examples / function_overrides / simple.c

diff --git a/examples/function_overrides/simple.c b/examples/function_overrides/simple.c
index 285586e..d3742a5 100644 (file)
--- a/examples/function_overrides/simple.c
+++ b/examples/function_overrides/simple.c
@@ -1,64 +1,80 @@
-#include "Eobj.h"
+#include "Eo.h"
 #include "simple.h"
 
 #include "config.h"
+#include "../eunit_tests.h"
 
-EAPI Eobj_Op SIMPLE_BASE_ID = 0;
+EAPI Eo_Op SIMPLE_BASE_ID = 0;
 
-static const Eobj_Class *_my_class = NULL;
+#define MY_CLASS SIMPLE_CLASS
 
 static void
-_a_set(Eobj *obj EINA_UNUSED, void *class_data, va_list *list)
+_a_set(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
 {
    Simple_Public_Data *pd = class_data;
    int a;
    a = va_arg(*list, int);
-   printf("%s %d\n", eobj_class_name_get(_my_class), a);
+   printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
    pd->a = a;
 }
 
 static void
-_a_print(Eobj *obj EINA_UNUSED, void *class_data, va_list *list)
+_a_print(const Eo *obj EINA_UNUSED, const void *class_data, va_list *list)
 {
-   Simple_Public_Data *pd = class_data;
+   const Simple_Public_Data *pd = class_data;
    (void) list;
-   printf("Print %s %d\n", eobj_class_name_get(_my_class), pd->a);
+   printf("Print %s %d\n", eo_class_name_get(MY_CLASS), pd->a);
 }
 
 static void
-_class_constructor(Eobj_Class *klass)
+_class_print(const Eo_Class *klass, va_list *list)
 {
-   const Eobj_Op_Func_Description func_desc[] = {
-        EOBJ_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set),
-        EOBJ_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_PRINT), _a_print),
-        EOBJ_OP_FUNC_SENTINEL
-   };
-
-   eobj_class_funcs_set(klass, func_desc);
+   (void) list;
+   printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
+   fail_if(eo_class_do_super(klass, simple_class_print()));
+   fail_if(eo_class_do_super(klass, simple_class_print2()));
 }
 
-const Eobj_Class *
-simple_class_get(void)
+static void
+_class_print2(const Eo_Class *klass, va_list *list)
 {
-   if (_my_class) return _my_class;
-
-   static const Eobj_Op_Description op_desc[] = {
-        EOBJ_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "i", "Set property A"),
-        EOBJ_OP_DESCRIPTION(SIMPLE_SUB_ID_A_PRINT, "", "Print property A"),
-        EOBJ_OP_DESCRIPTION_SENTINEL
-   };
+   (void) list;
+   printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
+}
 
-   static const Eobj_Class_Description class_desc = {
-        "Simple",
-        EOBJ_CLASS_TYPE_REGULAR,
-        EOBJ_CLASS_DESCRIPTION_OPS(&SIMPLE_BASE_ID, op_desc, SIMPLE_SUB_ID_LAST),
-        NULL,
-        sizeof(Simple_Public_Data),
-        NULL,
-        NULL,
-        _class_constructor,
-        NULL
+static void
+_class_constructor(Eo_Class *klass)
+{
+   const Eo_Op_Func_Description func_desc[] = {
+        EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set),
+        EO_OP_FUNC_CONST(SIMPLE_ID(SIMPLE_SUB_ID_A_PRINT), _a_print),
+        EO_OP_FUNC_CLASS(SIMPLE_ID(SIMPLE_SUB_ID_CLASS_PRINT), _class_print),
+        EO_OP_FUNC_CLASS(SIMPLE_ID(SIMPLE_SUB_ID_CLASS_PRINT2), _class_print2),
+        EO_OP_FUNC_SENTINEL
    };
 
-   return _my_class = eobj_class_new(&class_desc, EOBJ_BASE_CLASS, NULL);
+   eo_class_funcs_set(klass, func_desc);
 }
+
+static const Eo_Op_Description op_desc[] = {
+     EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
+     EO_OP_DESCRIPTION_CONST(SIMPLE_SUB_ID_A_PRINT, "Print property A"),
+     EO_OP_DESCRIPTION_CLASS(SIMPLE_SUB_ID_CLASS_PRINT, "Print class name."),
+     EO_OP_DESCRIPTION_CLASS(SIMPLE_SUB_ID_CLASS_PRINT2, "Print2 class name."),
+     EO_OP_DESCRIPTION_SENTINEL
+};
+
+static const Eo_Class_Description class_desc = {
+     "Simple",
+     EO_CLASS_TYPE_REGULAR,
+     EO_CLASS_DESCRIPTION_OPS(&SIMPLE_BASE_ID, op_desc, SIMPLE_SUB_ID_LAST),
+     NULL,
+     sizeof(Simple_Public_Data),
+     NULL,
+     NULL,
+     _class_constructor,
+     NULL
+};
+
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL);
+