Eo: Rename SIG_* to EV_*.

Patch by Yakov Goldberg.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/PROTO/eobj@70581 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/examples/access/simple.c b/examples/access/simple.c
index 5894344..da74104 100644 (file)
--- a/examples/access/simple.c
+++ b/examples/access/simple.c
@@ -10,7 +10,7 @@ typedef struct
    int a;
 } Private_Data;
 
-EAPI const Eo_Event_Description _SIG_A_CHANGED =
+EAPI const Eo_Event_Description _EV_A_CHANGED =
         EO_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
 
 #define MY_CLASS SIMPLE_CLASS
@@ -27,7 +27,7 @@ _a_set(Eo *obj, void *class_data, va_list *list)
    pd->protected.protected_x1 = a + 1;
    pd->protected.public.public_x2 = a + 2;
 
-   eo_event_callback_call(obj, SIG_A_CHANGED, &pd->a);
+   eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
 }
 
 static void
@@ -47,7 +47,7 @@ static const Eo_Op_Description op_desc[] = {
 };
 
 static const Eo_Event_Description *event_desc[] = {
-     SIG_A_CHANGED,
+     EV_A_CHANGED,
      NULL
 };
 

diff --git a/examples/access/simple.h b/examples/access/simple.h
index 5853369..fb96072 100644 (file)
--- a/examples/access/simple.h
+++ b/examples/access/simple.h
@@ -19,8 +19,8 @@ typedef struct
 
 #define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
 
-extern const Eo_Event_Description _SIG_A_CHANGED;
-#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
+extern const Eo_Event_Description _EV_A_CHANGED;
+#define EV_A_CHANGED (&(_EV_A_CHANGED))
 
 #define SIMPLE_CLASS simple_class_get()
 const Eo_Class *simple_class_get(void) EINA_CONST;

diff --git a/examples/composite_objects/comp.c b/examples/composite_objects/comp.c
index 60ad206..45a767a 100644 (file)
--- a/examples/composite_objects/comp.c
+++ b/examples/composite_objects/comp.c
@@ -25,7 +25,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
 
    Eo *simple = eo_add(SIMPLE_CLASS, obj);
    eo_composite_object_attach(obj, simple);
-   eo_event_callback_forwarder_add(simple, SIG_A_CHANGED, obj);
+   eo_event_callback_forwarder_add(simple, EV_A_CHANGED, obj);
 
    fail_if(eo_composite_is(obj));
    fail_if(!eo_composite_is(simple));

diff --git a/examples/composite_objects/main.c b/examples/composite_objects/main.c
index 31bd5c5..12620df 100644 (file)
--- a/examples/composite_objects/main.c
+++ b/examples/composite_objects/main.c
@@ -27,7 +27,7 @@ main(int argc, char *argv[])
    eo_init();
 
    Eo *obj = eo_add(COMP_CLASS, NULL);
-   eo_event_callback_add(obj, SIG_A_CHANGED, _a_changed_cb, NULL);
+   eo_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL);
 
    int a;
    eo_do(obj, simple_a_set(1));
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
    Eo *simple;
    eo_do(obj, eo_base_data_get("simple-obj", (void **) &simple));
    eo_ref(simple);
-   eo_event_callback_forwarder_del(simple, SIG_A_CHANGED, obj);
+   eo_event_callback_forwarder_del(simple, EV_A_CHANGED, obj);
 
    cb_called = EINA_FALSE;
    eo_do(obj, simple_a_set(2));

diff --git a/examples/composite_objects/simple.c b/examples/composite_objects/simple.c
index e8fada1..e76d1db 100644 (file)
--- a/examples/composite_objects/simple.c
+++ b/examples/composite_objects/simple.c
@@ -5,7 +5,7 @@
 
 EAPI Eo_Op SIMPLE_BASE_ID = 0;
 
-EAPI const Eo_Event_Description _SIG_A_CHANGED =
+EAPI const Eo_Event_Description _EV_A_CHANGED =
         EO_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
 
 #define MY_CLASS SIMPLE_CLASS
@@ -19,7 +19,7 @@ _a_set(Eo *obj, void *class_data, va_list *list)
    printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
    pd->a = a;
 
-   eo_event_callback_call(obj, SIG_A_CHANGED, &pd->a);
+   eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
 }
 
 static void
@@ -50,7 +50,7 @@ static const Eo_Op_Description op_desc[] = {
 };
 
 static const Eo_Event_Description *event_desc[] = {
-     SIG_A_CHANGED,
+     EV_A_CHANGED,
      NULL
 };
 

diff --git a/examples/composite_objects/simple.h b/examples/composite_objects/simple.h
index 3fc75a9..e26ac87 100644 (file)
--- a/examples/composite_objects/simple.h
+++ b/examples/composite_objects/simple.h
@@ -21,8 +21,8 @@ typedef struct
 #define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
 #define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EO_TYPECHECK(int *, a)
 
