Eobj: s/__UNUSED__/EINA_UNUSED/ I had no idea that exists.

[profile/ivi/eobj.git] / examples / evas / elw_button.c

diff --git a/examples/evas/elw_button.c b/examples/evas/elw_button.c
index 71ae888..55b4543 100644 (file)
--- a/examples/evas/elw_button.c
+++ b/examples/evas/elw_button.c
@@ -16,21 +16,21 @@ typedef struct
    Evas_Object *bt;
 } Widget_Data;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
-_position_set(Eobj *obj, void *class_data __UNUSED__, va_list *list)
+_position_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list)
 {
    (void) obj;
    Evas_Coord x, y;
    x = va_arg(*list, Evas_Coord);
    y = va_arg(*list, Evas_Coord);
    printf("But set position %d,%d\n", x, y);
-   eobj_super_do(obj, EVAS_OBJ_POSITION_SET(x, y));
+   eobj_do_super(obj, EVAS_OBJ_POSITION_SET(x, y));
 }
 
 static void
-_text_set(Eobj *obj __UNUSED__, void *class_data, va_list *list)
+_text_set(Eobj *obj EINA_UNUSED, void *class_data, va_list *list)
 {
    Widget_Data *wd = class_data;
    const char *text;
@@ -64,7 +64,7 @@ _constructor(Eobj *obj, void *class_data)
 }
 
 static void
-_destructor(Eobj *obj, void *class_data __UNUSED__)
+_destructor(Eobj *obj, void *class_data EINA_UNUSED)
 {
    eobj_destructor_super(obj);
 
@@ -78,9 +78,9 @@ static void
 _class_constructor(Eobj_Class *klass)
 {
    const Eobj_Op_Func_Description func_desc[] = {
-        EOBJ_OP_FUNC_DESCRIPTION(ELW_BUTTON_ID(ELW_BUTTON_SUB_ID_TEXT_SET), _text_set),
-        EOBJ_OP_FUNC_DESCRIPTION(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), _position_set),
-        EOBJ_OP_FUNC_DESCRIPTION_SENTINEL
+        EOBJ_OP_FUNC(ELW_BUTTON_ID(ELW_BUTTON_SUB_ID_TEXT_SET), _text_set),
+        EOBJ_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), _position_set),
+        EOBJ_OP_FUNC_SENTINEL
    };
 
    eobj_class_funcs_set(klass, func_desc);