jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=9d76a44b7837a93329e70f6f493f274ffb5acbf0

commit 9d76a44b7837a93329e70f6f493f274ffb5acbf0
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Thu Jan 21 13:10:05 2016 +0900

    Eo: Replace deprecated EO_EV_ by EO_BASE_EVENT_
---
 src/lib/eo/eo_base_class.c                           | 8 ++++----
 src/lib/eo/eo_private.h                              | 2 +-
 src/modules/evas/engines/gl_common/evas_gl_preload.c | 4 ++--
 src/tests/eo/signals/signals_simple.c                | 4 ++--
 src/tests/eo/suite/eo_test_general.c                 | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 246bcc2..d27e256 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -575,7 +575,7 @@ _eo_base_event_callback_priority_add(Eo *obj, Eo_Base_Data 
*pd,
 
      {
         const Eo_Callback_Array_Item arr[] = { {desc, func}, {NULL, NULL}};
-        eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_ADD, (void *)arr));
+        eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_ADD, (void 
*)arr));
      }
 }
 
@@ -597,7 +597,7 @@ _eo_base_event_callback_del(Eo *obj, Eo_Base_Data *pd,
              cb->delete_me = EINA_TRUE;
              pd->deletions_waiting = EINA_TRUE;
              _eo_callbacks_clear(pd);
-             eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_DEL, (void 
*)arr); );
+             eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_DEL, 
(void *)arr); );
              return;
           }
      }
@@ -622,7 +622,7 @@ _eo_base_event_callback_array_priority_add(Eo *obj, 
Eo_Base_Data *pd,
    _eo_callbacks_sorted_insert(pd, cb);
 
      {
-        eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_ADD, (void *)array); 
);
+        eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_ADD, (void 
*)array); );
      }
 }
 
@@ -642,7 +642,7 @@ _eo_base_event_callback_array_del(Eo *obj, Eo_Base_Data *pd,
              pd->deletions_waiting = EINA_TRUE;
              _eo_callbacks_clear(pd);
 
-             eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_DEL, (void 
*)array); );
+             eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_DEL, 
(void *)array); );
              return;
           }
      }
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 135966d..869745c 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -214,7 +214,7 @@ _eo_del_internal(const char *file, int line, _Eo_Object 
*obj)
 
    const _Eo_Class *klass = obj->klass;
 
-   eo_do(_eo_id_get(obj), eo_event_callback_call(EO_EV_DEL, NULL));
+   eo_do(_eo_id_get(obj), eo_event_callback_call(EO_BASE_EVENT_DEL, NULL));
 
    _eo_condtor_reset(obj);
 
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c 
b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 5344473..9c3b1357 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -316,7 +316,7 @@ evas_gl_preload_target_register(Evas_GL_Texture *tex, Eo 
*target)
    EINA_SAFETY_ON_NULL_RETURN(tex);
 
    eo_do(target,
-         eo_event_callback_add(EO_EV_DEL, _evas_gl_preload_target_die, tex));
+         eo_event_callback_add(EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, 
tex));
    tex->targets = eina_list_append(tex->targets, target);
    tex->references++;
 }
@@ -330,7 +330,7 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo 
*target)
    EINA_SAFETY_ON_NULL_RETURN(tex);
 
    eo_do(target,
-         eo_event_callback_del(EO_EV_DEL, _evas_gl_preload_target_die, tex));
+         eo_event_callback_del(EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, 
tex));
 
    EINA_LIST_FOREACH(tex->targets, l, o)
      if (o == target)
diff --git a/src/tests/eo/signals/signals_simple.c 
b/src/tests/eo/signals/signals_simple.c
index 7b55cf8..fd3138d 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -65,8 +65,8 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
 {
    obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
 
-   eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL));
-   eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL));
+   eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, 
NULL));
+   eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, 
NULL));
 
    eo_do(obj, eo_key_data_set("cb_count", NULL));
 
diff --git a/src/tests/eo/suite/eo_test_general.c 
b/src/tests/eo/suite/eo_test_general.c
index 394e9c0..f305027 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -96,13 +96,13 @@ START_TEST(eo_signals)
           { EV_A_CHANGED, _eo_signals_a_changed_cb },
           { EV_A_CHANGED, _eo_signals_a_changed_cb2 },
           { EV_A_CHANGED, _eo_signals_a_changed_never },
-          { EO_EV_DEL, _eo_signals_eo_del_cb },
+          { EO_BASE_EVENT_DEL, _eo_signals_eo_del_cb },
           { NULL, NULL }
    };
    Eo *obj = eo_add(SIMPLE_CLASS, NULL);
 
-   eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, 
_eo_signals_cb_added_deled, callbacks));
-   eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, 
_eo_signals_cb_added_deled, callbacks));
+   eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, 
_eo_signals_cb_added_deled, callbacks));
+   eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, 
_eo_signals_cb_added_deled, callbacks));
    eo_do(obj, eo_event_callback_array_priority_add(callbacks, -100, (void *) 
1));
    eo_do(obj, eo_event_callback_array_add(callbacks, (void *) 3));
    eo_do(obj, eo_event_callback_array_priority_add(callbacks, -50, (void *) 
2));

-- 


Reply via email to