-extern const Eo_Event_Description _SIG_A_CHANGED;
-#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
+extern const Eo_Event_Description _EV_A_CHANGED;
+#define EV_A_CHANGED (&(_EV_A_CHANGED))
 
 #define SIMPLE_CLASS simple_class_get()
 const Eo_Class *simple_class_get(void) EINA_CONST;

diff --git a/examples/evas/elw_boxedbutton.c b/examples/evas/elw_boxedbutton.c
index 4846697..58e2ce8 100644 (file)
--- a/examples/evas/elw_boxedbutton.c
+++ b/examples/evas/elw_boxedbutton.c
@@ -22,7 +22,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
 
    Eo *bt = eo_add(ELW_BUTTON_CLASS, obj);
    eo_composite_object_attach(obj, bt);
-   eo_event_callback_forwarder_add(bt, SIG_CLICKED, obj);
+   eo_event_callback_forwarder_add(bt, EV_CLICKED, obj);
    eo_do(bt, evas_obj_visibility_set(EINA_TRUE));
 
    eo_do(obj, elw_box_pack_end(bt));

diff --git a/examples/evas/elw_button.c b/examples/evas/elw_button.c
index 42911c8..270a3cd 100644 (file)
--- a/examples/evas/elw_button.c
+++ b/examples/evas/elw_button.c
@@ -8,7 +8,7 @@
 
 EAPI Eo_Op ELW_BUTTON_BASE_ID = 0;
 
-EAPI const Eo_Event_Description _SIG_CLICKED =
+EAPI const Eo_Event_Description _EV_CLICKED =
         EO_EVENT_DESCRIPTION("clicked", "", "Called when there was a click.");
 
 typedef struct
@@ -44,7 +44,7 @@ _btn_clicked(void *data, Evas_Object *evas_obj, void *event_info)
    (void) evas_obj;
    (void) event_info;
    Eo *obj = data;
-   eo_event_callback_call(obj, SIG_CLICKED, NULL);
+   eo_event_callback_call(obj, EV_CLICKED, NULL);
 }
 
 static void
@@ -92,7 +92,7 @@ static const Eo_Op_Description op_desc[] = {
 };
 
 static const Eo_Event_Description *event_desc[] = {
-     SIG_CLICKED,
+     EV_CLICKED,
      NULL
 };
 

diff --git a/examples/evas/elw_button.h b/examples/evas/elw_button.h
index ff6f182..5932ac5 100644 (file)
--- a/examples/evas/elw_button.h
+++ b/examples/evas/elw_button.h
@@ -20,8 +20,8 @@ enum {
  */
 #define elw_button_text_set(text) ELW_BUTTON_ID(ELW_BUTTON_SUB_ID_TEXT_SET), EO_TYPECHECK(const char *, text)
 
-extern const Eo_Event_Description _SIG_CLICKED;
-#define SIG_CLICKED (&(_SIG_CLICKED))
+extern const Eo_Event_Description _EV_CLICKED;
+#define EV_CLICKED (&(_EV_CLICKED))
 
 #define ELW_BUTTON_CLASS elw_button_class_get()
 const Eo_Class *elw_button_class_get(void) EINA_CONST;

diff --git a/examples/evas/test.c b/examples/evas/test.c
index ffda21c..3268400 100644 (file)
--- a/examples/evas/test.c
+++ b/examples/evas/test.c
@@ -38,7 +38,7 @@ main(int argc, char *argv[])
          evas_obj_color_set(255, 0, 0, 255),
          elw_button_text_set("Click"),
          evas_obj_visibility_set(EINA_TRUE));
-   eo_event_callback_add(bt, SIG_CLICKED, _btn_clicked_cb, "btn");
+   eo_event_callback_add(bt, EV_CLICKED, _btn_clicked_cb, "btn");
 
    int r, g, b, a;
    eo_do(bt, evas_obj_color_get(&r, &g, &b, &a));
@@ -50,7 +50,7 @@ main(int argc, char *argv[])
          evas_obj_color_set(0, 0, 255, 255),
          elw_button_text_set("Click2"),
          evas_obj_visibility_set(EINA_TRUE));
-   eo_event_callback_add(bx, SIG_CLICKED, _btn_clicked_cb, "bxedbtn");
+   eo_event_callback_add(bx, EV_CLICKED, _btn_clicked_cb, "bxedbtn");
 
    elm_run();
 

diff --git a/examples/signals/main.c b/examples/signals/main.c
index 205dcb3..adbdd76 100644 (file)
--- a/examples/signals/main.c
+++ b/examples/signals/main.c
@@ -30,37 +30,37 @@ main(int argc, char *argv[])
    Simple_Public_Data *pd = eo_data_get(obj, SIMPLE_CLASS);
 
    /* The order of these two is undetermined. */
