summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-01-21 14:45:05 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-01-21 14:45:05 +0900
commit0b70a4e8ce9cd32875b975907c489365681c0cea (patch)
tree1c4eca2500b8283ac4f909a6734069059e387609
parent6160e8bcd6d8ad38574bbde9445c6be2cd6bb956 (diff)
elm: Replace EO_EV_ by EO_BASE_EVENT_
EO_EV_ stuff is deprecated
-rw-r--r--src/bin/test_application_server.c8
-rw-r--r--src/lib/elm_app_server.c6
-rw-r--r--src/lib/elm_entry.c4
-rw-r--r--src/lib/elm_win.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/test_application_server.c b/src/bin/test_application_server.c
index 227755f19..114f32b95 100644
--- a/src/bin/test_application_server.c
+++ b/src/bin/test_application_server.c
@@ -116,7 +116,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
116 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx), 116 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx),
117 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx), 117 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx),
118 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx), 118 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx),
119 eo_event_callback_add(EO_EV_DEL, _view_del_cb, ctx)); 119 eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, ctx));
120 120
121 return view; 121 return view;
122} 122}
@@ -163,7 +163,7 @@ test_application_server_common(const char *pkg)
163 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx), 163 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx),
164 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx), 164 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx),
165 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx), 165 eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx),
166 eo_event_callback_add(EO_EV_DEL, _view_del_cb, ctx)); 166 eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, ctx));
167 } 167 }
168 eina_iterator_free(views_iter); 168 eina_iterator_free(views_iter);
169 169
@@ -190,7 +190,7 @@ test_application_server_phone(void *data EINA_UNUSED,
190 } 190 }
191 printf("Starting phone\n"); 191 printf("Starting phone\n");
192 phone_server = test_application_server_common("org.enlightenment.phone"); 192 phone_server = test_application_server_common("org.enlightenment.phone");
193 eo_do(phone_server, eo_event_callback_add(EO_EV_DEL, _server_del_cb, &phone_server)); 193 eo_do(phone_server, eo_event_callback_add(EO_BASE_EVENT_DEL, _server_del_cb, &phone_server));
194} 194}
195 195
196void 196void
@@ -205,5 +205,5 @@ test_application_server_message(void *data EINA_UNUSED,
205 } 205 }
206 printf("Starting message\n"); 206 printf("Starting message\n");
207 msg_server = test_application_server_common( "org.enlightenment.message"); 207 msg_server = test_application_server_common( "org.enlightenment.message");
208 eo_do(msg_server, eo_event_callback_add(EO_EV_DEL, _server_del_cb, &msg_server)); 208 eo_do(msg_server, eo_event_callback_add(EO_BASE_EVENT_DEL, _server_del_cb, &msg_server));
209} 209}
diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c
index 50e3043f1..0225449e8 100644
--- a/src/lib/elm_app_server.c
+++ b/src/lib/elm_app_server.c
@@ -51,7 +51,7 @@ _view_append(Elm_App_Server_Data *data, Elm_App_Server_View *view)
51 } 51 }
52 52
53 eina_hash_add(data->views, view_id, view); 53 eina_hash_add(data->views, view_id, view);
54 eo_do(view, eo_event_callback_add(EO_EV_DEL, _view_del_cb, data)); 54 eo_do(view, eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, data));
55 return EINA_TRUE; 55 return EINA_TRUE;
56} 56}
57 57
@@ -264,7 +264,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
264 elm_app_server_view_icon_set(icon_name), 264 elm_app_server_view_icon_set(icon_name),
265 elm_app_server_view_progress_set(progress), 265 elm_app_server_view_progress_set(progress),
266 elm_app_server_view_new_events_set(new_events), 266 elm_app_server_view_new_events_set(new_events),
267 eo_event_callback_add(EO_EV_DEL, _view_del_cb, data), 267 eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, data),
268 elm_app_server_view_shallow()); 268 elm_app_server_view_shallow());
269 269
270 eina_hash_add(data->views, view_id, view); 270 eina_hash_add(data->views, view_id, view);
@@ -434,7 +434,7 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
434 EINA_ITERATOR_FOREACH(iter, view) 434 EINA_ITERATOR_FOREACH(iter, view)
435 { 435 {
436 //do not modify hash when iterating 436 //do not modify hash when iterating
437 eo_do(view, eo_event_callback_del(EO_EV_DEL, _view_del_cb, data)); 437 eo_do(view, eo_event_callback_del(EO_BASE_EVENT_DEL, _view_del_cb, data));
438 eo_del(view); 438 eo_del(view);
439 } 439 }
440 eina_iterator_free(iter); 440 eina_iterator_free(iter);
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index a2c6d73b1..6d0e4d746 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3851,8 +3851,8 @@ _elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
3851 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 3851 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
3852 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 3852 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
3853 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY), 3853 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY),
3854 eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL), 3854 eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL),
3855 eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deleted, NULL)); 3855 eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deleted, NULL));
3856 3856
3857 return obj; 3857 return obj;
3858} 3858}
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 5f0234c06..ad009b064 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3985,8 +3985,8 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3985 3985
3986 evas_object_show(sd->edje); 3986 evas_object_show(sd->edje);
3987 3987
3988 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, sd), 3988 eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, sd),
3989 eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, sd)); 3989 eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, sd));
3990 if (type == ELM_WIN_FAKE) 3990 if (type == ELM_WIN_FAKE)
3991 { 3991 {
3992 _elm_win_resize_job(obj); 3992 _elm_win_resize_job(obj);