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

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

diff --git a/examples/evas/elw_button.c b/examples/evas/elw_button.c
index 6f5dfaf..52e6d5f 100644 (file)
--- a/examples/evas/elw_button.c
+++ b/examples/evas/elw_button.c
@@ -1,36 +1,36 @@
 #include <Elementary.h>
 
-#include "Eobj.h"
+#include "Eo.h"
 #include "evas_obj.h"
 #include "elw_button.h"
 
 #include "config.h"
 
-EAPI Eobj_Op ELW_BUTTON_BASE_ID = 0;
+EAPI Eo_Op ELW_BUTTON_BASE_ID = 0;
 
-EAPI const Eobj_Event_Description _SIG_CLICKED =
-        EOBJ_EVENT_DESCRIPTION("clicked", "", "Called when there was a click.");
+EAPI const Eo_Event_Description _EV_CLICKED =
+        EO_EVENT_DESCRIPTION("clicked", "Called when there was a click.");
 
 typedef struct
 {
    Evas_Object *bt;
 } Widget_Data;
 
-static Eobj_Class *_my_class = NULL;
+#define MY_CLASS ELW_BUTTON_CLASS
 
 static void
-_position_set(Eobj *obj, void *class_data __UNUSED__, va_list *list)
+_position_set(Eo *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));
+   eo_do_super(obj, evas_obj_position_set(x, y));
 }
 
 static void
-_text_set(Eobj *obj __UNUSED__, void *class_data, va_list *list)
+_text_set(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
 {
    Widget_Data *wd = class_data;
    const char *text;
@@ -43,76 +43,70 @@ _btn_clicked(void *data, Evas_Object *evas_obj, void *event_info)
 {
    (void) evas_obj;
    (void) event_info;
-   Eobj *obj = data;
-   eobj_event_callback_call(obj, SIG_CLICKED, NULL);
+   Eo *obj = data;
+   eo_do(obj, eo_event_callback_call(EV_CLICKED, NULL, NULL));
 }
 
 static void
-_constructor(Eobj *obj, void *class_data)
+_constructor(Eo *obj, void *class_data)
 {
-   eobj_constructor_super(obj);
+   eo_constructor_super(obj);
 
    Widget_Data *wd = class_data;
 
-   /* FIXME: An hack, because our tree is not yet only Eobj */
-   wd->bt = elm_button_add(eobj_evas_object_get(eobj_parent_get(obj)));
+   /* FIXME: An hack, because our tree is not yet only Eo */
+   wd->bt = elm_button_add(eo_evas_object_get(eo_parent_get(obj)));
    evas_object_size_hint_align_set(wd->bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(wd->bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_smart_callback_add(wd->bt, "clicked", _btn_clicked, obj);
 
-   eobj_evas_object_set(obj, wd->bt);
+   eo_evas_object_set(obj, wd->bt);
 }
 
 static void
-_destructor(Eobj *obj, void *class_data __UNUSED__)
+_destructor(Eo *obj, void *class_data EINA_UNUSED)
 {
-   eobj_destructor_super(obj);
+   eo_destructor_super(obj);
 
    //Widget_Data *wd = class_data;
    /* FIXME: Commented out because it's automatically done because our tree
-    * is not made of only eobj */
+    * is not made of only eo */
    //evas_object_del(wd->bt);
 }
 
 static void
-_class_constructor(Eobj_Class *klass)
+_class_constructor(Eo_Class *klass)
 {
-   const Eobj_Op_Func_Description func_desc[] = {
-        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
+   const Eo_Op_Func_Description func_desc[] = {
+        EO_OP_FUNC(ELW_BUTTON_ID(ELW_BUTTON_SUB_ID_TEXT_SET), _text_set),
+        EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), _position_set),
+        EO_OP_FUNC_SENTINEL
    };
 
-   eobj_class_funcs_set(klass, func_desc);
+   eo_class_funcs_set(klass, func_desc);
 }
 
-const Eobj_Class *
-elw_button_class_get(void)
-{
-   if (_my_class) return _my_class;
-
-   static const Eobj_Op_Description op_desc[] = {
-        EOBJ_OP_DESCRIPTION(ELW_BUTTON_SUB_ID_TEXT_SET, "s", "Text of a text supporting evas object."), // FIXME: This ID sholudn't really be defined here...
-        EOBJ_OP_DESCRIPTION_SENTINEL
-   };
-
-   static const Eobj_Event_Description *event_desc[] = {
-        SIG_CLICKED,
-        NULL
-   };
-
-   static const Eobj_Class_Description class_desc = {
-        "Elw Button",
-        EOBJ_CLASS_TYPE_REGULAR,
-        EOBJ_CLASS_DESCRIPTION_OPS(&ELW_BUTTON_BASE_ID, op_desc, ELW_BUTTON_SUB_ID_LAST),
-        event_desc,
-        sizeof(Widget_Data),
-        _constructor,
-        _destructor,
-        _class_constructor,
-        NULL
-   };
-
-   return _my_class = eobj_class_new(&class_desc, EVAS_OBJ_CLASS, NULL);
-}
+static const Eo_Op_Description op_desc[] = {
+     EO_OP_DESCRIPTION(ELW_BUTTON_SUB_ID_TEXT_SET, "Text of a text supporting evas object."), // FIXME: This ID sholudn't really be defined here...
+     EO_OP_DESCRIPTION_SENTINEL
+};
+
+static const Eo_Event_Description *event_desc[] = {
+     EV_CLICKED,
+     NULL
+};
+
+static const Eo_Class_Description class_desc = {
+     "Elw Button",
+     EO_CLASS_TYPE_REGULAR,
+     EO_CLASS_DESCRIPTION_OPS(&ELW_BUTTON_BASE_ID, op_desc, ELW_BUTTON_SUB_ID_LAST),
+     event_desc,
+     sizeof(Widget_Data),
+     _constructor,
+     _destructor,
+     _class_constructor,
+     NULL
+};
+
+EO_DEFINE_CLASS(elw_button_class_get, &class_desc, EVAS_OBJ_CLASS, NULL)