-   eo_event_callback_priority_add(obj, SIG_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
-   eo_event_callback_priority_add(obj, SIG_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
+   eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
+   eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
    /* This will be called afterwards. */
-   eo_event_callback_priority_add(obj, SIG_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3);
+   eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3);
    /* This will never be called because the previous callback returns NULL. */
-   eo_event_callback_priority_add(obj, SIG_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4);
+   eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4);
 
    eo_do(obj, simple_a_set(1));
 
    fail_if(cb_count != 3);
 
-   eo_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 3);
+   eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 3);
    fail_if(pd->cb_count != 3);
 
-   fail_if(eo_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 12));
+   fail_if(eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 12));
    fail_if(pd->cb_count != 3);
 
-   fail_if(4 != (int) eo_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 4));
+   fail_if(4 != (int) eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 4));
    fail_if(pd->cb_count != 2);
-   eo_event_callback_del_lazy(obj, SIG_A_CHANGED, _a_changed_cb);
+   eo_event_callback_del_lazy(obj, EV_A_CHANGED, _a_changed_cb);
    fail_if(pd->cb_count != 1);
 
-   fail_if(eo_event_callback_del_lazy(obj, SIG_A_CHANGED, NULL));
+   fail_if(eo_event_callback_del_lazy(obj, EV_A_CHANGED, NULL));
    fail_if(pd->cb_count != 1);
-   fail_if(eo_event_callback_del(obj, SIG_A_CHANGED, NULL, 0));
+   fail_if(eo_event_callback_del(obj, EV_A_CHANGED, NULL, 0));
    fail_if(pd->cb_count != 1);
 
-   eo_event_callback_del_lazy(obj, SIG_A_CHANGED, _a_changed_cb);
+   eo_event_callback_del_lazy(obj, EV_A_CHANGED, _a_changed_cb);
    fail_if(pd->cb_count != 0);
 
-   fail_if(eo_event_callback_del_lazy(obj, SIG_A_CHANGED, _a_changed_cb));
+   fail_if(eo_event_callback_del_lazy(obj, EV_A_CHANGED, _a_changed_cb));
    fail_if(pd->cb_count != 0);
 
    eo_unref(obj);

diff --git a/examples/signals/simple.c b/examples/signals/simple.c
index 41ffbef..61d446a 100644 (file)
--- a/examples/signals/simple.c
+++ b/examples/signals/simple.c
@@ -11,7 +11,7 @@ typedef struct
    int a;
 } Private_Data;
 
-EAPI const Eo_Event_Description _SIG_A_CHANGED =
+EAPI const Eo_Event_Description _EV_A_CHANGED =
         EO_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
 
 #define MY_CLASS SIMPLE_CLASS
@@ -25,7 +25,7 @@ _a_set(Eo *obj, void *class_data, va_list *list)
    pd->a = a;
    printf("%s %d\n", __func__, pd->a);
 
-   eo_event_callback_call(obj, SIG_A_CHANGED, &pd->a);
+   eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
 }
 
 Eina_Bool
@@ -36,12 +36,12 @@ _cb_added(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_inf
    (void) data;
    (void) desc;
 
-   if (cb_desc != SIG_A_CHANGED)
+   if (cb_desc != EV_A_CHANGED)
       return EINA_TRUE;
 
    pd->cb_count++;
 
-   printf("Added SIG_A_CHANGED callback to %p. Count: %d\n", obj, pd->cb_count);
+   printf("Added EV_A_CHANGED callback to %p. Count: %d\n", obj, pd->cb_count);
    return EO_CALLBACK_CONTINUE;
 }
 
@@ -53,12 +53,12 @@ _cb_deled(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_inf
    (void) data;
    (void) desc;
 
-   if (cb_desc != SIG_A_CHANGED)
+   if (cb_desc != EV_A_CHANGED)
       return EINA_TRUE;
 
    pd->cb_count--;
 
-   printf("Removed SIG_A_CHANGED callback from %p. Count: %d\n", obj, pd->cb_count);
+   printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", obj, pd->cb_count);
    return EO_CALLBACK_CONTINUE;
 }
 
@@ -90,7 +90,7 @@ static const Eo_Op_Description op_desc[] = {
 };
 
 static const Eo_Event_Description *event_desc[] = {
-     SIG_A_CHANGED,
+     EV_A_CHANGED,
      NULL
 };
 

diff --git a/examples/signals/simple.h b/examples/signals/simple.h
index d912a68..11e06bc 100644 (file)
--- a/examples/signals/simple.h
+++ b/examples/signals/simple.h
@@ -24,8 +24,8 @@ typedef struct
  */
 #define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
 
-extern const Eo_Event_Description _SIG_A_CHANGED;
-#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
+extern const Eo_Event_Description _EV_A_CHANGED;
+#define EV_A_CHANGED (&(_EV_A_CHANGED))
 
 #define SIMPLE_CLASS simple_class_get()
 const Eo_Class *simple_class_get(void) EINA_CONST;