summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore/ecore.c4
-rw-r--r--src/lib/ecore/ecore_exe.c14
-rw-r--r--src/lib/ecore/ecore_exe.eo8
-rw-r--r--src/lib/ecore/ecore_exe_posix.c8
-rw-r--r--src/lib/ecore/ecore_exe_private.h4
-rw-r--r--src/lib/ecore/ecore_exe_win32.c8
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c8
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c4
-rw-r--r--src/lib/ecore/ecore_idler.c12
-rw-r--r--src/lib/ecore/ecore_main.c48
-rw-r--r--src/lib/ecore/ecore_parent.eo2
-rw-r--r--src/lib/ecore/ecore_poller.c14
-rw-r--r--src/lib/ecore/ecore_poller.eo6
-rw-r--r--src/lib/ecore/ecore_private.h4
-rw-r--r--src/lib/ecore/ecore_timer.c64
-rw-r--r--src/lib/ecore/efl_loop.eo16
-rw-r--r--src/lib/ecore/efl_loop_fd.c30
-rw-r--r--src/lib/ecore/efl_loop_fd.eo6
-rw-r--r--src/lib/ecore/efl_loop_timer.eo14
-rw-r--r--src/lib/ecore/efl_loop_user.c8
-rw-r--r--src/lib/ecore/efl_loop_user.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio.eo8
-rw-r--r--src/lib/ecore_audio/ecore_audio_in.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_in_sndfile.eo2
-rw-r--r--src/lib/ecore_audio/ecore_audio_in_tone.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.c4
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c18
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c6
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c12
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c10
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c4
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c28
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_out.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_out_pulse.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_out_sndfile.eo4
-rw-r--r--src/lib/ecore_audio/ecore_audio_private.h2
-rw-r--r--src/lib/ecore_con/ecore_con.c42
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c40
-rw-r--r--src/lib/ecore_con/ecore_con_eet_base.eo8
-rw-r--r--src/lib/ecore_con/ecore_con_eet_client_obj.eo4
-rw-r--r--src/lib/ecore_con/ecore_con_eet_server_obj.eo4
-rw-r--r--src/lib/ecore_con/ecore_con_local_win32.c2
-rw-r--r--src/lib/ecore_con/ecore_con_url.c28
-rw-r--r--src/lib/ecore_con/efl_network.eo2
-rw-r--r--src/lib/ecore_con/efl_network_client.eo2
-rw-r--r--src/lib/ecore_con/efl_network_connector.eo2
-rw-r--r--src/lib/ecore_con/efl_network_server.eo6
-rw-r--r--src/lib/ecore_con/efl_network_url.eo8
-rw-r--r--src/lib/ecore_evas/ecore_evas.c36
-rw-r--r--src/lib/ector/cairo/ector_cairo_software_surface.c10
-rw-r--r--src/lib/ector/cairo/ector_cairo_software_surface.eo4
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.c10
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.eo6
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.c14
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.eo6
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c10
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo4
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c10
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo4
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c16
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.eo6
-rw-r--r--src/lib/ector/ector_renderer.c10
-rw-r--r--src/lib/ector/ector_renderer.eo6
-rw-r--r--src/lib/ector/ector_renderer_buffer.eo2
-rw-r--r--src/lib/ector/ector_surface.eo4
-rw-r--r--src/lib/ector/gl/ector_gl_buffer.eo2
-rw-r--r--src/lib/ector/gl/ector_gl_surface.c12
-rw-r--r--src/lib/ector/gl/ector_gl_surface.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.c8
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c8
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c8
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c10
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.eo4
-rw-r--r--src/lib/ector/software/ector_renderer_software_buffer.c4
-rw-r--r--src/lib/ector/software/ector_renderer_software_buffer.eo2
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.c8
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.eo4
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.c8
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.eo4
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c10
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.eo4
-rw-r--r--src/lib/ector/software/ector_software_buffer.c12
-rw-r--r--src/lib/ector/software/ector_software_buffer.eo6
-rw-r--r--src/lib/ector/software/ector_software_surface.c10
-rw-r--r--src/lib/ector/software/ector_software_surface.eo4
-rw-r--r--src/lib/edje/edje_calc.c6
-rw-r--r--src/lib/edje/edje_callbacks.c8
-rw-r--r--src/lib/edje/edje_containers.c32
-rw-r--r--src/lib/edje/edje_edit.c16
-rw-r--r--src/lib/edje/edje_edit.eo4
-rw-r--r--src/lib/edje/edje_load.c6
-rw-r--r--src/lib/edje/edje_multisense.c22
-rw-r--r--src/lib/edje/edje_object.eo6
-rw-r--r--src/lib/edje/edje_program.c4
-rw-r--r--src/lib/edje/edje_smart.c22
-rw-r--r--src/lib/edje/edje_util.c12
-rw-r--r--src/lib/edje/efl_canvas_layout_internal_box.eo4
-rw-r--r--src/lib/edje/efl_canvas_layout_internal_swallow.eo4
-rw-r--r--src/lib/edje/efl_canvas_layout_internal_table.eo4
-rw-r--r--src/lib/efl/Efl.h4
-rw-r--r--src/lib/efl/interfaces/efl_common_internal.h2
-rw-r--r--src/lib/efl/interfaces/efl_event.eo4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_shape.c32
-rw-r--r--src/lib/efl/interfaces/efl_gfx_shape.eo8
-rw-r--r--src/lib/efl/interfaces/efl_input_device.c10
-rw-r--r--src/lib/efl/interfaces/efl_input_device.eo6
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c8
-rw-r--r--src/lib/efl/interfaces/efl_model.eo6
-rw-r--r--src/lib/efl/interfaces/efl_model_common.c4
-rw-r--r--src/lib/efl/interfaces/efl_pack_layout.eo4
-rw-r--r--src/lib/efl/interfaces/efl_part.eo4
-rw-r--r--src/lib/efl/interfaces/efl_vpath_core.c10
-rw-r--r--src/lib/efl/interfaces/efl_vpath_core.eo6
-rw-r--r--src/lib/efl/interfaces/efl_vpath_file.c6
-rw-r--r--src/lib/efl/interfaces/efl_vpath_file.eo2
-rw-r--r--src/lib/efl/interfaces/efl_vpath_file_core.c10
-rw-r--r--src/lib/efl/interfaces/efl_vpath_file_core.eo4
-rw-r--r--src/lib/efl/interfaces/efl_vpath_manager.c4
-rw-r--r--src/lib/efl/interfaces/efl_vpath_manager.eo2
-rw-r--r--src/lib/eio/efl_io_manager.c16
-rw-r--r--src/lib/eio/efl_io_manager.eo6
-rw-r--r--src/lib/eio/eio_main.c2
-rw-r--r--src/lib/eio/eio_model.c18
-rw-r--r--src/lib/eio/eio_model.eo8
-rw-r--r--src/lib/eio/eio_sentry.c14
-rw-r--r--src/lib/eio/eio_sentry.eo6
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.c12
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.eo6
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c12
-rw-r--r--src/lib/eldbus/eldbus_model_connection.eo6
-rw-r--r--src/lib/eldbus/eldbus_model_method.c8
-rw-r--r--src/lib/eldbus/eldbus_model_method.eo2
-rw-r--r--src/lib/eldbus/eldbus_model_object.c10
-rw-r--r--src/lib/eldbus/eldbus_model_object.eo6
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c14
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.eo6
-rw-r--r--src/lib/eldbus/eldbus_model_signal.c10
-rw-r--r--src/lib/eldbus/eldbus_model_signal.eo4
-rw-r--r--src/lib/elementary/efl_config_global.eo2
-rw-r--r--src/lib/elementary/efl_ui_box.c18
-rw-r--r--src/lib/elementary/efl_ui_box.eo2
-rw-r--r--src/lib/elementary/efl_ui_box_flow.c6
-rw-r--r--src/lib/elementary/efl_ui_box_flow.eo2
-rw-r--r--src/lib/elementary/efl_ui_box_private.h2
-rw-r--r--src/lib/elementary/efl_ui_flip.c14
-rw-r--r--src/lib/elementary/efl_ui_flip.eo2
-rw-r--r--src/lib/elementary/efl_ui_flip_internal_part.eo4
-rw-r--r--src/lib/elementary/efl_ui_frame.c14
-rw-r--r--src/lib/elementary/efl_ui_frame.eo2
-rw-r--r--src/lib/elementary/efl_ui_grid.c36
-rw-r--r--src/lib/elementary/efl_ui_grid.eo2
-rw-r--r--src/lib/elementary/efl_ui_grid_private.h2
-rw-r--r--src/lib/elementary/efl_ui_grid_static.c10
-rw-r--r--src/lib/elementary/efl_ui_grid_static.eo2
-rw-r--r--src/lib/elementary/efl_ui_image.c28
-rw-r--r--src/lib/elementary/efl_ui_image.eo2
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c34
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.eo4
-rw-r--r--src/lib/elementary/efl_ui_layout_internal_box.eo6
-rw-r--r--src/lib/elementary/efl_ui_layout_internal_table.eo6
-rw-r--r--src/lib/elementary/efl_ui_nstate.c10
-rw-r--r--src/lib/elementary/efl_ui_nstate.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.c118
-rw-r--r--src/lib/elementary/efl_ui_text.eo4
-rw-r--r--src/lib/elementary/efl_ui_text_editable.eo2
-rw-r--r--src/lib/elementary/efl_ui_video.c10
-rw-r--r--src/lib/elementary/efl_ui_video.eo2
-rw-r--r--src/lib/elementary/efl_ui_win.c148
-rw-r--r--src/lib/elementary/efl_ui_win.eo6
-rw-r--r--src/lib/elementary/efl_ui_win_standard.c4
-rw-r--r--src/lib/elementary/efl_ui_win_standard.eo2
-rw-r--r--src/lib/elementary/elc_combobox.c36
-rw-r--r--src/lib/elementary/elc_ctxpopup.c24
-rw-r--r--src/lib/elementary/elc_fileselector.c120
-rw-r--r--src/lib/elementary/elc_fileselector_button.c12
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c16
-rw-r--r--src/lib/elementary/elc_hoversel.c46
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c44
-rw-r--r--src/lib/elementary/elc_naviframe.c36
-rw-r--r--src/lib/elementary/elc_player.c46
-rw-r--r--src/lib/elementary/elc_popup.c34
-rw-r--r--src/lib/elementary/elm_access.c6
-rw-r--r--src/lib/elementary/elm_access.eo2
-rw-r--r--src/lib/elementary/elm_actionslider.c38
-rw-r--r--src/lib/elementary/elm_actionslider.eo2
-rw-r--r--src/lib/elementary/elm_app_client.c24
-rw-r--r--src/lib/elementary/elm_app_client.eo6
-rw-r--r--src/lib/elementary/elm_app_client_view.c30
-rw-r--r--src/lib/elementary/elm_app_client_view.eo6
-rw-r--r--src/lib/elementary/elm_app_server.c22
-rw-r--r--src/lib/elementary/elm_app_server.eo6
-rw-r--r--src/lib/elementary/elm_app_server_view.c28
-rw-r--r--src/lib/elementary/elm_app_server_view.eo6
-rw-r--r--src/lib/elementary/elm_atspi_app_object.c4
-rw-r--r--src/lib/elementary/elm_atspi_app_object.eo4
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c50
-rw-r--r--src/lib/elementary/elm_atspi_bridge.eo6
-rw-r--r--src/lib/elementary/elm_bg.c6
-rw-r--r--src/lib/elementary/elm_bg.eo2
-rw-r--r--src/lib/elementary/elm_box.c22
-rw-r--r--src/lib/elementary/elm_box.eo2
-rw-r--r--src/lib/elementary/elm_bubble.c8
-rw-r--r--src/lib/elementary/elm_bubble.eo2
-rw-r--r--src/lib/elementary/elm_button.c16
-rw-r--r--src/lib/elementary/elm_button.eo2
-rw-r--r--src/lib/elementary/elm_calendar.c12
-rw-r--r--src/lib/elementary/elm_calendar.eo2
-rw-r--r--src/lib/elementary/elm_check.c12
-rw-r--r--src/lib/elementary/elm_check.eo2
-rw-r--r--src/lib/elementary/elm_clock.c10
-rw-r--r--src/lib/elementary/elm_clock.eo2
-rw-r--r--src/lib/elementary/elm_cnp.c30
-rw-r--r--src/lib/elementary/elm_code.c12
-rw-r--r--src/lib/elementary/elm_code.h2
-rw-r--r--src/lib/elementary/elm_code_common.h4
-rw-r--r--src/lib/elementary/elm_code_widget.c38
-rw-r--r--src/lib/elementary/elm_code_widget.eo4
-rw-r--r--src/lib/elementary/elm_code_widget_selection.c8
-rw-r--r--src/lib/elementary/elm_color_class.c10
-rw-r--r--src/lib/elementary/elm_color_item.eo4
-rw-r--r--src/lib/elementary/elm_colorselector.c46
-rw-r--r--src/lib/elementary/elm_colorselector.eo2
-rw-r--r--src/lib/elementary/elm_combobox.eo2
-rw-r--r--src/lib/elementary/elm_config.c8
-rw-r--r--src/lib/elementary/elm_conform.c26
-rw-r--r--src/lib/elementary/elm_conformant.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup_item.eo4
-rw-r--r--src/lib/elementary/elm_datetime.c14
-rw-r--r--src/lib/elementary/elm_datetime.eo2
-rw-r--r--src/lib/elementary/elm_dayselector.c24
-rw-r--r--src/lib/elementary/elm_dayselector.eo2
-rw-r--r--src/lib/elementary/elm_dayselector_item.eo2
-rw-r--r--src/lib/elementary/elm_diskselector.c44
-rw-r--r--src/lib/elementary/elm_diskselector.eo2
-rw-r--r--src/lib/elementary/elm_diskselector_item.eo4
-rw-r--r--src/lib/elementary/elm_entry.c104
-rw-r--r--src/lib/elementary/elm_entry.eo2
-rw-r--r--src/lib/elementary/elm_fileselector.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_button.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo2
-rw-r--r--src/lib/elementary/elm_flip_internal_part.eo4
-rw-r--r--src/lib/elementary/elm_flipselector.c20
-rw-r--r--src/lib/elementary/elm_flipselector.eo2
-rw-r--r--src/lib/elementary/elm_flipselector_item.eo4
-rw-r--r--src/lib/elementary/elm_general.h2
-rw-r--r--src/lib/elementary/elm_gengrid.c104
-rw-r--r--src/lib/elementary/elm_gengrid.eo2
-rw-r--r--src/lib/elementary/elm_gengrid_item.eo2
-rw-r--r--src/lib/elementary/elm_gengrid_pan.eo2
-rw-r--r--src/lib/elementary/elm_genlist.c150
-rw-r--r--src/lib/elementary/elm_genlist.eo2
-rw-r--r--src/lib/elementary/elm_genlist_item.eo2
-rw-r--r--src/lib/elementary/elm_genlist_pan.eo2
-rw-r--r--src/lib/elementary/elm_gesture_layer.c6
-rw-r--r--src/lib/elementary/elm_gesture_layer.eo2
-rw-r--r--src/lib/elementary/elm_glview.c28
-rw-r--r--src/lib/elementary/elm_glview.eo2
-rw-r--r--src/lib/elementary/elm_grid.c6
-rw-r--r--src/lib/elementary/elm_grid.eo2
-rw-r--r--src/lib/elementary/elm_helper.c2
-rw-r--r--src/lib/elementary/elm_helper.h4
-rw-r--r--src/lib/elementary/elm_hover.c20
-rw-r--r--src/lib/elementary/elm_hover.eo2
-rw-r--r--src/lib/elementary/elm_hoversel.eo4
-rw-r--r--src/lib/elementary/elm_hoversel_item.eo4
-rw-r--r--src/lib/elementary/elm_icon.c12
-rw-r--r--src/lib/elementary/elm_icon.eo2
-rw-r--r--src/lib/elementary/elm_index.c32
-rw-r--r--src/lib/elementary/elm_index.eo2
-rw-r--r--src/lib/elementary/elm_index_item.eo4
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c22
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.eo12
-rw-r--r--src/lib/elementary/elm_interface_atspi_component.eo2
-rw-r--r--src/lib/elementary/elm_interface_atspi_image.c10
-rw-r--r--src/lib/elementary/elm_interface_atspi_selection.eo2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c30
-rw-r--r--src/lib/elementary/elm_inwin.c8
-rw-r--r--src/lib/elementary/elm_inwin.eo2
-rw-r--r--src/lib/elementary/elm_label.c8
-rw-r--r--src/lib/elementary/elm_label.eo2
-rw-r--r--src/lib/elementary/elm_layout.c30
-rw-r--r--src/lib/elementary/elm_layout.eo4
-rw-r--r--src/lib/elementary/elm_layout_internal_part.eo4
-rw-r--r--src/lib/elementary/elm_layout_pack.c12
-rw-r--r--src/lib/elementary/elm_list.c48
-rw-r--r--src/lib/elementary/elm_list.eo2
-rw-r--r--src/lib/elementary/elm_list_item.eo2
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_map.c74
-rw-r--r--src/lib/elementary/elm_map.eo2
-rw-r--r--src/lib/elementary/elm_map_pan.eo2
-rw-r--r--src/lib/elementary/elm_mapbuf.c6
-rw-r--r--src/lib/elementary/elm_mapbuf.eo2
-rw-r--r--src/lib/elementary/elm_mapbuf_internal_part.eo4
-rw-r--r--src/lib/elementary/elm_menu.c38
-rw-r--r--src/lib/elementary/elm_menu.eo4
-rw-r--r--src/lib/elementary/elm_menu_item.eo4
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_item.eo4
-rw-r--r--src/lib/elementary/elm_naviframe.eo2
-rw-r--r--src/lib/elementary/elm_naviframe_item.eo4
-rw-r--r--src/lib/elementary/elm_notify.c12
-rw-r--r--src/lib/elementary/elm_notify.eo2
-rw-r--r--src/lib/elementary/elm_notify_internal_part.eo4
-rw-r--r--src/lib/elementary/elm_pan.eo2
-rw-r--r--src/lib/elementary/elm_panel.c14
-rw-r--r--src/lib/elementary/elm_panel.eo2
-rw-r--r--src/lib/elementary/elm_panel_internal_part.eo4
-rw-r--r--src/lib/elementary/elm_panes.c14
-rw-r--r--src/lib/elementary/elm_panes.eo2
-rw-r--r--src/lib/elementary/elm_part_helper.h10
-rw-r--r--src/lib/elementary/elm_photo.c14
-rw-r--r--src/lib/elementary/elm_photo.eo2
-rw-r--r--src/lib/elementary/elm_photocam.c86
-rw-r--r--src/lib/elementary/elm_photocam.eo2
-rw-r--r--src/lib/elementary/elm_photocam_pan.eo2
-rw-r--r--src/lib/elementary/elm_player.eo2
-rw-r--r--src/lib/elementary/elm_plug.c12
-rw-r--r--src/lib/elementary/elm_plug.eo2
-rw-r--r--src/lib/elementary/elm_popup.eo2
-rw-r--r--src/lib/elementary/elm_popup_item.eo4
-rw-r--r--src/lib/elementary/elm_prefs.c18
-rw-r--r--src/lib/elementary/elm_prefs.eo2
-rw-r--r--src/lib/elementary/elm_progressbar.c8
-rw-r--r--src/lib/elementary/elm_progressbar.eo2
-rw-r--r--src/lib/elementary/elm_radio.c8
-rw-r--r--src/lib/elementary/elm_radio.eo2
-rw-r--r--src/lib/elementary/elm_route.c6
-rw-r--r--src/lib/elementary/elm_route.eo2
-rw-r--r--src/lib/elementary/elm_scroller.c46
-rw-r--r--src/lib/elementary/elm_scroller.eo2
-rw-r--r--src/lib/elementary/elm_segment_control.c20
-rw-r--r--src/lib/elementary/elm_segment_control.eo2
-rw-r--r--src/lib/elementary/elm_segment_control_item.eo4
-rw-r--r--src/lib/elementary/elm_separator.c6
-rw-r--r--src/lib/elementary/elm_separator.eo2
-rw-r--r--src/lib/elementary/elm_slider.c26
-rw-r--r--src/lib/elementary/elm_slider.eo2
-rw-r--r--src/lib/elementary/elm_slideshow.c24
-rw-r--r--src/lib/elementary/elm_slideshow.eo2
-rw-r--r--src/lib/elementary/elm_slideshow_item.eo4
-rw-r--r--src/lib/elementary/elm_spinner.c24
-rw-r--r--src/lib/elementary/elm_spinner.eo2
-rw-r--r--src/lib/elementary/elm_store.c12
-rw-r--r--src/lib/elementary/elm_sys_notify.c18
-rw-r--r--src/lib/elementary/elm_sys_notify.eo6
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus.c10
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus.eo6
-rw-r--r--src/lib/elementary/elm_systray.eo4
-rw-r--r--src/lib/elementary/elm_table.c6
-rw-r--r--src/lib/elementary/elm_table.eo2
-rw-r--r--src/lib/elementary/elm_thumb.c24
-rw-r--r--src/lib/elementary/elm_thumb.eo2
-rw-r--r--src/lib/elementary/elm_toolbar.c38
-rw-r--r--src/lib/elementary/elm_toolbar.eo2
-rw-r--r--src/lib/elementary/elm_toolbar_item.eo4
-rw-r--r--src/lib/elementary/elm_view_form.c14
-rw-r--r--src/lib/elementary/elm_view_form.eo6
-rw-r--r--src/lib/elementary/elm_view_list.c28
-rw-r--r--src/lib/elementary/elm_view_list.eo4
-rw-r--r--src/lib/elementary/elm_web.eo2
-rw-r--r--src/lib/elementary/elm_web.h2
-rw-r--r--src/lib/elementary/elm_web2.c10
-rw-r--r--src/lib/elementary/elm_widget.c70
-rw-r--r--src/lib/elementary/elm_widget.eo12
-rw-r--r--src/lib/elementary/elm_widget.h6
-rw-r--r--src/lib/elementary/elm_widget_item.eo6
-rw-r--r--src/lib/emotion/emotion_object.eo2
-rw-r--r--src/lib/emotion/emotion_smart.c50
-rw-r--r--src/lib/eo/eo.c6
-rw-r--r--src/lib/eo/eo_private.h6
-rw-r--r--src/lib/eolian/Eolian.h2
-rw-r--r--src/lib/eolian/eo_lexer.c2
-rw-r--r--src/lib/evas/Evas_Common.h4
-rw-r--r--src/lib/evas/canvas/efl_canvas_filter_internal.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_image_internal.eo8
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo12
-rw-r--r--src/lib/evas/canvas/efl_canvas_polygon.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_rectangle.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_snapshot.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_snapshot.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_tbm.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_tbm.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_wayland.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_wayland.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_x11.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_x11.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_text_cursor.eo6
-rw-r--r--src/lib/evas/canvas/efl_event_hold.c8
-rw-r--r--src/lib/evas/canvas/efl_event_hold.eo4
-rw-r--r--src/lib/evas/canvas/efl_event_key.c24
-rw-r--r--src/lib/evas/canvas/efl_event_key.eo4
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.c24
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.eo6
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.eo2
-rw-r--r--src/lib/evas/canvas/efl_vg.eo8
-rw-r--r--src/lib/evas/canvas/efl_vg_container.eo4
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient_linear.eo4
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient_radial.eo4
-rw-r--r--src/lib/evas/canvas/efl_vg_root_node.eo4
-rw-r--r--src/lib/evas/canvas/efl_vg_shape.eo4
-rw-r--r--src/lib/evas/canvas/evas_box.eo2
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c58
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo12
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c30
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node_callback.h8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.c28
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.eo10
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_primitive.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_primitive.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c14
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.eo4
-rw-r--r--src/lib/evas/canvas/evas_clip.c8
-rw-r--r--src/lib/evas/canvas/evas_data.c8
-rw-r--r--src/lib/evas/canvas/evas_device.c2
-rw-r--r--src/lib/evas/canvas/evas_events.c42
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c16
-rw-r--r--src/lib/evas/canvas/evas_grid.eo2
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c4
-rw-r--r--src/lib/evas/canvas/evas_line.eo2
-rw-r--r--src/lib/evas/canvas/evas_main.c16
-rw-r--r--src/lib/evas/canvas/evas_object_box.c28
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c4
-rw-r--r--src/lib/evas/canvas/evas_object_image.c24
-rw-r--r--src/lib/evas/canvas/evas_object_line.c4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c60
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c8
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c4
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c36
-rw-r--r--src/lib/evas/canvas/evas_object_table.c10
-rw-r--r--src/lib/evas/canvas/evas_object_text.c14
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c88
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c16
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c16
-rw-r--r--src/lib/evas/canvas/evas_out.c16
-rw-r--r--src/lib/evas/canvas/evas_out.eo6
-rw-r--r--src/lib/evas/canvas/evas_render.c8
-rw-r--r--src/lib/evas/canvas/evas_table.eo2
-rw-r--r--src/lib/evas/canvas/evas_text.eo6
-rw-r--r--src/lib/evas/canvas/evas_textgrid.eo6
-rw-r--r--src/lib/evas/canvas/evas_vg.eo8
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c8
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c8
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c8
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c36
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h2
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c12
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c8
-rw-r--r--src/lib/evas/canvas/render2/evas_render2.c6
-rw-r--r--src/lib/evas/canvas/render2/evas_render2_old.c6
-rw-r--r--src/lib/evas/filters/evas_filter.c2
-rw-r--r--src/lib/evas/include/evas_private.h6
474 files changed, 2776 insertions, 2776 deletions
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 6431a64..3a96c1c 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -363,7 +363,7 @@ ecore_shutdown(void)
363 } 363 }
364#endif 364#endif
365 365
366 eo_del(_mainloop_singleton); 366 efl_del(_mainloop_singleton);
367 _mainloop_singleton = NULL; 367 _mainloop_singleton = NULL;
368 368
369 if (_ecore_fps_debug) _ecore_fps_debug_shutdown(); 369 if (_ecore_fps_debug) _ecore_fps_debug_shutdown();
@@ -409,7 +409,7 @@ ecore_shutdown(void)
409 409
410 if (vpath) 410 if (vpath)
411 { 411 {
412 eo_del(vpath); 412 efl_del(vpath);
413 vpath = NULL; 413 vpath = NULL;
414 } 414 }
415 415
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index 28ffa9f..d48219d 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -94,15 +94,15 @@ _ecore_exe_command_get(Eo *obj EINA_UNUSED, Ecore_Exe_Data *pd, const char **cmd
94} 94}
95 95
96EOLIAN static Eo * 96EOLIAN static Eo *
97_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe) 97_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
98{ 98{
99 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 99 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
100 obj = eo_finalize(eo_super(obj, MY_CLASS)); 100 obj = efl_finalize(eo_super(obj, MY_CLASS));
101 101
102 if (!obj) 102 if (!obj)
103 return obj; 103 return obj;
104 104
105 return _impl_ecore_exe_eo_base_finalize(obj, exe); 105 return _impl_ecore_exe_efl_object_finalize(obj, exe);
106} 106}
107 107
108EAPI void 108EAPI void
@@ -210,17 +210,17 @@ ecore_exe_free(Ecore_Exe *obj)
210 return NULL; 210 return NULL;
211 211
212 void *data = exe->data; 212 void *data = exe->data;
213 eo_del(obj); 213 efl_del(obj);
214 214
215 return data; 215 return data;
216} 216}
217 217
218EOLIAN static void 218EOLIAN static void
219_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe) 219_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
220{ 220{
221 eo_destructor(eo_super(obj, ECORE_EXE_CLASS)); 221 efl_destructor(eo_super(obj, ECORE_EXE_CLASS));
222 222
223 _impl_ecore_exe_eo_base_destructor(obj, exe); 223 _impl_ecore_exe_efl_object_destructor(obj, exe);
224} 224}
225 225
226EAPI void 226EAPI void
diff --git a/src/lib/ecore/ecore_exe.eo b/src/lib/ecore/ecore_exe.eo
index cbcac3d..6d7fab1 100644
--- a/src/lib/ecore/ecore_exe.eo
+++ b/src/lib/ecore/ecore_exe.eo
@@ -13,7 +13,7 @@ struct Ecore.Exe.Event_Data.Line
13 */ 13 */
14struct Ecore.Exe.Event_Data 14struct Ecore.Exe.Event_Data
15{ 15{
16 exe: Eo.Base; [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]] 16 exe: Efl.Object; [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]]
17 data: void_ptr; [[the raw binary data from the child process that was received]] 17 data: void_ptr; [[the raw binary data from the child process that was received]]
18 size: int; [[the size of this data in bytes]] 18 size: int; [[the size of this data in bytes]]
19 lines: Ecore.Exe.Event_Data.Line *; [[an array of line data if line buffered, the last one has it's line member set to $NULL]] 19 lines: Ecore.Exe.Event_Data.Line *; [[an array of line data if line buffered, the last one has it's line member set to $NULL]]
@@ -37,7 +37,7 @@ enum Ecore.Exe_Flags
37 term_with_parent = 512 [[Makes child receive SIGTERM when parent dies.]] 37 term_with_parent = 512 [[Makes child receive SIGTERM when parent dies.]]
38} 38}
39 39
40class Ecore.Exe (Eo.Base, Efl.Control) 40class Ecore.Exe (Efl.Object, Efl.Control)
41{ 41{
42 [[Ecore.Exe is responsible for managing portable process spawning. 42 [[Ecore.Exe is responsible for managing portable process spawning.
43 43
@@ -64,8 +64,8 @@ class Ecore.Exe (Eo.Base, Efl.Control)
64 } 64 }
65 } 65 }
66 implements { 66 implements {
67 Eo.Base.destructor; 67 Efl.Object.destructor;
68 Eo.Base.finalize; 68 Efl.Object.finalize;
69 Efl.Control.suspend.set; 69 Efl.Control.suspend.set;
70 } 70 }
71 constructors { 71 constructors {
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index 43a18c9..2babbbf 100644
--- a/src/lib/ecore/ecore_exe_posix.c
+++ b/src/lib/ecore/ecore_exe_posix.c
@@ -228,7 +228,7 @@ _impl_ecore_exe_run_priority_get(void)
228} 228}
229 229
230Eo * 230Eo *
231_impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe) 231_impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
232{ 232{
233 int statusPipe[2] = { -1, -1 }; 233 int statusPipe[2] = { -1, -1 };
234 int errorPipe[2] = { -1, -1 }; 234 int errorPipe[2] = { -1, -1 };
@@ -727,7 +727,7 @@ _impl_ecore_exe_event_data_get(Ecore_Exe *obj,
727} 727}
728 728
729void 729void
730_impl_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe) 730_impl_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
731{ 731{
732 void *data; 732 void *data;
733 int ok = 0; 733 int ok = 0;
@@ -1068,7 +1068,7 @@ _ecore_exe_data_generic_handler(void *data,
1068 Ecore_Exe *obj = data; 1068 Ecore_Exe *obj = data;
1069 int child_fd; 1069 int child_fd;
1070 int event_type; 1070 int event_type;
1071 const Eo_Event_Description *eo_event = NULL; 1071 const Efl_Event_Description *eo_event = NULL;
1072 1072
1073 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 1073 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
1074 1074
@@ -1167,7 +1167,7 @@ _ecore_exe_data_generic_handler(void *data,
1167 ecore_event_add(event_type, e, 1167 ecore_event_add(event_type, e,
1168 _ecore_exe_event_exe_data_free, 1168 _ecore_exe_event_exe_data_free,
1169 NULL); 1169 NULL);
1170 eo_event_callback_call(obj, eo_event, e); 1170 efl_event_callback_call(obj, eo_event, e);
1171 } 1171 }
1172 } 1172 }
1173 } 1173 }
diff --git a/src/lib/ecore/ecore_exe_private.h b/src/lib/ecore/ecore_exe_private.h
index 66c6d4f..53e4442 100644
--- a/src/lib/ecore/ecore_exe_private.h
+++ b/src/lib/ecore/ecore_exe_private.h
@@ -154,11 +154,11 @@ void _ecore_exe_event_add_free(void *data EINA_UNUSED, void *ev);
154void _impl_ecore_exe_run_priority_set(int pri); 154void _impl_ecore_exe_run_priority_set(int pri);
155int _impl_ecore_exe_run_priority_get(void); 155int _impl_ecore_exe_run_priority_get(void);
156void _impl_ecore_exe_auto_limits_set(Ecore_Exe *obj, Ecore_Exe_Data *exe, int start_bytes, int end_bytes, int start_lines, int end_lines); 156void _impl_ecore_exe_auto_limits_set(Ecore_Exe *obj, Ecore_Exe_Data *exe, int start_bytes, int end_bytes, int start_lines, int end_lines);
157Eo *_impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe); 157Eo *_impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe);
158void _impl_ecore_exe_efl_control_suspend_set(Eo *obj EINA_UNUSED, Ecore_Exe_Data *exe, Eina_Bool suspend); 158void _impl_ecore_exe_efl_control_suspend_set(Eo *obj EINA_UNUSED, Ecore_Exe_Data *exe, Eina_Bool suspend);
159Eina_Bool _impl_ecore_exe_send(Ecore_Exe *obj, Ecore_Exe_Data *exe, const void *data, int size); 159Eina_Bool _impl_ecore_exe_send(Ecore_Exe *obj, Ecore_Exe_Data *exe, const void *data, int size);
160Ecore_Exe_Event_Data *_impl_ecore_exe_event_data_get(Ecore_Exe *obj, Ecore_Exe_Data *exe, Ecore_Exe_Flags flags); 160Ecore_Exe_Event_Data *_impl_ecore_exe_event_data_get(Ecore_Exe *obj, Ecore_Exe_Data *exe, Ecore_Exe_Flags flags);
161void _impl_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe); 161void _impl_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe);
162void _impl_ecore_exe_pause(Ecore_Exe *obj, Ecore_Exe_Data *exe); 162void _impl_ecore_exe_pause(Ecore_Exe *obj, Ecore_Exe_Data *exe);
163void _impl_ecore_exe_continue(Ecore_Exe *obj, Ecore_Exe_Data *exe); 163void _impl_ecore_exe_continue(Ecore_Exe *obj, Ecore_Exe_Data *exe);
164void _impl_ecore_exe_interrupt(Ecore_Exe *obj, Ecore_Exe_Data *exe); 164void _impl_ecore_exe_interrupt(Ecore_Exe *obj, Ecore_Exe_Data *exe);
diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c
index bc40414..0316754 100644
--- a/src/lib/ecore/ecore_exe_win32.c
+++ b/src/lib/ecore/ecore_exe_win32.c
@@ -158,7 +158,7 @@ _ecore_exe_pipe_read_thread_cb(void *data)
158 ecore_event_add(ECORE_EXE_EVENT_DATA, event_data, 158 ecore_event_add(ECORE_EXE_EVENT_DATA, event_data,
159 _ecore_exe_event_exe_data_free, 159 _ecore_exe_event_exe_data_free,
160 NULL); 160 NULL);
161 eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data); 161 efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
162 } 162 }
163 163
164 current_buf = NULL; 164 current_buf = NULL;
@@ -228,7 +228,7 @@ _ecore_exe_pipe_error_thread_cb(void *data)
228 ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data, 228 ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data,
229 _ecore_exe_event_exe_data_free, 229 _ecore_exe_event_exe_data_free,
230 NULL); 230 NULL);
231 eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data); 231 efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
232 } 232 }
233 233
234 current_buf = NULL; 234 current_buf = NULL;
@@ -379,7 +379,7 @@ _impl_ecore_exe_run_priority_get(void)
379} 379}
380 380
381Eo * 381Eo *
382_impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe) 382_impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
383{ 383{
384 char exe_cmd_buf[32768]; 384 char exe_cmd_buf[32768];
385 SECURITY_ATTRIBUTES sa; 385 SECURITY_ATTRIBUTES sa;
@@ -689,7 +689,7 @@ _impl_ecore_exe_event_data_get(Ecore_Exe *obj,
689} 689}
690 690
691void 691void
692_impl_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe) 692_impl_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
693{ 693{
694 void *data; 694 void *data;
695 695
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index 3ef93c6..ecc74dc 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -11,7 +11,7 @@
11 11
12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks, 12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks,
13 { EFL_LOOP_EVENT_IDLE_ENTER, _ecore_factorized_idle_process }, 13 { EFL_LOOP_EVENT_IDLE_ENTER, _ecore_factorized_idle_process },
14 { EO_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
16 16
17EAPI Ecore_Idle_Enterer * 17EAPI Ecore_Idle_Enterer *
@@ -30,8 +30,8 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
30 30
31 // This avoid us duplicating code and should only be slightly slower 31 // This avoid us duplicating code and should only be slightly slower
32 // due to a useless cycle of callback registration 32 // due to a useless cycle of callback registration
33 eo_event_callback_array_del(_mainloop_singleton, ecore_idle_enterer_callbacks(), ie); 33 efl_event_callback_array_del(_mainloop_singleton, ecore_idle_enterer_callbacks(), ie);
34 eo_event_callback_array_priority_add(_mainloop_singleton, ecore_idle_enterer_callbacks(), EO_CALLBACK_PRIORITY_BEFORE, ie); 34 efl_event_callback_array_priority_add(_mainloop_singleton, ecore_idle_enterer_callbacks(), EO_CALLBACK_PRIORITY_BEFORE, ie);
35 35
36 return ie; 36 return ie;
37} 37}
@@ -45,5 +45,5 @@ ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
45void 45void
46_ecore_idle_enterer_call(Eo *loop) 46_ecore_idle_enterer_call(Eo *loop)
47{ 47{
48 eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL); 48 efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
49} 49}
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index 3f51c4e..c53a182 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -11,7 +11,7 @@
11 11
12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks, 12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks,
13 { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process }, 13 { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process },
14 { EO_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
16EAPI Ecore_Idle_Exiter * 16EAPI Ecore_Idle_Exiter *
17ecore_idle_exiter_add(Ecore_Task_Cb func, 17ecore_idle_exiter_add(Ecore_Task_Cb func,
@@ -29,5 +29,5 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
29void 29void
30_ecore_idle_exiter_call(Eo *loop) 30_ecore_idle_exiter_call(Eo *loop)
31{ 31{
32 eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL); 32 efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
33} 33}
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 1512af3..3c94e6d 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -14,7 +14,7 @@ struct _Ecore_Factorized_Idle
14 Ecore_Task_Cb func; 14 Ecore_Task_Cb func;
15 void *data; 15 void *data;
16 16
17 const Eo_Callback_Array_Item *desc; 17 const Efl_Callback_Array_Item *desc;
18 18
19 short references; 19 short references;
20 Eina_Bool delete_me : 1; 20 Eina_Bool delete_me : 1;
@@ -55,7 +55,7 @@ _ecore_factorized_idle_del(Ecore_Idler *idler)
55 return idler->data; 55 return idler->data;
56 } 56 }
57 57
58 eo_event_callback_array_del(_mainloop_singleton, idler->desc, idler); 58 efl_event_callback_array_del(_mainloop_singleton, idler->desc, idler);
59 59
60 data = idler->data; 60 data = idler->data;
61 free(idler); 61 free(idler);
@@ -63,7 +63,7 @@ _ecore_factorized_idle_del(Ecore_Idler *idler)
63} 63}
64 64
65Ecore_Factorized_Idle * 65Ecore_Factorized_Idle *
66_ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc, 66_ecore_factorized_idle_add(const Efl_Callback_Array_Item *desc,
67 Ecore_Task_Cb func, 67 Ecore_Task_Cb func,
68 const void *data) 68 const void *data)
69{ 69{
@@ -89,7 +89,7 @@ _ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
89 ret->references = 0; 89 ret->references = 0;
90 ret->delete_me = EINA_FALSE; 90 ret->delete_me = EINA_FALSE;
91 91
92 eo_event_callback_array_add(_mainloop_singleton, desc, ret); 92 efl_event_callback_array_add(_mainloop_singleton, desc, ret);
93 93
94 return ret; 94 return ret;
95} 95}
@@ -98,7 +98,7 @@ _ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
98 98
99EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks, 99EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
100 { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process }, 100 { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process },
101 { EO_EVENT_DEL, _ecore_factorized_idle_event_del }); 101 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
102 102
103EAPI Ecore_Idler * 103EAPI Ecore_Idler *
104ecore_idler_add(Ecore_Task_Cb func, 104ecore_idler_add(Ecore_Task_Cb func,
@@ -116,7 +116,7 @@ ecore_idler_del(Ecore_Idler *idler)
116void 116void
117_ecore_idler_all_call(Eo *loop) 117_ecore_idler_all_call(Eo *loop)
118{ 118{
119 eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL); 119 efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
120} 120}
121 121
122int 122int
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index d16c97a..f0e1878 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2717,7 +2717,7 @@ err :
2717Eo *_mainloop_singleton = NULL; 2717Eo *_mainloop_singleton = NULL;
2718 2718
2719EOLIAN static Efl_Loop * 2719EOLIAN static Efl_Loop *
2720_efl_loop_main_get(Eo_Class *klass EINA_UNUSED, void *_pd EINA_UNUSED) 2720_efl_loop_main_get(Efl_Class *klass EINA_UNUSED, void *_pd EINA_UNUSED)
2721{ 2721{
2722 if (!_mainloop_singleton) 2722 if (!_mainloop_singleton)
2723 { 2723 {
@@ -2758,23 +2758,23 @@ _efl_loop_quit(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED, unsigned char
2758 _ecore_exit_code = exit_code; 2758 _ecore_exit_code = exit_code;
2759} 2759}
2760 2760
2761EOLIAN static Eo_Base * 2761EOLIAN static Efl_Object *
2762_efl_loop_eo_base_provider_find(Eo *obj, Efl_Loop_Data *pd, const Eo_Base *klass) 2762_efl_loop_efl_object_provider_find(Eo *obj, Efl_Loop_Data *pd, const Efl_Object *klass)
2763{ 2763{
2764 Eo_Base *r; 2764 Efl_Object *r;
2765 2765
2766 if (klass == EFL_LOOP_CLASS) return obj; 2766 if (klass == EFL_LOOP_CLASS) return obj;
2767 2767
2768 r = eina_hash_find(pd->providers, &klass); 2768 r = eina_hash_find(pd->providers, &klass);
2769 if (r) return r; 2769 if (r) return r;
2770 2770
2771 return eo_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass); 2771 return efl_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass);
2772} 2772}
2773 2773
2774static void 2774static void
2775_check_event_catcher_add(void *data, const Eo_Event *event) 2775_check_event_catcher_add(void *data, const Eo_Event *event)
2776{ 2776{
2777 const Eo_Callback_Array_Item *array = event->info; 2777 const Efl_Callback_Array_Item *array = event->info;
2778 Efl_Loop_Data *pd = data; 2778 Efl_Loop_Data *pd = data;
2779 int i; 2779 int i;
2780 2780
@@ -2790,7 +2790,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
2790static void 2790static void
2791_check_event_catcher_del(void *data, const Eo_Event *event) 2791_check_event_catcher_del(void *data, const Eo_Event *event)
2792{ 2792{
2793 const Eo_Callback_Array_Item *array = event->info; 2793 const Efl_Callback_Array_Item *array = event->info;
2794 Efl_Loop_Data *pd = data; 2794 Efl_Loop_Data *pd = data;
2795 int i; 2795 int i;
2796 2796
@@ -2804,16 +2804,16 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
2804} 2804}
2805 2805
2806EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, 2806EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
2807 { EO_EVENT_CALLBACK_ADD, _check_event_catcher_add }, 2807 { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add },
2808 { EO_EVENT_CALLBACK_DEL, _check_event_catcher_del }); 2808 { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del });
2809 2809
2810EOLIAN static Eo_Base * 2810EOLIAN static Efl_Object *
2811_efl_loop_eo_base_constructor(Eo *obj, Efl_Loop_Data *pd) 2811_efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
2812{ 2812{
2813 obj = eo_constructor(eo_super(obj, EFL_LOOP_CLASS)); 2813 obj = efl_constructor(eo_super(obj, EFL_LOOP_CLASS));
2814 if (!obj) return NULL; 2814 if (!obj) return NULL;
2815 2815
2816 eo_event_callback_array_add(obj, event_catcher_watch(), pd); 2816 efl_event_callback_array_add(obj, event_catcher_watch(), pd);
2817 2817
2818 pd->providers = eina_hash_pointer_new((void*) eo_unref); 2818 pd->providers = eina_hash_pointer_new((void*) eo_unref);
2819 2819
@@ -2821,9 +2821,9 @@ _efl_loop_eo_base_constructor(Eo *obj, Efl_Loop_Data *pd)
2821} 2821}
2822 2822
2823EOLIAN static void 2823EOLIAN static void
2824_efl_loop_eo_base_destructor(Eo *obj, Efl_Loop_Data *pd) 2824_efl_loop_efl_object_destructor(Eo *obj, Efl_Loop_Data *pd)
2825{ 2825{
2826 eo_destructor(eo_super(obj, EFL_LOOP_CLASS)); 2826 efl_destructor(eo_super(obj, EFL_LOOP_CLASS));
2827 2827
2828 eina_hash_free(pd->providers); 2828 eina_hash_free(pd->providers);
2829} 2829}
@@ -2873,7 +2873,7 @@ _efl_loop_arguments_send(void *data, void *value EINA_UNUSED)
2873 arge.initialization = initialization; 2873 arge.initialization = initialization;
2874 initialization = EINA_FALSE; 2874 initialization = EINA_FALSE;
2875 2875
2876 eo_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge); 2876 efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
2877 2877
2878 _efl_loop_arguments_cleanup(arga); 2878 _efl_loop_arguments_cleanup(arga);
2879} 2879}
@@ -2907,7 +2907,7 @@ static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED);
2907 2907
2908EO_CALLBACKS_ARRAY_DEFINE(timeout, 2908EO_CALLBACKS_ARRAY_DEFINE(timeout,
2909 { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb }, 2909 { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb },
2910 { EO_EVENT_DEL, _efl_loop_timeout_force_cancel_cb }); 2910 { EFL_EVENT_DEL, _efl_loop_timeout_force_cancel_cb });
2911 2911
2912/* This event will be triggered when the main loop is destroyed and destroy its timers along */ 2912/* This event will be triggered when the main loop is destroyed and destroy its timers along */
2913static void _efl_loop_internal_cancel(Efl_Internal_Promise *p); 2913static void _efl_loop_internal_cancel(Efl_Internal_Promise *p);
@@ -2925,8 +2925,8 @@ _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
2925 2925
2926 eina_promise_owner_value_set(t->promise, t->data, NULL); 2926 eina_promise_owner_value_set(t->promise, t->data, NULL);
2927 2927
2928 eo_event_callback_array_del(t->u.timer, timeout(), t); 2928 efl_event_callback_array_del(t->u.timer, timeout(), t);
2929 eo_del(t->u.timer); 2929 efl_del(t->u.timer);
2930} 2930}
2931 2931
2932static void 2932static void
@@ -2947,8 +2947,8 @@ _efl_loop_job_cancel(void* data, Eina_Promise_Owner* promise EINA_UNUSED)
2947 } 2947 }
2948 else 2948 else
2949 { 2949 {
2950 eo_event_callback_array_del(j->u.timer, timeout(), j); 2950 efl_event_callback_array_del(j->u.timer, timeout(), j);
2951 eo_del(j->u.timer); 2951 efl_del(j->u.timer);
2952 } 2952 }
2953 2953
2954 _efl_loop_internal_cancel(j); 2954 _efl_loop_internal_cancel(j);
@@ -3009,7 +3009,7 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time, const voi
3009 t->job_is = EINA_FALSE; 3009 t->job_is = EINA_FALSE;
3010 t->u.timer = eo_add(EFL_LOOP_TIMER_CLASS, obj, 3010 t->u.timer = eo_add(EFL_LOOP_TIMER_CLASS, obj,
3011 efl_loop_timer_interval_set(eo_self, time), 3011 efl_loop_timer_interval_set(eo_self, time),
3012 eo_event_callback_array_add(eo_self, timeout(), t)); 3012 efl_event_callback_array_add(eo_self, timeout(), t));
3013 3013
3014 if (!t->u.timer) goto on_error; 3014 if (!t->u.timer) goto on_error;
3015 3015
@@ -3023,7 +3023,7 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time, const voi
3023} 3023}
3024 3024
3025static Eina_Bool 3025static Eina_Bool
3026_efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Eo_Class *klass, const Eo_Base *provider) 3026_efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Efl_Class *klass, const Efl_Object *provider)
3027{ 3027{
3028 // The passed object does not provide that said class. 3028 // The passed object does not provide that said class.
3029 if (!eo_isa(provider, klass)) return EINA_FALSE; 3029 if (!eo_isa(provider, klass)) return EINA_FALSE;
@@ -3034,7 +3034,7 @@ _efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Eo_Class *klass
3034} 3034}
3035 3035
3036static Eina_Bool 3036static Eina_Bool
3037_efl_loop_unregister(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Eo_Class *klass, const Eo_Base *provider) 3037_efl_loop_unregister(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Efl_Class *klass, const Efl_Object *provider)
3038{ 3038{
3039 return eina_hash_del(pd->providers, &klass, provider); 3039 return eina_hash_del(pd->providers, &klass, provider);
3040} 3040}
diff --git a/src/lib/ecore/ecore_parent.eo b/src/lib/ecore/ecore_parent.eo
index 6ea1a76..239aa64 100644
--- a/src/lib/ecore/ecore_parent.eo
+++ b/src/lib/ecore/ecore_parent.eo
@@ -1,4 +1,4 @@
1class Ecore.Parent (Eo.Base) 1class Ecore.Parent (Efl.Object)
2{ 2{
3 data: null; 3 data: null;
4} 4}
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index 3279979..cc4e4f4 100644
--- a/src/lib/ecore/ecore_poller.c
+++ b/src/lib/ecore/ecore_poller.c
@@ -173,7 +173,7 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED)
173 { 173 {
174 pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller)); 174 pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller));
175 175
176 eo_parent_set(poller->obj, NULL); 176 efl_parent_set(poller->obj, NULL);
177 if (eo_destructed_is(poller->obj)) 177 if (eo_destructed_is(poller->obj))
178 eo_manual_free(poller->obj); 178 eo_manual_free(poller->obj);
179 else 179 else
@@ -351,7 +351,7 @@ ecore_poller_del(Ecore_Poller *obj)
351 data = poller->data; 351 data = poller->data;
352 pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller)); 352 pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
353 353
354 eo_parent_set(poller->obj, NULL); 354 efl_parent_set(poller->obj, NULL);
355 if (eo_destructed_is(poller->obj)) 355 if (eo_destructed_is(poller->obj))
356 eo_manual_free(obj); 356 eo_manual_free(obj);
357 else 357 else
@@ -362,7 +362,7 @@ ecore_poller_del(Ecore_Poller *obj)
362} 362}
363 363
364EOLIAN static void 364EOLIAN static void
365_ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd) 365_ecore_poller_efl_object_destructor(Eo *obj, Ecore_Poller_Data *pd)
366{ 366{
367 if (!pd->delete_me) 367 if (!pd->delete_me)
368 { 368 {
@@ -370,18 +370,18 @@ _ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd)
370 poller_delete_count++; 370 poller_delete_count++;
371 } 371 }
372 372
373 eo_destructor(eo_super(obj, MY_CLASS)); 373 efl_destructor(eo_super(obj, MY_CLASS));
374} 374}
375 375
376EOLIAN static Eo * 376EOLIAN static Eo *
377_ecore_poller_eo_base_finalize(Eo *obj, Ecore_Poller_Data *pd) 377_ecore_poller_efl_object_finalize(Eo *obj, Ecore_Poller_Data *pd)
378{ 378{
379 if (!pd->func) 379 if (!pd->func)
380 { 380 {
381 return NULL; 381 return NULL;
382 } 382 }
383 383
384 return eo_finalize(eo_super(obj, MY_CLASS)); 384 return efl_finalize(eo_super(obj, MY_CLASS));
385} 385}
386 386
387void 387void
@@ -395,7 +395,7 @@ _ecore_poller_shutdown(void)
395 while ((poller = pollers[i])) 395 while ((poller = pollers[i]))
396 { 396 {
397 pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i])); 397 pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i]));
398 eo_parent_set(poller->obj, NULL); 398 efl_parent_set(poller->obj, NULL);
399 if (eo_destructed_is(poller->obj)) 399 if (eo_destructed_is(poller->obj))
400 eo_manual_free(poller->obj); 400 eo_manual_free(poller->obj);
401 else 401 else
diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo
index 804d106..e0e2dec 100644
--- a/src/lib/ecore/ecore_poller.eo
+++ b/src/lib/ecore/ecore_poller.eo
@@ -7,7 +7,7 @@ enum Ecore.Poller_Type
7 core = 0 [[The core poller interval]] 7 core = 0 [[The core poller interval]]
8} 8}
9 9
10class Ecore.Poller (Eo.Base) 10class Ecore.Poller (Efl.Object)
11{ 11{
12 [[Ecore poller provides infrastructure for the creation of pollers. 12 [[Ecore poller provides infrastructure for the creation of pollers.
13 13
@@ -53,8 +53,8 @@ class Ecore.Poller (Eo.Base)
53 } 53 }
54 } 54 }
55 implements { 55 implements {
56 Eo.Base.destructor; 56 Efl.Object.destructor;
57 Eo.Base.finalize; 57 Efl.Object.finalize;
58 } 58 }
59 constructors { 59 constructors {
60 .constructor; 60 .constructor;
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index d6cb900..eaf5a3b 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -163,7 +163,7 @@ int _efl_loop_timers_exists(void);
163 163
164int _efl_loop_timer_expired_call(double when); 164int _efl_loop_timer_expired_call(double when);
165 165
166Ecore_Factorized_Idle *_ecore_factorized_idle_add(const Eo_Callback_Array_Item*desc, 166Ecore_Factorized_Idle *_ecore_factorized_idle_add(const Efl_Callback_Array_Item*desc,
167 Ecore_Task_Cb func, 167 Ecore_Task_Cb func,
168 const void *data); 168 const void *data);
169void *_ecore_factorized_idle_del(Ecore_Idler *idler); 169void *_ecore_factorized_idle_del(Ecore_Idler *idler);
@@ -369,7 +369,7 @@ extern Eo *_mainloop_singleton;
369extern Eo *_ecore_parent; 369extern Eo *_ecore_parent;
370extern Efl_Version _app_efl_version; 370extern Efl_Version _app_efl_version;
371#define ECORE_PARENT_CLASS ecore_parent_class_get() 371#define ECORE_PARENT_CLASS ecore_parent_class_get()
372EAPI const Eo_Class *ecore_parent_class_get(void) EINA_CONST; 372EAPI const Efl_Class *ecore_parent_class_get(void) EINA_CONST;
373 373
374// access to direct input cb 374// access to direct input cb
375#define ECORE_EVAS_INTERNAL 375#define ECORE_EVAS_INTERNAL
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 20f94f8..d9572f0 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -77,7 +77,7 @@ ecore_timer_precision_set(double value)
77static void 77static void
78_check_timer_event_catcher_add(void *data, const Eo_Event *event) 78_check_timer_event_catcher_add(void *data, const Eo_Event *event)
79{ 79{
80 const Eo_Callback_Array_Item *array = event->info; 80 const Efl_Callback_Array_Item *array = event->info;
81 Efl_Loop_Timer_Data *timer = data; 81 Efl_Loop_Timer_Data *timer = data;
82 int i; 82 int i;
83 83
@@ -97,7 +97,7 @@ _check_timer_event_catcher_add(void *data, const Eo_Event *event)
97static void 97static void
98_check_timer_event_catcher_del(void *data, const Eo_Event *event) 98_check_timer_event_catcher_del(void *data, const Eo_Event *event)
99{ 99{
100 const Eo_Callback_Array_Item *array = event->info; 100 const Efl_Callback_Array_Item *array = event->info;
101 Efl_Loop_Timer_Data *timer = data; 101 Efl_Loop_Timer_Data *timer = data;
102 int i; 102 int i;
103 103
@@ -113,17 +113,17 @@ _check_timer_event_catcher_del(void *data, const Eo_Event *event)
113} 113}
114 114
115EO_CALLBACKS_ARRAY_DEFINE(timer_watch, 115EO_CALLBACKS_ARRAY_DEFINE(timer_watch,
116 { EO_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add }, 116 { EFL_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add },
117 { EO_EVENT_CALLBACK_DEL, _check_timer_event_catcher_del }); 117 { EFL_EVENT_CALLBACK_DEL, _check_timer_event_catcher_del });
118 118
119EOLIAN static Eo * 119EOLIAN static Eo *
120_efl_loop_timer_eo_base_constructor(Eo *obj, Efl_Loop_Timer_Data *timer) 120_efl_loop_timer_efl_object_constructor(Eo *obj, Efl_Loop_Timer_Data *timer)
121{ 121{
122 eo_constructor(eo_super(obj, MY_CLASS)); 122 efl_constructor(eo_super(obj, MY_CLASS));
123 123
124 eo_event_callback_array_add(obj, timer_watch(), timer); 124 efl_event_callback_array_add(obj, timer_watch(), timer);
125 125
126 eo_wref_add(obj, &timer->object); 126 efl_wref_add(obj, &timer->object);
127 127
128 timer->at = ecore_time_get(); 128 timer->at = ecore_time_get();
129 timer->initialized = 0; 129 timer->initialized = 0;
@@ -133,11 +133,11 @@ _efl_loop_timer_eo_base_constructor(Eo *obj, Efl_Loop_Timer_Data *timer)
133 133
134 134
135EOLIAN static Eo * 135EOLIAN static Eo *
136_efl_loop_timer_eo_base_finalize(Eo *obj, Efl_Loop_Timer_Data *pd) 136_efl_loop_timer_efl_object_finalize(Eo *obj, Efl_Loop_Timer_Data *pd)
137{ 137{
138 _efl_loop_timer_util_instanciate(pd); 138 _efl_loop_timer_util_instanciate(pd);
139 139
140 return eo_finalize(eo_super(obj, MY_CLASS)); 140 return efl_finalize(eo_super(obj, MY_CLASS));
141} 141}
142 142
143typedef struct _Ecore_Timer_Legacy Ecore_Timer_Legacy; 143typedef struct _Ecore_Timer_Legacy Ecore_Timer_Legacy;
@@ -167,14 +167,14 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
167 legacy->inside_call = 1; 167 legacy->inside_call = 1;
168 if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) || 168 if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) ||
169 legacy->delete_me) 169 legacy->delete_me)
170 eo_del(event->object); 170 efl_del(event->object);
171 else 171 else
172 legacy->inside_call = 0; 172 legacy->inside_call = 0;
173} 173}
174 174
175EO_CALLBACKS_ARRAY_DEFINE(legacy_timer, 175EO_CALLBACKS_ARRAY_DEFINE(legacy_timer,
176 { EFL_LOOP_TIMER_EVENT_TICK, _ecore_timer_legacy_tick }, 176 { EFL_LOOP_TIMER_EVENT_TICK, _ecore_timer_legacy_tick },
177 { EO_EVENT_DEL, _ecore_timer_legacy_del }); 177 { EFL_EVENT_DEL, _ecore_timer_legacy_del });
178 178
179EAPI Ecore_Timer * 179EAPI Ecore_Timer *
180ecore_timer_add(double in, 180ecore_timer_add(double in,
@@ -191,8 +191,8 @@ ecore_timer_add(double in,
191 legacy->func = func; 191 legacy->func = func;
192 legacy->data = data; 192 legacy->data = data;
193 timer = eo_add(MY_CLASS, ecore_main_loop_get(), 193 timer = eo_add(MY_CLASS, ecore_main_loop_get(),
194 eo_event_callback_array_add(eo_self, legacy_timer(), legacy), 194 efl_event_callback_array_add(eo_self, legacy_timer(), legacy),
195 eo_key_data_set(eo_self, "_legacy", legacy), 195 efl_key_data_set(eo_self, "_legacy", legacy),
196 efl_loop_timer_interval_set(eo_self, in)); 196 efl_loop_timer_interval_set(eo_self, in));
197 197
198 return timer; 198 return timer;
@@ -213,8 +213,8 @@ ecore_timer_loop_add(double in,
213 legacy->func = func; 213 legacy->func = func;
214 legacy->data = data; 214 legacy->data = data;
215 timer = eo_add(MY_CLASS, ecore_main_loop_get(), 215 timer = eo_add(MY_CLASS, ecore_main_loop_get(),
216 eo_event_callback_array_add(eo_self, legacy_timer(), legacy), 216 efl_event_callback_array_add(eo_self, legacy_timer(), legacy),
217 eo_key_data_set(eo_self, "_legacy", legacy), 217 efl_key_data_set(eo_self, "_legacy", legacy),
218 efl_loop_timer_loop_reset(eo_self), 218 efl_loop_timer_loop_reset(eo_self),
219 efl_loop_timer_interval_set(eo_self, in)); 219 efl_loop_timer_interval_set(eo_self, in));
220 220
@@ -230,7 +230,7 @@ ecore_timer_del(Ecore_Timer *timer)
230 if (!timer) return NULL; 230 if (!timer) return NULL;
231 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 231 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
232 232
233 legacy = eo_key_data_get(timer, "_legacy"); 233 legacy = efl_key_data_get(timer, "_legacy");
234 // If legacy == NULL, this means double free or something 234 // If legacy == NULL, this means double free or something
235 if (legacy == NULL) 235 if (legacy == NULL)
236 { 236 {
@@ -245,7 +245,7 @@ ecore_timer_del(Ecore_Timer *timer)
245 if (legacy->inside_call) 245 if (legacy->inside_call)
246 legacy->delete_me = EINA_TRUE; 246 legacy->delete_me = EINA_TRUE;
247 else 247 else
248 eo_del(timer); 248 efl_del(timer);
249 249
250 return data; 250 return data;
251} 251}
@@ -346,17 +346,17 @@ ecore_timer_freeze(Ecore_Timer *timer)
346{ 346{
347 EINA_MAIN_LOOP_CHECK_RETURN; 347 EINA_MAIN_LOOP_CHECK_RETURN;
348 ECORE_TIMER_CHECK(timer); 348 ECORE_TIMER_CHECK(timer);
349 eo_event_freeze(timer); 349 efl_event_freeze(timer);
350} 350}
351 351
352EOLIAN static void 352EOLIAN static void
353_efl_loop_timer_eo_base_event_freeze(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer) 353_efl_loop_timer_efl_object_event_freeze(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
354{ 354{
355 double now; 355 double now;
356 356
357 EINA_MAIN_LOOP_CHECK_RETURN; 357 EINA_MAIN_LOOP_CHECK_RETURN;
358 358
359 eo_event_freeze(eo_super(obj, MY_CLASS)); 359 efl_event_freeze(eo_super(obj, MY_CLASS));
360 360
361 /* Timer already frozen */ 361 /* Timer already frozen */
362 if (timer->frozen) 362 if (timer->frozen)
@@ -377,12 +377,12 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
377 int r = 0; 377 int r = 0;
378 378
379 EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE); 379 EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
380 r = eo_event_freeze_count_get(timer); 380 r = efl_event_freeze_count_get(timer);
381 return !!r; 381 return !!r;
382} 382}
383 383
384EOLIAN static int 384EOLIAN static int
385_efl_loop_timer_eo_base_event_freeze_count_get(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer) 385_efl_loop_timer_efl_object_event_freeze_count_get(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
386{ 386{
387 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); 387 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
388 388
@@ -394,17 +394,17 @@ ecore_timer_thaw(Ecore_Timer *timer)
394{ 394{
395 EINA_MAIN_LOOP_CHECK_RETURN; 395 EINA_MAIN_LOOP_CHECK_RETURN;
396 ECORE_TIMER_CHECK(timer); 396 ECORE_TIMER_CHECK(timer);
397 eo_event_thaw(timer); 397 efl_event_thaw(timer);
398} 398}
399 399
400EOLIAN static void 400EOLIAN static void
401_efl_loop_timer_eo_base_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer) 401_efl_loop_timer_efl_object_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer)
402{ 402{
403 double now; 403 double now;
404 404
405 EINA_MAIN_LOOP_CHECK_RETURN; 405 EINA_MAIN_LOOP_CHECK_RETURN;
406 406
407 eo_event_thaw(eo_super(obj, MY_CLASS)); 407 efl_event_thaw(eo_super(obj, MY_CLASS));
408 408
409 /* Timer not frozen */ 409 /* Timer not frozen */
410 if (!timer->frozen) 410 if (!timer->frozen)
@@ -469,7 +469,7 @@ _efl_loop_timer_util_delay(Efl_Loop_Timer_Data *timer,
469} 469}
470 470
471EOLIAN static void 471EOLIAN static void
472_efl_loop_timer_eo_base_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd, Eo_Base *parent) 472_efl_loop_timer_efl_object_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd, Efl_Object *parent)
473{ 473{
474 Eina_Inlist *first; 474 Eina_Inlist *first;
475 475
@@ -479,9 +479,9 @@ _efl_loop_timer_eo_base_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd,
479 else if (first == suspended) 479 else if (first == suspended)
480 suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd)); 480 suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
481 481
482 eo_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent); 482 efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
483 483
484 if (eo_parent_get(obj) != parent) 484 if (efl_parent_get(obj) != parent)
485 return ; 485 return ;
486 486
487 if (parent != NULL) 487 if (parent != NULL)
@@ -496,7 +496,7 @@ _efl_loop_timer_eo_base_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd,
496} 496}
497 497
498EOLIAN static void 498EOLIAN static void
499_efl_loop_timer_eo_base_destructor(Eo *obj, Efl_Loop_Timer_Data *pd) 499_efl_loop_timer_efl_object_destructor(Eo *obj, Efl_Loop_Timer_Data *pd)
500{ 500{
501 Eina_Inlist *first; 501 Eina_Inlist *first;
502 502
@@ -511,7 +511,7 @@ _efl_loop_timer_eo_base_destructor(Eo *obj, Efl_Loop_Timer_Data *pd)
511 else if (first == suspended) 511 else if (first == suspended)
512 suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd)); 512 suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
513 513
514 eo_destructor(eo_super(obj, MY_CLASS)); 514 efl_destructor(eo_super(obj, MY_CLASS));
515} 515}
516 516
517void 517void
@@ -658,7 +658,7 @@ _efl_loop_timer_expired_call(double when)
658 658
659 eo_ref(timer->object); 659 eo_ref(timer->object);
660 eina_evlog("+timer", timer, 0.0, NULL); 660 eina_evlog("+timer", timer, 0.0, NULL);
661 eo_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL); 661 efl_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
662 eina_evlog("-timer", timer, 0.0, NULL); 662 eina_evlog("-timer", timer, 0.0, NULL);
663 663
664 /* may have changed in recursive main loops */ 664 /* may have changed in recursive main loops */
diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index 6b0d503..0ccc746 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -5,7 +5,7 @@ struct Efl.Loop.Arguments {
5 initialization: bool; [[Set to true when the program should initialize its internal state. This happen once per process instance.]] 5 initialization: bool; [[Set to true when the program should initialize its internal state. This happen once per process instance.]]
6} 6}
7 7
8class Efl.Loop (Eo.Base) 8class Efl.Loop (Efl.Object)
9{ 9{
10 [[The Efl Main Loop 10 [[The Efl Main Loop
11 11
@@ -86,16 +86,16 @@ class Efl.Loop (Eo.Base)
86 register { 86 register {
87 [[Will register a manager of a specific class to be answered by eo.provider_find.]] 87 [[Will register a manager of a specific class to be answered by eo.provider_find.]]
88 params { 88 params {
89 @in klass: const(Eo.Class); [[The class provided by the registered provider.]] 89 @in klass: const(Efl.Class); [[The class provided by the registered provider.]]
90 @in provider: const(Eo.Base); [[The provider for the newly registered class that has to provide that said Eo.Class.]] 90 @in provider: const(Efl.Object); [[The provider for the newly registered class that has to provide that said Efl.Class.]]
91 } 91 }
92 return: bool; [[true if successfully register, false otherwise.]] 92 return: bool; [[true if successfully register, false otherwise.]]
93 } 93 }
94 unregister { 94 unregister {
95 [[Will unregister a manager of a specific class that was previously registered and answered by eo.provider_find.]] 95 [[Will unregister a manager of a specific class that was previously registered and answered by eo.provider_find.]]
96 params { 96 params {
97 @in klass: const(Eo.Class); [[The class provided by the provider to unregister for.]] 97 @in klass: const(Efl.Class); [[The class provided by the provider to unregister for.]]
98 @in provider: const(Eo.Base); [[The provider for the registered class to unregister.]] 98 @in provider: const(Efl.Object); [[The provider for the registered class to unregister.]]
99 } 99 }
100 return: bool; [[true if successfully unregistered, false otherwise.]] 100 return: bool; [[true if successfully unregistered, false otherwise.]]
101 } 101 }
@@ -107,8 +107,8 @@ class Efl.Loop (Eo.Base)
107 arguments: Efl.Loop.Arguments; [[Event happens when args are provided to the loop by args_add().]] 107 arguments: Efl.Loop.Arguments; [[Event happens when args are provided to the loop by args_add().]]
108 } 108 }
109 implements { 109 implements {
110 Eo.Base.constructor; 110 Efl.Object.constructor;
111 Eo.Base.destructor; 111 Efl.Object.destructor;
112 Eo.Base.provider_find; 112 Efl.Object.provider_find;
113 } 113 }
114} 114}
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index 5df3ec4..dc7f472 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -31,15 +31,15 @@ _efl_loop_fd_read_cb(void *data, Ecore_Fd_Handler *fd_handler)
31 31
32 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) 32 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
33 { 33 {
34 eo_event_callback_call(obj, EFL_LOOP_FD_EVENT_READ, NULL); 34 efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
35 } 35 }
36 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE)) 36 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
37 { 37 {
38 eo_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL); 38 efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
39 } 39 }
40 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR)) 40 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
41 { 41 {
42 eo_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL); 42 efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
43 } 43 }
44 44
45 return ECORE_CALLBACK_RENEW; 45 return ECORE_CALLBACK_RENEW;
@@ -95,7 +95,7 @@ _efl_loop_fd_fd_file_get(Eo *obj EINA_UNUSED, Efl_Loop_Fd_Data *pd)
95static void 95static void
96_check_fd_event_catcher_add(void *data, const Eo_Event *event) 96_check_fd_event_catcher_add(void *data, const Eo_Event *event)
97{ 97{
98 const Eo_Callback_Array_Item *array = event->info; 98 const Efl_Callback_Array_Item *array = event->info;
99 Efl_Loop_Fd_Data *fd = data; 99 Efl_Loop_Fd_Data *fd = data;
100 int i; 100 int i;
101 101
@@ -122,7 +122,7 @@ _check_fd_event_catcher_add(void *data, const Eo_Event *event)
122static void 122static void
123_check_fd_event_catcher_del(void *data, const Eo_Event *event) 123_check_fd_event_catcher_del(void *data, const Eo_Event *event)
124{ 124{
125 const Eo_Callback_Array_Item *array = event->info; 125 const Efl_Callback_Array_Item *array = event->info;
126 Efl_Loop_Fd_Data *fd = data; 126 Efl_Loop_Fd_Data *fd = data;
127 int i; 127 int i;
128 128
@@ -147,15 +147,15 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event)
147} 147}
148 148
149EO_CALLBACKS_ARRAY_DEFINE(fd_watch, 149EO_CALLBACKS_ARRAY_DEFINE(fd_watch,
150 { EO_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add }, 150 { EFL_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add },
151 { EO_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del }); 151 { EFL_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del });
152 152
153static Eo_Base * 153static Efl_Object *
154_efl_loop_fd_eo_base_constructor(Eo *obj, Efl_Loop_Fd_Data *pd) 154_efl_loop_fd_efl_object_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
155{ 155{
156 eo_constructor(eo_super(obj, MY_CLASS)); 156 efl_constructor(eo_super(obj, MY_CLASS));
157 157
158 eo_event_callback_array_add(obj, fd_watch(), pd); 158 efl_event_callback_array_add(obj, fd_watch(), pd);
159 159
160 pd->fd = -1; 160 pd->fd = -1;
161 161
@@ -163,12 +163,12 @@ _efl_loop_fd_eo_base_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
163} 163}
164 164
165static void 165static void
166_efl_loop_fd_eo_base_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Eo_Base *parent) 166_efl_loop_fd_efl_object_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Efl_Object *parent)
167{ 167{
168 if (pd->handler) ecore_main_fd_handler_del(pd->handler); 168 if (pd->handler) ecore_main_fd_handler_del(pd->handler);
169 pd->handler = NULL; 169 pd->handler = NULL;
170 170
171 eo_parent_set(eo_super(obj, MY_CLASS), parent); 171 efl_parent_set(eo_super(obj, MY_CLASS), parent);
172 172
173 if (parent == NULL) return ; 173 if (parent == NULL) return ;
174 174
@@ -176,9 +176,9 @@ _efl_loop_fd_eo_base_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Eo_Base *parent)
176} 176}
177 177
178static void 178static void
179_efl_loop_fd_eo_base_destructor(Eo *obj, Efl_Loop_Fd_Data *pd) 179_efl_loop_fd_efl_object_destructor(Eo *obj, Efl_Loop_Fd_Data *pd)
180{ 180{
181 eo_destructor(eo_super(obj, MY_CLASS)); 181 efl_destructor(eo_super(obj, MY_CLASS));
182 182
183 ecore_main_fd_handler_del(pd->handler); 183 ecore_main_fd_handler_del(pd->handler);
184} 184}
diff --git a/src/lib/ecore/efl_loop_fd.eo b/src/lib/ecore/efl_loop_fd.eo
index 9284846..4e0853f 100644
--- a/src/lib/ecore/efl_loop_fd.eo
+++ b/src/lib/ecore/efl_loop_fd.eo
@@ -39,8 +39,8 @@ class Efl.Loop.Fd (Efl.Loop_User)
39 error; 39 error;
40 } 40 }
41 implements { 41 implements {
42 Eo.Base.constructor; 42 Efl.Object.constructor;
43 Eo.Base.destructor; 43 Efl.Object.destructor;
44 Eo.Base.parent.set; 44 Efl.Object.parent.set;
45 } 45 }
46} 46}
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index 022e9ee..fbbbe34 100644
--- a/src/lib/ecore/efl_loop_timer.eo
+++ b/src/lib/ecore/efl_loop_timer.eo
@@ -59,11 +59,11 @@ class Efl.Loop.Timer (Efl.Loop_User)
59 tick; [[Event triggered when the specified time as passed.]] 59 tick; [[Event triggered when the specified time as passed.]]
60 } 60 }
61 implements { 61 implements {
62 Eo.Base.constructor; 62 Efl.Object.constructor;
63 Eo.Base.destructor; 63 Efl.Object.destructor;
64 Eo.Base.finalize; 64 Efl.Object.finalize;
65 Eo.Base.event_freeze; 65 Efl.Object.event_freeze;
66 Eo.Base.parent.set; 66 Efl.Object.parent.set;
67 /* XXX: can't document overridden methods 67 /* XXX: can't document overridden methods
68 * Pauses a running timer. 68 * Pauses a running timer.
69 * 69 *
@@ -78,8 +78,8 @@ class Efl.Loop.Timer (Efl.Loop_User)
78 * 78 *
79 * @see ecore_timer_thaw() 79 * @see ecore_timer_thaw()
80 */ 80 */
81 Eo.Base.event_freeze_count.get; 81 Efl.Object.event_freeze_count.get;
82 Eo.Base.event_thaw; 82 Efl.Object.event_thaw;
83 /* XXX: can't document overridden methods 83 /* XXX: can't document overridden methods
84 * Resumes a frozen (paused) timer. 84 * Resumes a frozen (paused) timer.
85 * 85 *
diff --git a/src/lib/ecore/efl_loop_user.c b/src/lib/ecore/efl_loop_user.c
index 6aef76a..3dc8ffa 100644
--- a/src/lib/ecore/efl_loop_user.c
+++ b/src/lib/ecore/efl_loop_user.c
@@ -14,16 +14,16 @@ struct _Efl_Loop_User_Data
14static Efl_Loop * 14static Efl_Loop *
15_efl_loop_user_loop_get(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED) 15_efl_loop_user_loop_get(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED)
16{ 16{
17 return eo_provider_find(obj, EFL_LOOP_CLASS); 17 return efl_provider_find(obj, EFL_LOOP_CLASS);
18} 18}
19 19
20static void 20static void
21_efl_loop_user_eo_base_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED, Eo_Base *parent) 21_efl_loop_user_efl_object_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED, Efl_Object *parent)
22{ 22{
23 if (parent != NULL && eo_provider_find(parent, EFL_LOOP_CLASS) == NULL) 23 if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL)
24 return ; 24 return ;
25 25
26 eo_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent); 26 efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
27} 27}
28 28
29#include "efl_loop_user.eo.c" 29#include "efl_loop_user.eo.c"
diff --git a/src/lib/ecore/efl_loop_user.eo b/src/lib/ecore/efl_loop_user.eo
index 076cff3e..c689f49 100644
--- a/src/lib/ecore/efl_loop_user.eo
+++ b/src/lib/ecore/efl_loop_user.eo
@@ -1,4 +1,4 @@
1class Efl.Loop_User (Eo.Base) 1class Efl.Loop_User (Efl.Object)
2{ 2{
3 [[An Efl.Loop_User is a class that require one of the parent to provide 3 [[An Efl.Loop_User is a class that require one of the parent to provide
4 an Efl.Loop interface when doing provider_find. It will enforce this by 4 an Efl.Loop interface when doing provider_find. It will enforce this by
@@ -9,6 +9,6 @@ class Efl.Loop_User (Eo.Base)
9 } 9 }
10 } 10 }
11 implements { 11 implements {
12 Eo.Base.parent.set; 12 Efl.Object.parent.set;
13 } 13 }
14} \ No newline at end of file 14} \ No newline at end of file
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo
index 7e146de..5d08762 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -1,5 +1,5 @@
1type @extern Ecore.Audio.Vio: __undefined_type; /* FIXME: Had function pointer members. */ 1type @extern Ecore.Audio.Vio: __undefined_type; /* FIXME: Had function pointer members. */
2type @extern eo_key_data_free_func: __undefined_type; /* FIXME: Function pointers not allowed. */ 2type @extern efl_key_data_free_func: __undefined_type; /* FIXME: Function pointers not allowed. */
3 3
4enum Ecore.Audio.Format { 4enum Ecore.Audio.Format {
5 auto, [[Automatically detect the format (for inputs)]] 5 auto, [[Automatically detect the format (for inputs)]]
@@ -11,7 +11,7 @@ enum Ecore.Audio.Format {
11 last [[Sentinel value, do not use]] 11 last [[Sentinel value, do not use]]
12} 12}
13 13
14class Ecore.Audio (Eo.Base) 14class Ecore.Audio (Efl.Object)
15{ 15{
16 [[Convenience audio class.]] 16 [[Convenience audio class.]]
17 17
@@ -112,7 +112,7 @@ class Ecore.Audio (Eo.Base)
112 the function callbacks 112 the function callbacks
113 ]] 113 ]]
114 data: void_ptr; [[user data to pass to the VIO functions]] 114 data: void_ptr; [[user data to pass to the VIO functions]]
115 free_func: eo_key_data_free_func; [[this function takes care to 115 free_func: efl_key_data_free_func; [[this function takes care to
116 clean up $data when he VIO is 116 clean up $data when he VIO is
117 destroyed. NULL means do 117 destroyed. NULL means do
118 nothing. 118 nothing.
@@ -121,6 +121,6 @@ class Ecore.Audio (Eo.Base)
121 } 121 }
122 } 122 }
123 implements { 123 implements {
124 Eo.Base.constructor; 124 Efl.Object.constructor;
125 } 125 }
126} 126}
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo
index 57457c2..4c7b439 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -150,8 +150,8 @@ class Ecore.Audio.In (Ecore.Audio)
150 } 150 }
151 } 151 }
152 implements { 152 implements {
153 Eo.Base.constructor; 153 Efl.Object.constructor;
154 Eo.Base.destructor; 154 Efl.Object.destructor;
155 Ecore.Audio.vio_set; 155 Ecore.Audio.vio_set;
156 } 156 }
157 events { 157 events {
diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
index 6b88780..2675380 100644
--- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
@@ -3,7 +3,7 @@ class Ecore.Audio.In.Sndfile (Ecore.Audio.In)
3 [[Ecore Audio sndfile input.]] 3 [[Ecore Audio sndfile input.]]
4 eo_prefix: ecore_audio_obj_in_sndfile; 4 eo_prefix: ecore_audio_obj_in_sndfile;
5 implements { 5 implements {
6 Eo.Base.destructor; 6 Efl.Object.destructor;
7 Ecore.Audio.source.set; 7 Ecore.Audio.source.set;
8 Ecore.Audio.source.get; 8 Ecore.Audio.source.get;
9 Ecore.Audio.format.set; 9 Ecore.Audio.format.set;
diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo b/src/lib/ecore_audio/ecore_audio_in_tone.eo
index 768b491..fbef1f2 100644
--- a/src/lib/ecore_audio/ecore_audio_in_tone.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo
@@ -3,8 +3,8 @@ class Ecore.Audio.In.Tone (Ecore.Audio.In)
3 [[Ecore Audio tone input.]] 3 [[Ecore Audio tone input.]]
4 eo_prefix: ecore_audio_obj_in_tone; 4 eo_prefix: ecore_audio_obj_in_tone;
5 implements { 5 implements {
6 Eo.Base.constructor; 6 Efl.Object.constructor;
7 Eo.Base.key_data; 7 Efl.Object.key_data;
8 Ecore.Audio.In.length.set; 8 Ecore.Audio.In.length.set;
9 Ecore.Audio.In.seek; 9 Ecore.Audio.In.seek;
10 Ecore.Audio.In.read_internal; 10 Ecore.Audio.In.read_internal;
diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c
index bef68c8..26b34ae 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.c
+++ b/src/lib/ecore_audio/ecore_audio_obj.c
@@ -55,10 +55,10 @@ _ecore_audio_volume_get(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Object *obj)
55} 55}
56 56
57EOLIAN static Eo * 57EOLIAN static Eo *
58_ecore_audio_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Object *obj) 58_ecore_audio_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Object *obj)
59{ 59{
60 obj->volume = 1.0; 60 obj->volume = 1.0;
61 return eo_constructor(eo_super(eo_obj, MY_CLASS)); 61 return efl_constructor(eo_super(eo_obj, MY_CLASS));
62} 62}
63 63
64#include "ecore_audio.eo.c" 64#include "ecore_audio.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index c69bd2f..6f20d43 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -27,7 +27,7 @@ _ecore_audio_in_speed_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, double
27 27
28 obj->speed = speed; 28 obj->speed = speed;
29 29
30 eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); 30 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
31} 31}
32 32
33EOLIAN static double 33EOLIAN static double
@@ -41,7 +41,7 @@ _ecore_audio_in_samplerate_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, i
41{ 41{
42 obj->samplerate = samplerate; 42 obj->samplerate = samplerate;
43 43
44 eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); 44 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
45} 45}
46 46
47EOLIAN static int 47EOLIAN static int
@@ -107,11 +107,11 @@ _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
107 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); 107 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
108 if (len_read == 0) { 108 if (len_read == 0) {
109 if (!obj->looped || !obj->seekable) { 109 if (!obj->looped || !obj->seekable) {
110 eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL); 110 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL);
111 } else { 111 } else {
112 ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET); 112 ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET);
113 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); 113 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
114 eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL); 114 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL);
115 } 115 }
116 } 116 }
117 117
@@ -149,7 +149,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
149} 149}
150 150
151EOLIAN static void 151EOLIAN static void
152_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func) 152_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
153{ 153{
154 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 154 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
155 155
@@ -171,9 +171,9 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au
171} 171}
172 172
173EOLIAN static Eo * 173EOLIAN static Eo *
174_ecore_audio_in_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Input *obj) 174_ecore_audio_in_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
175{ 175{
176 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 176 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
177 177
178 obj->speed = 1.0; 178 obj->speed = 1.0;
179 179
@@ -181,12 +181,12 @@ _ecore_audio_in_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
181} 181}
182 182
183EOLIAN static void 183EOLIAN static void
184_ecore_audio_in_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Input *obj) 184_ecore_audio_in_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Input *obj)
185{ 185{
186 if(obj->output) 186 if(obj->output)
187 ecore_audio_obj_out_input_detach(obj->output, eo_obj); 187 ecore_audio_obj_out_input_detach(obj->output, eo_obj);
188 188
189 eo_destructor(eo_super(eo_obj, MY_CLASS)); 189 efl_destructor(eo_super(eo_obj, MY_CLASS));
190} 190}
191 191
192#include "ecore_audio_in.eo.c" 192#include "ecore_audio_in.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
index 1117a65..887ec8b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -145,7 +145,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
145} 145}
146 146
147EOLIAN static void 147EOLIAN static void
148_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func) 148_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
149{ 149{
150 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 150 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
151 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 151 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
@@ -199,7 +199,7 @@ _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_D
199} 199}
200 200
201EOLIAN static void 201EOLIAN static void
202_ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj) 202_ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj)
203{ 203{
204 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 204 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
205 205
@@ -210,7 +210,7 @@ _ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Da
210 if (ea_obj->vio) 210 if (ea_obj->vio)
211 _free_vio(ea_obj); 211 _free_vio(ea_obj);
212 212
213 eo_destructor(eo_super(eo_obj, MY_CLASS)); 213 efl_destructor(eo_super(eo_obj, MY_CLASS));
214} 214}
215 215
216#include "ecore_audio_in_sndfile.eo.c" 216#include "ecore_audio_in_sndfile.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index bf89c73..a44387b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -83,34 +83,34 @@ _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_D
83} 83}
84 84
85EOLIAN static void 85EOLIAN static void
86_ecore_audio_in_tone_eo_base_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val) 86_ecore_audio_in_tone_efl_object_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val)
87{ 87{
88 if (!key) return; 88 if (!key) return;
89 89
90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
91 obj->freq = *(int *)val; 91 obj->freq = *(int *)val;
92 } else { 92 } else {
93 eo_key_data_set(eo_super(eo_obj, MY_CLASS), key, val); 93 efl_key_data_set(eo_super(eo_obj, MY_CLASS), key, val);
94 } 94 }
95 95
96} 96}
97 97
98EOLIAN static void * 98EOLIAN static void *
99_ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key) 99_ecore_audio_in_tone_efl_object_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
100{ 100{
101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
102 return (void *) (intptr_t) obj->freq; 102 return (void *) (intptr_t) obj->freq;
103 } else { 103 } else {
104 return eo_key_data_get(eo_super(eo_obj, MY_CLASS), key); 104 return efl_key_data_get(eo_super(eo_obj, MY_CLASS), key);
105 } 105 }
106} 106}
107 107
108EOLIAN static Eo * 108EOLIAN static Eo *
109_ecore_audio_in_tone_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj) 109_ecore_audio_in_tone_efl_object_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj)
110{ 110{
111 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 111 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
112 112
113 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 113 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
114 114
115 in_obj->channels = 1; 115 in_obj->channels = 1;
116 in_obj->samplerate = 44100; 116 in_obj->samplerate = 44100;
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
index bf6bee0..c7bb600 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
@@ -37,7 +37,7 @@ extern "C"
37/** 37/**
38 * @brief The frequency of the tone in Hz 38 * @brief The frequency of the tone in Hz
39 * 39 *
40 * Set with @ref eo_key_data_set() 40 * Set with @ref efl_key_data_set()
41 */ 41 */
42#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq" 42#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq"
43 43
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index c34245f..10e26c5 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -113,7 +113,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
113} 113}
114 114
115EOLIAN static void 115EOLIAN static void
116_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func) 116_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
117{ 117{
118 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 118 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
119 119
@@ -130,9 +130,9 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN
130} 130}
131 131
132EOLIAN static Eo * 132EOLIAN static Eo *
133_ecore_audio_out_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Output *obj) 133_ecore_audio_out_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
134{ 134{
135 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 135 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
136 136
137 obj->need_writer = EINA_TRUE; 137 obj->need_writer = EINA_TRUE;
138 138
@@ -140,7 +140,7 @@ _ecore_audio_out_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
140} 140}
141 141
142EOLIAN static void 142EOLIAN static void
143_ecore_audio_out_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Output *obj) 143_ecore_audio_out_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
144{ 144{
145 Eina_List *cur, *tmp; 145 Eina_List *cur, *tmp;
146 Eo *in; 146 Eo *in;
@@ -149,7 +149,7 @@ _ecore_audio_out_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
149 ecore_audio_obj_out_input_detach(eo_obj, in); 149 ecore_audio_obj_out_input_detach(eo_obj, in);
150 } 150 }
151 151
152 eo_destructor(eo_super(eo_obj, MY_CLASS)); 152 efl_destructor(eo_super(eo_obj, MY_CLASS));
153} 153}
154 154
155#include "ecore_audio_out.eo.c" 155#include "ecore_audio_out.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
index e321756..91977b8 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
@@ -293,7 +293,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, void *sd EINA_
293 } 293 }
294 294
295 /* Keep track of data for deallocation */ 295 /* Keep track of data for deallocation */
296 eo_key_data_set(input, "coreaudio_data", helper); 296 efl_key_data_set(input, "coreaudio_data", helper);
297 297
298 /* Start playing */ 298 /* Start playing */
299 helper->is_playing = EINA_TRUE; 299 helper->is_playing = EINA_TRUE;
@@ -325,7 +325,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, void *sd EINA_
325 325
326 DBG("Detach"); 326 DBG("Detach");
327 /* Free helper */ 327 /* Free helper */
328 data = eo_key_data_get(input, "coreaudio_data"); 328 data = efl_key_data_get(input, "coreaudio_data");
329 _core_audio_helper_free(data); 329 _core_audio_helper_free(data);
330 330
331 ret = ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input); 331 ret = ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input);
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index e665df7..c920f95 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -63,7 +63,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
63 ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume); 63 ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume);
64 64
65 EINA_LIST_FOREACH(out_obj->inputs, input, in) { 65 EINA_LIST_FOREACH(out_obj->inputs, input, in) {
66 stream = eo_key_data_get(in, "pulse_data"); 66 stream = efl_key_data_get(in, "pulse_data");
67 idx = EPA_CALL(pa_stream_get_index)(stream); 67 idx = EPA_CALL(pa_stream_get_index)(stream);
68 EPA_CALL(pa_operation_unref)(EPA_CALL(pa_context_set_sink_input_volume)(class_vars.context, idx, &pa_volume, NULL, NULL)); 68 EPA_CALL(pa_operation_unref)(EPA_CALL(pa_context_set_sink_input_volume)(class_vars.context, idx, &pa_volume, NULL, NULL));
69 } 69 }
@@ -98,7 +98,7 @@ static void _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event)
98 samplerate = ecore_audio_obj_in_samplerate_get(event->object); 98 samplerate = ecore_audio_obj_in_samplerate_get(event->object);
99 speed = ecore_audio_obj_in_speed_get(event->object); 99 speed = ecore_audio_obj_in_speed_get(event->object);
100 100
101 stream = eo_key_data_get(event->object, "pulse_data"); 101 stream = efl_key_data_get(event->object, "pulse_data");
102 102
103 EPA_CALL(pa_operation_unref)(EPA_CALL(pa_stream_update_sample_rate)(stream, samplerate * speed, NULL, NULL)); 103 EPA_CALL(pa_operation_unref)(EPA_CALL(pa_stream_update_sample_rate)(stream, samplerate * speed, NULL, NULL));
104} 104}
@@ -132,9 +132,9 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
132 return EINA_FALSE; 132 return EINA_FALSE;
133 } 133 }
134 134
135 eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj); 135 efl_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj);
136 136
137 eo_key_data_set(in, "pulse_data", stream); 137 efl_key_data_set(in, "pulse_data", stream);
138 138
139 139
140 EPA_CALL(pa_stream_set_write_callback)(stream, _write_cb, in); 140 EPA_CALL(pa_stream_set_write_callback)(stream, _write_cb, in);
@@ -149,7 +149,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
149static void _delayed_attach_cb(void *data, const Eo_Event *event) 149static void _delayed_attach_cb(void *data, const Eo_Event *event)
150{ 150{
151 Eo *in = data; 151 Eo *in = data;
152 eo_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); 152 efl_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
153 153
154 _input_attach_internal(event->object, in); 154 _input_attach_internal(event->object, in);
155} 155}
@@ -161,7 +161,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_
161 161
162 if (class_vars.state != PA_CONTEXT_READY) { 162 if (class_vars.state != PA_CONTEXT_READY) {
163 DBG("Delaying input_attach because PA context is not ready."); 163 DBG("Delaying input_attach because PA context is not ready.");
164 eo_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); 164 efl_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
165 } else { 165 } else {
166 retval = _input_attach_internal(eo_obj, in); 166 retval = _input_attach_internal(eo_obj, in);
167 } 167 }
@@ -188,7 +188,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
188 if (!ret2) 188 if (!ret2)
189 return EINA_FALSE; 189 return EINA_FALSE;
190 190
191 stream = eo_key_data_get(in, "pulse_data"); 191 stream = efl_key_data_get(in, "pulse_data");
192 192
193 EPA_CALL(pa_stream_set_write_callback)(stream, NULL, NULL); 193 EPA_CALL(pa_stream_set_write_callback)(stream, NULL, NULL);
194 op = EPA_CALL(pa_stream_drain) (stream, _drain_cb, NULL); 194 op = EPA_CALL(pa_stream_drain) (stream, _drain_cb, NULL);
@@ -220,12 +220,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
220 if (state == PA_CONTEXT_READY) { 220 if (state == PA_CONTEXT_READY) {
221 DBG("PA context ready."); 221 DBG("PA context ready.");
222 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 222 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
223 eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL); 223 efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL);
224 } 224 }
225 } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) { 225 } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) {
226 DBG("PA context fail."); 226 DBG("PA context fail.");
227 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 227 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
228 eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); 228 efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
229 } 229 }
230 } else { 230 } else {
231 DBG("Connection state %i", state); 231 DBG("Connection state %i", state);
@@ -251,7 +251,7 @@ static void _state_job(void *data EINA_UNUSED)
251 } 251 }
252 // the callback here can delete things in the list.. 252 // the callback here can delete things in the list..
253 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 253 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
254 eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); 254 efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
255 } 255 }
256 // now unref everything safely 256 // now unref everything safely
257 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { 257 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
@@ -262,14 +262,14 @@ static void _state_job(void *data EINA_UNUSED)
262} 262}
263 263
264EOLIAN static Eo * 264EOLIAN static Eo *
265_ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED) 265_ecore_audio_out_pulse_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
266{ 266{
267 int argc; 267 int argc;
268 char **argv; 268 char **argv;
269 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 269 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
270 270
271 if (!EPA_LOAD()) return NULL; 271 if (!EPA_LOAD()) return NULL;
272 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 272 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
273 273
274 out_obj->need_writer = EINA_FALSE; 274 out_obj->need_writer = EINA_FALSE;
275 275
@@ -293,10 +293,10 @@ _ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Dat
293} 293}
294 294
295EOLIAN static void 295EOLIAN static void
296_ecore_audio_out_pulse_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED) 296_ecore_audio_out_pulse_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
297{ 297{
298 class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj); 298 class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj);
299 eo_destructor(eo_super(eo_obj, MY_CLASS)); 299 efl_destructor(eo_super(eo_obj, MY_CLASS));
300} 300}
301 301
302#include "ecore_audio_out_pulse.eo.c" 302#include "ecore_audio_out_pulse.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
index 6143b4b..fddc898 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -162,11 +162,11 @@ _ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndf
162} 162}
163 163
164EOLIAN static Eo * 164EOLIAN static Eo *
165_ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 165_ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
166{ 166{
167 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 167 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
168 168
169 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 169 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
170 170
171 ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG); 171 ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG);
172 172
@@ -176,7 +176,7 @@ _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile
176} 176}
177 177
178EOLIAN static void 178EOLIAN static void
179_ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj) 179_ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj)
180{ 180{
181 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 181 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
182 182
@@ -186,7 +186,7 @@ _ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_
186 if (out_obj->write_idler) 186 if (out_obj->write_idler)
187 ecore_idler_del(out_obj->write_idler); 187 ecore_idler_del(out_obj->write_idler);
188 188
189 eo_destructor(eo_super(eo_obj, MY_CLASS)); 189 efl_destructor(eo_super(eo_obj, MY_CLASS));
190} 190}
191 191
192#include "ecore_audio_out_sndfile.eo.c" 192#include "ecore_audio_out_sndfile.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo
index f2f1d7c..4192e73 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -34,8 +34,8 @@ class Ecore.Audio.Out (Ecore.Audio)
34 } 34 }
35 } 35 }
36 implements { 36 implements {
37 Eo.Base.constructor; 37 Efl.Object.constructor;
38 Eo.Base.destructor; 38 Efl.Object.destructor;
39 Ecore.Audio.vio_set; 39 Ecore.Audio.vio_set;
40 } 40 }
41} 41}
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
index 770aa74..b107eef 100644
--- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -4,8 +4,8 @@ class Ecore.Audio.Out.Pulse (Ecore.Audio.Out)
4 eo_prefix: ecore_audio_obj_out_pulse; 4 eo_prefix: ecore_audio_obj_out_pulse;
5 event_prefix: ecore_audio_out_pulse; 5 event_prefix: ecore_audio_out_pulse;
6 implements { 6 implements {
7 Eo.Base.constructor; 7 Efl.Object.constructor;
8 Eo.Base.destructor; 8 Efl.Object.destructor;
9 Ecore.Audio.volume.set; 9 Ecore.Audio.volume.set;
10 Ecore.Audio.Out.input_attach; 10 Ecore.Audio.Out.input_attach;
11 Ecore.Audio.Out.input_detach; 11 Ecore.Audio.Out.input_detach;
diff --git a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
index d807f65..510f644 100644
--- a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
@@ -3,8 +3,8 @@ class Ecore.Audio.Out.Sndfile (Ecore.Audio.Out)
3 [[Ecore audio output to the sndfile library.]] 3 [[Ecore audio output to the sndfile library.]]
4 eo_prefix: ecore_audio_obj_out_sndfile; 4 eo_prefix: ecore_audio_obj_out_sndfile;
5 implements { 5 implements {
6 Eo.Base.constructor; 6 Efl.Object.constructor;
7 Eo.Base.destructor; 7 Efl.Object.destructor;
8 Ecore.Audio.source.get; 8 Ecore.Audio.source.get;
9 Ecore.Audio.source.set; 9 Ecore.Audio.source.set;
10 Ecore.Audio.format.get; 10 Ecore.Audio.format.get;
diff --git a/src/lib/ecore_audio/ecore_audio_private.h b/src/lib/ecore_audio/ecore_audio_private.h
index 6cf19a7..0bccb0e 100644
--- a/src/lib/ecore_audio/ecore_audio_private.h
+++ b/src/lib/ecore_audio/ecore_audio_private.h
@@ -94,7 +94,7 @@ struct _Ecore_Audio_Module
94struct _Ecore_Audio_Vio_Internal { 94struct _Ecore_Audio_Vio_Internal {
95 Ecore_Audio_Vio *vio; 95 Ecore_Audio_Vio *vio;
96 void *data; 96 void *data;
97 eo_key_data_free_func free_func; 97 efl_key_data_free_func free_func;
98}; 98};
99typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal; 99typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal;
100 100
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 29fe731..b1b87bf 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -108,7 +108,7 @@ static void _ecore_con_lookup_done(void *data,
108static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr); 108static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
109 109
110#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \ 110#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
111 if (eo_finalized_get(obj)) \ 111 if (efl_finalized_get(obj)) \
112 { \ 112 { \
113 ERR("This function is only allowed during construction."); \ 113 ERR("This function is only allowed during construction."); \
114 return; \ 114 return; \
@@ -332,7 +332,7 @@ _efl_network_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *n
332 return EINA_TRUE; 332 return EINA_TRUE;
333 333
334 free(lk); 334 free(lk);
335 eo_del(obj); 335 efl_del(obj);
336 return EINA_FALSE; 336 return EINA_FALSE;
337} 337}
338 338
@@ -367,9 +367,9 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
367} 367}
368 368
369EOLIAN static Eo * 369EOLIAN static Eo *
370_efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr) 370_efl_network_server_efl_object_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
371{ 371{
372 obj = eo_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); 372 obj = efl_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
373 373
374 svr->fd = -1; 374 svr->fd = -1;
375 svr->reject_excess_clients = EINA_FALSE; 375 svr->reject_excess_clients = EINA_FALSE;
@@ -380,12 +380,12 @@ _efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Serve
380} 380}
381 381
382EOLIAN static Eo * 382EOLIAN static Eo *
383_efl_network_server_eo_base_finalize(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr) 383_efl_network_server_efl_object_finalize(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
384{ 384{
385 Ecore_Con_Type compl_type = svr->type; 385 Ecore_Con_Type compl_type = svr->type;
386 Ecore_Con_Type type; 386 Ecore_Con_Type type;
387 387
388 eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); 388 efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
389 389
390 svr->created = EINA_TRUE; 390 svr->created = EINA_TRUE;
391 svr->ppid = getpid(); 391 svr->ppid = getpid();
@@ -463,7 +463,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
463} 463}
464 464
465EOLIAN static Eo * 465EOLIAN static Eo *
466_efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED) 466_efl_network_connector_efl_object_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED)
467{ 467{
468 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 468 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
469 Ecore_Con_Type compl_type = svr->type; 469 Ecore_Con_Type compl_type = svr->type;
@@ -471,7 +471,7 @@ _efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNU
471 471
472 /* XXX: We intentionally put SERVER class here and not connector, as we'd 472 /* XXX: We intentionally put SERVER class here and not connector, as we'd
473 * like to skip that one. */ 473 * like to skip that one. */
474 eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); 474 efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
475 475
476 svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT; 476 svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT;
477 svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY; 477 svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY;
@@ -1053,7 +1053,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
1053 if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE; 1053 if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
1054 ecore_event_add(ev, e, 1054 ecore_event_add(ev, e,
1055 _ecore_con_event_server_add_free, NULL); 1055 _ecore_con_event_server_add_free, NULL);
1056 eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); 1056 efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
1057 _ecore_con_event_count++; 1057 _ecore_con_event_count++;
1058} 1058}
1059 1059
@@ -1132,7 +1132,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
1132 Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; 1132 Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
1133 event_info.data = e->data; 1133 event_info.data = e->data;
1134 event_info.size = e->size; 1134 event_info.size = e->size;
1135 eo_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); 1135 efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
1136 } 1136 }
1137 _ecore_con_event_count++; 1137 _ecore_con_event_count++;
1138} 1138}
@@ -1157,7 +1157,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
1157 if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE; 1157 if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
1158 ecore_event_add(ev, e, 1158 ecore_event_add(ev, e,
1159 (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server); 1159 (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
1160 eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); 1160 efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
1161 _ecore_con_event_count++; 1161 _ecore_con_event_count++;
1162} 1162}
1163 1163
@@ -1239,7 +1239,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
1239 Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; 1239 Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
1240 event_info.data = e->data; 1240 event_info.data = e->data;
1241 event_info.size = e->size; 1241 event_info.size = e->size;
1242 eo_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); 1242 efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
1243 } 1243 }
1244 _ecore_con_event_count++; 1244 _ecore_con_event_count++;
1245} 1245}
@@ -1265,7 +1265,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
1265 DBG("%s", error); 1265 DBG("%s", error);
1266 svr->event_count = eina_list_append(svr->event_count, e); 1266 svr->event_count = eina_list_append(svr->event_count, e);
1267 ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL); 1267 ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
1268 eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); 1268 efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
1269 _ecore_con_event_count++; 1269 _ecore_con_event_count++;
1270} 1270}
1271 1271
@@ -1286,18 +1286,18 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
1286 cl->event_count = eina_list_append(cl->event_count, e); 1286 cl->event_count = eina_list_append(cl->event_count, e);
1287 host_server->event_count = eina_list_append(host_server->event_count, e); 1287 host_server->event_count = eina_list_append(host_server->event_count, e);
1288 ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server); 1288 ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
1289 eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); 1289 efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
1290 _ecore_con_event_count++; 1290 _ecore_con_event_count++;
1291} 1291}
1292 1292
1293static void 1293static void
1294_ecore_con_server_free(Ecore_Con_Server *obj) 1294_ecore_con_server_free(Ecore_Con_Server *obj)
1295{ 1295{
1296 eo_del(obj); 1296 efl_del(obj);
1297} 1297}
1298 1298
1299EOLIAN static void 1299EOLIAN static void
1300_efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr) 1300_efl_network_server_efl_object_destructor(Eo *obj, Efl_Network_Server_Data *svr)
1301{ 1301{
1302 Ecore_Con_Client *cl_obj; 1302 Ecore_Con_Client *cl_obj;
1303 double t_start, t; 1303 double t_start, t;
@@ -1373,7 +1373,7 @@ _efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr)
1373 servers = eina_list_remove(servers, obj); 1373 servers = eina_list_remove(servers, obj);
1374 svr->data = NULL; 1374 svr->data = NULL;
1375 1375
1376 eo_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); 1376 efl_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
1377end: 1377end:
1378 return; 1378 return;
1379} 1379}
@@ -1381,11 +1381,11 @@ end:
1381static void 1381static void
1382_ecore_con_client_free(Ecore_Con_Client *obj) 1382_ecore_con_client_free(Ecore_Con_Client *obj)
1383{ 1383{
1384 eo_del(obj); 1384 efl_del(obj);
1385} 1385}
1386 1386
1387EOLIAN static void 1387EOLIAN static void
1388_efl_network_client_eo_base_destructor(Eo *obj, Efl_Network_Client_Data *cl) 1388_efl_network_client_efl_object_destructor(Eo *obj, Efl_Network_Client_Data *cl)
1389{ 1389{
1390 double t_start, t; 1390 double t_start, t;
1391 1391
@@ -1439,7 +1439,7 @@ _efl_network_client_eo_base_destructor(Eo *obj, Efl_Network_Client_Data *cl)
1439 eina_stringshare_del(cl->ip); 1439 eina_stringshare_del(cl->ip);
1440 cl->data = NULL; 1440 cl->data = NULL;
1441 1441
1442 eo_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS)); 1442 efl_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS));
1443} 1443}
1444 1444
1445static Eina_Bool 1445static Eina_Bool
@@ -2130,7 +2130,7 @@ error:
2130 ecore_event_del(ev); 2130 ecore_event_del(ev);
2131 } 2131 }
2132 } 2132 }
2133 eo_del(obj); 2133 efl_del(obj);
2134 if (clerr || errno) ecore_con_event_server_error(svr_obj, clerr ? : strerror(errno)); 2134 if (clerr || errno) ecore_con_event_server_error(svr_obj, clerr ? : strerror(errno));
2135 return ECORE_CALLBACK_RENEW; 2135 return ECORE_CALLBACK_RENEW;
2136} 2136}
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index 4812d57..e1fec9b 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -577,10 +577,10 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c
577 EET_DATA_DESCRIPTOR_ADD_MAPPING(pd->matching, name, edd); 577 EET_DATA_DESCRIPTOR_ADD_MAPPING(pd->matching, name, edd);
578} 578}
579 579
580EOLIAN static Eo_Base * 580EOLIAN static Efl_Object *
581_ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED) 581_ecore_con_eet_server_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
582{ 582{
583 obj = eo_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS)); 583 obj = efl_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
584 584
585 if (!obj) return NULL; 585 if (!obj) return NULL;
586 586
@@ -595,7 +595,7 @@ _ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_
595} 595}
596 596
597EOLIAN static void 597EOLIAN static void
598_ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED) 598_ecore_con_eet_server_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
599{ 599{
600 Ecore_Con_Reply *n; 600 Ecore_Con_Reply *n;
601 Ecore_Con_Eet_Client *c; 601 Ecore_Con_Eet_Client *c;
@@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_D
615 ecore_event_handler_del(pd->handler_del); 615 ecore_event_handler_del(pd->handler_del);
616 ecore_event_handler_del(pd->handler_data); 616 ecore_event_handler_del(pd->handler_data);
617 617
618 eo_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS)); 618 efl_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
619} 619}
620 620
621EOLIAN static Eo_Base * 621EOLIAN static Efl_Object *
622_ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED) 622_ecore_con_eet_client_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
623{ 623{
624 obj = eo_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS)); 624 obj = efl_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
625 625
626 if (!obj) return NULL; 626 if (!obj) return NULL;
627 627
@@ -636,7 +636,7 @@ _ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_
636} 636}
637 637
638EOLIAN static void 638EOLIAN static void
639_ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED) 639_ecore_con_eet_client_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
640{ 640{
641 Ecore_Con_Eet_Server *s; 641 Ecore_Con_Eet_Server *s;
642 642
@@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_D
654 ecore_event_handler_del(pd->handler_del); 654 ecore_event_handler_del(pd->handler_del);
655 ecore_event_handler_del(pd->handler_data); 655 ecore_event_handler_del(pd->handler_data);
656 656
657 eo_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS)); 657 efl_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
658} 658}
659 659
660EOLIAN static Eo_Base * 660EOLIAN static Efl_Object *
661_ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd) 661_ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
662{ 662{
663 obj = eo_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS)); 663 obj = efl_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
664 664
665 if (!obj) return NULL; 665 if (!obj) return NULL;
666 666
@@ -673,9 +673,9 @@ _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
673} 673}
674 674
675EOLIAN static void 675EOLIAN static void
676_ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd) 676_ecore_con_eet_base_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
677{ 677{
678 eo_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS)); 678 efl_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
679 679
680 eet_data_descriptor_free(pd->edd); 680 eet_data_descriptor_free(pd->edd);
681 eet_data_descriptor_free(pd->matching); 681 eet_data_descriptor_free(pd->matching);
@@ -683,8 +683,8 @@ _ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
683 eina_hash_free(pd->raw_data_callbacks); 683 eina_hash_free(pd->raw_data_callbacks);
684} 684}
685 685
686EOLIAN static Eo_Base * 686EOLIAN static Efl_Object *
687_ecore_con_eet_base_eo_base_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd) 687_ecore_con_eet_base_efl_object_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
688{ 688{
689 if (pd->server) return obj; 689 if (pd->server) return obj;
690 690
@@ -742,7 +742,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
742EAPI void 742EAPI void
743ecore_con_eet_server_free(Ecore_Con_Eet *r) 743ecore_con_eet_server_free(Ecore_Con_Eet *r)
744{ 744{
745 eo_del(r); 745 efl_del(r);
746} 746}
747 747
748EAPI void 748EAPI void
@@ -918,13 +918,13 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
918EAPI void 918EAPI void
919ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data) 919ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data)
920{ 920{
921 eo_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data); 921 efl_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data);
922} 922}
923 923
924EAPI const void * 924EAPI const void *
925ecore_con_eet_data_get(Ecore_Con_Eet *ece) 925ecore_con_eet_data_get(Ecore_Con_Eet *ece)
926{ 926{
927 return eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY); 927 return efl_key_data_get(ece, ECORE_CON_EET_DATA_KEY);
928} 928}
929 929
930EAPI Ecore_Con_Eet * 930EAPI Ecore_Con_Eet *
diff --git a/src/lib/ecore_con/ecore_con_eet_base.eo b/src/lib/ecore_con/ecore_con_eet_base.eo
index 4e55273..250a785 100644
--- a/src/lib/ecore_con/ecore_con_eet_base.eo
+++ b/src/lib/ecore_con/ecore_con_eet_base.eo
@@ -6,7 +6,7 @@ type @extern Ecore_Con_Eet_Raw_Data_Cb: __undefined_type; /* FIXME: function poi
6struct @extern Eet.Data.Descriptor; 6struct @extern Eet.Data.Descriptor;
7struct Ecore.Con.Reply; 7struct Ecore.Con.Reply;
8 8
9class Ecore.Con.Eet.Base (Eo.Base) { 9class Ecore.Con.Eet.Base (Efl.Object) {
10 [[Ecore Connection Eet Base class. 10 [[Ecore Connection Eet Base class.
11 11
12 This class provides Eet data serialization features to Ecore Connection objects.]] 12 This class provides Eet data serialization features to Ecore Connection objects.]]
@@ -90,8 +90,8 @@ class Ecore.Con.Eet.Base (Eo.Base) {
90 } 90 }
91 } 91 }
92 implements { 92 implements {
93 Eo.Base.constructor; 93 Efl.Object.constructor;
94 Eo.Base.destructor; 94 Efl.Object.destructor;
95 Eo.Base.finalize; 95 Efl.Object.finalize;
96 } 96 }
97} 97}
diff --git a/src/lib/ecore_con/ecore_con_eet_client_obj.eo b/src/lib/ecore_con/ecore_con_eet_client_obj.eo
index 8516736..a9eb6bb 100644
--- a/src/lib/ecore_con/ecore_con_eet_client_obj.eo
+++ b/src/lib/ecore_con/ecore_con_eet_client_obj.eo
@@ -3,8 +3,8 @@ class Ecore.Con.Eet.Client.Obj (Ecore.Con.Eet.Base) {
3 3
4 eo_prefix: ecore_con_eet_client_obj; 4 eo_prefix: ecore_con_eet_client_obj;
5 implements { 5 implements {
6 Eo.Base.constructor; 6 Efl.Object.constructor;
7 Eo.Base.destructor; 7 Efl.Object.destructor;
8 } 8 }
9} 9}
10 10
diff --git a/src/lib/ecore_con/ecore_con_eet_server_obj.eo b/src/lib/ecore_con/ecore_con_eet_server_obj.eo
index 175f0ba..d561833 100644
--- a/src/lib/ecore_con/ecore_con_eet_server_obj.eo
+++ b/src/lib/ecore_con/ecore_con_eet_server_obj.eo
@@ -3,8 +3,8 @@ class Ecore.Con.Eet.Server.Obj (Ecore.Con.Eet.Base) {
3 3
4 eo_prefix: ecore_con_eet_server_obj; 4 eo_prefix: ecore_con_eet_server_obj;
5 implements { 5 implements {
6 Eo.Base.constructor; 6 Efl.Object.constructor;
7 Eo.Base.destructor; 7 Efl.Object.destructor;
8 } 8 }
9} 9}
10 10
diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 1a1e145..4a5dbad 100644
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -356,7 +356,7 @@ del_handler_read:
356close_event_read: 356close_event_read:
357 CloseHandle(svr->event_read); 357 CloseHandle(svr->event_read);
358free_cl: 358free_cl:
359 eo_del(cl_obj); 359 efl_del(cl_obj);
360 360
361 return ECORE_CALLBACK_CANCEL; 361 return ECORE_CALLBACK_CANCEL;
362} 362}
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index df01406..8e3b64f 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -169,7 +169,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event
169 e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete)); 169 e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete));
170 if (!e) 170 if (!e)
171 { 171 {
172 eo_event_callback_stop(event->object); 172 efl_event_callback_stop(event->object);
173 return; 173 return;
174 } 174 }
175 175
@@ -178,7 +178,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event
178 ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e, 178 ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e,
179 (Ecore_End_Cb)_ecore_con_event_url_free, event->object); 179 (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
180 180
181 eo_event_callback_stop(event->object); 181 efl_event_callback_stop(event->object);
182} 182}
183 183
184static void 184static void
@@ -227,15 +227,15 @@ ecore_con_url_new(const char *url)
227 Ecore_Con_Url *url_obj; 227 Ecore_Con_Url *url_obj;
228 url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(eo_self, url)); 228 url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(eo_self, url));
229 229
230 eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL); 230 efl_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
231 231
232 return url_obj; 232 return url_obj;
233} 233}
234 234
235EOLIAN static Eo * 235EOLIAN static Eo *
236_efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED) 236_efl_network_url_efl_object_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
237{ 237{
238 url_obj = eo_constructor(eo_super(url_obj, MY_CLASS)); 238 url_obj = efl_constructor(eo_super(url_obj, MY_CLASS));
239 239
240 if (!_init_count || !_c_init()) 240 if (!_init_count || !_c_init())
241 { 241 {
@@ -257,7 +257,7 @@ _efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_D
257} 257}
258 258
259EOLIAN static Eo * 259EOLIAN static Eo *
260_efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con) 260_efl_network_url_efl_object_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
261{ 261{
262 CURLcode ret; 262 CURLcode ret;
263 263
@@ -335,7 +335,7 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data
335 */ 335 */
336 _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30); 336 _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
337 _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1); 337 _c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1);
338 return eo_finalize(eo_super(url_obj, MY_CLASS)); 338 return efl_finalize(eo_super(url_obj, MY_CLASS));
339} 339}
340 340
341EAPI Ecore_Con_Url * 341EAPI Ecore_Con_Url *
@@ -372,9 +372,9 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
372 if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS)) 372 if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
373 return; 373 return;
374 374
375 eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL); 375 efl_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL);
376 376
377 eo_del(url_obj); 377 efl_del(url_obj);
378} 378}
379 379
380static void 380static void
@@ -393,9 +393,9 @@ _ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
393} 393}
394 394
395EOLIAN static void 395EOLIAN static void
396_efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con) 396_efl_network_url_efl_object_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
397{ 397{
398 eo_destructor(eo_super(url_obj, MY_CLASS)); 398 efl_destructor(eo_super(url_obj, MY_CLASS));
399 399
400 if (!_c) return; 400 if (!_c) return;
401 if (url_con->curl_easy) 401 if (url_con->curl_easy)
@@ -1140,7 +1140,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
1140 e.status = status; 1140 e.status = status;
1141 e.url_con = url_obj; 1141 e.url_con = url_obj;
1142 url_con->event_count++; 1142 url_con->event_count++;
1143 eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e); 1143 efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
1144} 1144}
1145 1145
1146static void 1146static void
@@ -1201,7 +1201,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
1201 e.size = real_size; 1201 e.size = real_size;
1202 e.data = buffer; 1202 e.data = buffer;
1203 url_con->event_count++; 1203 url_con->event_count++;
1204 eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e); 1204 efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
1205 } 1205 }
1206 else 1206 else
1207 { 1207 {
@@ -1260,7 +1260,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
1260 e.up.total = ultotal; 1260 e.up.total = ultotal;
1261 e.up.now = ulnow; 1261 e.up.now = ulnow;
1262 url_con->event_count++; 1262 url_con->event_count++;
1263 eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e); 1263 efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
1264 1264
1265 return 0; 1265 return 0;
1266} 1266}
diff --git a/src/lib/ecore_con/efl_network.eo b/src/lib/ecore_con/efl_network.eo
index 64f88cf..3664b6f 100644
--- a/src/lib/ecore_con/efl_network.eo
+++ b/src/lib/ecore_con/efl_network.eo
@@ -29,7 +29,7 @@ enum Ecore.Con.Type
29 socket_activate = (1 << 9) 29 socket_activate = (1 << 9)
30} 30}
31 31
32abstract Efl.Network (Eo.Base) { 32abstract Efl.Network (Efl.Object) {
33 [[Abstract base class for all EFL.Network classes]] 33 [[Abstract base class for all EFL.Network classes]]
34 34
35 legacy_prefix: ecore_con; 35 legacy_prefix: ecore_con;
diff --git a/src/lib/ecore_con/efl_network_client.eo b/src/lib/ecore_con/efl_network_client.eo
index cbe37c5..bf3f6c2 100644
--- a/src/lib/ecore_con/efl_network_client.eo
+++ b/src/lib/ecore_con/efl_network_client.eo
@@ -13,7 +13,7 @@ class Efl.Network.Client (Efl.Network) {
13 } 13 }
14 } 14 }
15 implements { 15 implements {
16 Eo.Base.destructor; 16 Efl.Object.destructor;
17 Efl.Network.ip.get; 17 Efl.Network.ip.get;
18 Efl.Network.uptime.get; 18 Efl.Network.uptime.get;
19 Efl.Network.port.get; 19 Efl.Network.port.get;
diff --git a/src/lib/ecore_con/efl_network_connector.eo b/src/lib/ecore_con/efl_network_connector.eo
index 1d74547..5b3e27e 100644
--- a/src/lib/ecore_con/efl_network_connector.eo
+++ b/src/lib/ecore_con/efl_network_connector.eo
@@ -3,6 +3,6 @@ class Efl.Network.Connector (Efl.Network.Server) {
3 eo_prefix: efl_network_connector_obj; 3 eo_prefix: efl_network_connector_obj;
4 data: null; 4 data: null;
5 implements { 5 implements {
6 Eo.Base.finalize; 6 Efl.Object.finalize;
7 } 7 }
8} 8}
diff --git a/src/lib/ecore_con/efl_network_server.eo b/src/lib/ecore_con/efl_network_server.eo
index f079e9c..972e262 100644
--- a/src/lib/ecore_con/efl_network_server.eo
+++ b/src/lib/ecore_con/efl_network_server.eo
@@ -76,9 +76,9 @@ class Efl.Network.Server (Efl.Network) {
76 } 76 }
77 } 77 }
78 implements { 78 implements {
79 Eo.Base.constructor; 79 Efl.Object.constructor;
80 Eo.Base.destructor; 80 Efl.Object.destructor;
81 Eo.Base.finalize; 81 Efl.Object.finalize;
82 Efl.Network.ip.get; 82 Efl.Network.ip.get;
83 Efl.Network.uptime.get; 83 Efl.Network.uptime.get;
84 Efl.Network.port.set; 84 Efl.Network.port.set;
diff --git a/src/lib/ecore_con/efl_network_url.eo b/src/lib/ecore_con/efl_network_url.eo
index 783b18f..971d6d5 100644
--- a/src/lib/ecore_con/efl_network_url.eo
+++ b/src/lib/ecore_con/efl_network_url.eo
@@ -1,4 +1,4 @@
1class Efl.Network.Url (Eo.Base) { 1class Efl.Network.Url (Efl.Object) {
2 [[Uniform Resource Locator (URL) base class]] 2 [[Uniform Resource Locator (URL) base class]]
3 eo_prefix: efl_network_url; 3 eo_prefix: efl_network_url;
4 methods { 4 methods {
@@ -15,9 +15,9 @@ class Efl.Network.Url (Eo.Base) {
15 } 15 }
16 } 16 }
17 implements { 17 implements {
18 Eo.Base.constructor; 18 Efl.Object.constructor;
19 Eo.Base.destructor; 19 Efl.Object.destructor;
20 Eo.Base.finalize; 20 Efl.Object.finalize;
21 } 21 }
22 events { 22 events {
23 data; [[Triggered when data arrives at the socket.]] 23 data; [[Triggered when data arrives at the socket.]]
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 5c6bf83..4200733 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3110,7 +3110,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
3110 a.update_area = *viewport; 3110 a.update_area = *viewport;
3111 } 3111 }
3112 3112
3113 eo_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a); 3113 efl_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
3114 3114
3115 // FIXME: We do not support partial animator in the subcanvas 3115 // FIXME: We do not support partial animator in the subcanvas
3116 EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee) 3116 EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee)
@@ -3164,7 +3164,7 @@ _ecore_evas_animator_fallback(void *data)
3164static void 3164static void
3165_check_animator_event_catcher_add(void *data, const Eo_Event *event) 3165_check_animator_event_catcher_add(void *data, const Eo_Event *event)
3166{ 3166{
3167 const Eo_Callback_Array_Item *array = event->info; 3167 const Efl_Callback_Array_Item *array = event->info;
3168 Ecore_Evas *ee = data; 3168 Ecore_Evas *ee = data;
3169 int i; 3169 int i;
3170 3170
@@ -3198,7 +3198,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
3198static void 3198static void
3199_check_animator_event_catcher_del(void *data, const Eo_Event *event) 3199_check_animator_event_catcher_del(void *data, const Eo_Event *event)
3200{ 3200{
3201 const Eo_Callback_Array_Item *array = event->info; 3201 const Efl_Callback_Array_Item *array = event->info;
3202 Ecore_Evas *ee = data; 3202 Ecore_Evas *ee = data;
3203 int i; 3203 int i;
3204 3204
@@ -3228,13 +3228,13 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event)
3228} 3228}
3229 3229
3230EO_CALLBACKS_ARRAY_DEFINE(animator_watch, 3230EO_CALLBACKS_ARRAY_DEFINE(animator_watch,
3231 { EO_EVENT_CALLBACK_ADD, _check_animator_event_catcher_add }, 3231 { EFL_EVENT_CALLBACK_ADD, _check_animator_event_catcher_add },
3232 { EO_EVENT_CALLBACK_DEL, _check_animator_event_catcher_del }); 3232 { EFL_EVENT_CALLBACK_DEL, _check_animator_event_catcher_del });
3233 3233
3234EAPI void 3234EAPI void
3235_ecore_evas_register_animators(Ecore_Evas *ee) 3235_ecore_evas_register_animators(Ecore_Evas *ee)
3236{ 3236{
3237 eo_event_callback_array_add(ee->evas, animator_watch(), ee); 3237 efl_event_callback_array_add(ee->evas, animator_watch(), ee);
3238} 3238}
3239 3239
3240EAPI void 3240EAPI void
@@ -4328,7 +4328,7 @@ _pointer_position_set(Efl_Event_Pointer_Data *ev, Ecore_Evas *ee, int x, int y,
4328 EVENT_XY_SET(ev, my, ee->w + fh - mx - 1, fx, fy); 4328 EVENT_XY_SET(ev, my, ee->w + fh - mx - 1, fx, fy);
4329} 4329}
4330 4330
4331static const Eo_Event_Description * 4331static const Efl_Event_Description *
4332_event_description_get(Efl_Pointer_Action action) 4332_event_description_get(Efl_Pointer_Action action)
4333{ 4333{
4334 switch (action) 4334 switch (action)
@@ -4384,9 +4384,9 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
4384 ev->pressure = info->multi.pressure; 4384 ev->pressure = info->multi.pressure;
4385 ev->angle = info->multi.angle - ee->rotation; 4385 ev->angle = info->multi.angle - ee->rotation;
4386 4386
4387 eo_event_callback_call(e, _event_description_get(ev->action), evt); 4387 efl_event_callback_call(e, _event_description_get(ev->action), evt);
4388 processed = ev->evas_done; 4388 processed = ev->evas_done;
4389 eo_del(evt); 4389 efl_del(evt);
4390 4390
4391 return processed; 4391 return processed;
4392} 4392}
@@ -4442,9 +4442,9 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
4442 ev->pressure = info->multi.pressure; 4442 ev->pressure = info->multi.pressure;
4443 ev->angle = info->multi.angle - ee->rotation; 4443 ev->angle = info->multi.angle - ee->rotation;
4444 4444
4445 eo_event_callback_call(e, _event_description_get(ev->action), evt); 4445 efl_event_callback_call(e, _event_description_get(ev->action), evt);
4446 processed = ev->evas_done; 4446 processed = ev->evas_done;
4447 eo_del(evt); 4447 efl_del(evt);
4448 4448
4449 return processed; 4449 return processed;
4450} 4450}
@@ -4474,9 +4474,9 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
4474 ev->wheel.z = info->z; 4474 ev->wheel.z = info->z;
4475 ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL; 4475 ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL;
4476 4476
4477 eo_event_callback_call(e, _event_description_get(ev->action), evt); 4477 efl_event_callback_call(e, _event_description_get(ev->action), evt);
4478 processed = ev->evas_done; 4478 processed = ev->evas_done;
4479 eo_del(evt); 4479 efl_del(evt);
4480 4480
4481 return processed; 4481 return processed;
4482} 4482}
@@ -4501,9 +4501,9 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
4501 ev->timestamp = info->timestamp; 4501 ev->timestamp = info->timestamp;
4502 _pointer_position_set(ev, ee, info->x, info->y, info->x, info->y); 4502 _pointer_position_set(ev, ee, info->x, info->y, info->x, info->y);
4503 4503
4504 eo_event_callback_call(e, _event_description_get(ev->action), evt); 4504 efl_event_callback_call(e, _event_description_get(ev->action), evt);
4505 processed = ev->evas_done; 4505 processed = ev->evas_done;
4506 eo_del(evt); 4506 efl_del(evt);
4507 4507
4508 return processed; 4508 return processed;
4509} 4509}
@@ -4551,12 +4551,12 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
4551 ev->device = NULL; /* FIXME */ 4551 ev->device = NULL; /* FIXME */
4552 4552
4553 if (down) 4553 if (down)
4554 eo_event_callback_call(e, EFL_EVENT_KEY_DOWN, evt); 4554 efl_event_callback_call(e, EFL_EVENT_KEY_DOWN, evt);
4555 else 4555 else
4556 eo_event_callback_call(e, EFL_EVENT_KEY_UP, evt); 4556 efl_event_callback_call(e, EFL_EVENT_KEY_UP, evt);
4557 4557
4558 processed = ev->evas_done; 4558 processed = ev->evas_done;
4559 eo_del(evt); 4559 efl_del(evt);
4560 4560
4561 return processed; 4561 return processed;
4562} 4562}
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.c b/src/lib/ector/cairo/ector_cairo_software_surface.c
index 25bf3f8..81c14d1 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.c
@@ -99,10 +99,10 @@ _ector_cairo_software_surface_surface_get(Eo *obj EINA_UNUSED, Ector_Cairo_Softw
99 if (height) *height = pd->base->generic->h; 99 if (height) *height = pd->base->generic->h;
100} 100}
101 101
102static Eo_Base * 102static Efl_Object *
103_ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd) 103_ector_cairo_software_surface_efl_object_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
104{ 104{
105 obj = eo_constructor(eo_super(obj, MY_CLASS)); 105 obj = efl_constructor(eo_super(obj, MY_CLASS));
106 106
107 if (!obj) return NULL; 107 if (!obj) return NULL;
108 pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 108 pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
@@ -112,10 +112,10 @@ _ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_
112} 112}
113 113
114EOLIAN static void 114EOLIAN static void
115_ector_cairo_software_surface_eo_base_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd) 115_ector_cairo_software_surface_efl_object_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
116{ 116{
117 eo_data_unref(obj, pd->base); 117 eo_data_unref(obj, pd->base);
118 eo_destructor(eo_super(obj, MY_CLASS)); 118 efl_destructor(eo_super(obj, MY_CLASS));
119} 119}
120 120
121#include "ector_cairo_software_surface.eo.c" 121#include "ector_cairo_software_surface.eo.c"
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.eo b/src/lib/ector/cairo/ector_cairo_software_surface.eo
index 2aaf674..f389a23 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.eo
@@ -8,7 +8,7 @@ class Ector.Cairo.Software.Surface (Ector.Cairo.Surface, Ector.Software.Buffer.B
8 methods {} 8 methods {}
9 implements { 9 implements {
10 Ector.Buffer.pixels_set; 10 Ector.Buffer.pixels_set;
11 Eo.Base.constructor; 11 Efl.Object.constructor;
12 Eo.Base.destructor; 12 Efl.Object.destructor;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c
index 540ce4e..a06706a 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -60,7 +60,7 @@ _ector_cairo_surface_symbol_get(Eo *obj EINA_UNUSED,
60static Ector_Renderer * 60static Ector_Renderer *
61_ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj, 61_ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj,
62 Ector_Cairo_Surface_Data *pd EINA_UNUSED, 62 Ector_Cairo_Surface_Data *pd EINA_UNUSED,
63 const Eo_Class *type) 63 const Efl_Class *type)
64{ 64{
65 if (type == ECTOR_RENDERER_SHAPE_MIXIN) 65 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
66 return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 66 return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
@@ -115,14 +115,14 @@ _ector_cairo_surface_ector_surface_reference_point_set(Eo *obj EINA_UNUSED,
115} 115}
116 116
117static Eo * 117static Eo *
118_ector_cairo_surface_eo_base_constructor(Eo *obj, 118_ector_cairo_surface_efl_object_constructor(Eo *obj,
119 Ector_Cairo_Surface_Data *pd) 119 Ector_Cairo_Surface_Data *pd)
120{ 120{
121 USE(obj, cairo_destroy, NULL); 121 USE(obj, cairo_destroy, NULL);
122 USE(obj, cairo_image_surface_create, NULL); 122 USE(obj, cairo_image_surface_create, NULL);
123 USE(obj, cairo_create, NULL); 123 USE(obj, cairo_create, NULL);
124 124
125 obj = eo_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS)); 125 obj = efl_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
126 if (!obj) return NULL; 126 if (!obj) return NULL;
127 127
128 _cairo_count++; 128 _cairo_count++;
@@ -133,10 +133,10 @@ _ector_cairo_surface_eo_base_constructor(Eo *obj,
133} 133}
134 134
135static void 135static void
136_ector_cairo_surface_eo_base_destructor(Eo *obj EINA_UNUSED, 136_ector_cairo_surface_efl_object_destructor(Eo *obj EINA_UNUSED,
137 Ector_Cairo_Surface_Data *pd EINA_UNUSED) 137 Ector_Cairo_Surface_Data *pd EINA_UNUSED)
138{ 138{
139 eo_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS)); 139 efl_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
140 140
141 if (--_cairo_count) return ; 141 if (--_cairo_count) return ;
142 if (_cairo_so) eina_module_free(_cairo_so); 142 if (_cairo_so) eina_module_free(_cairo_so);
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo b/src/lib/ector/cairo/ector_cairo_surface.eo
index 80b40ff..4fce1f6 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -1,6 +1,6 @@
1type @extern cairo_t: void_ptr; 1type @extern cairo_t: void_ptr;
2 2
3class Ector.Cairo.Surface (Eo.Base, Ector.Surface) 3class Ector.Cairo.Surface (Efl.Object, Ector.Surface)
4{ 4{
5 [[Ector surface on a cairo backend 5 [[Ector surface on a cairo backend
6 6
@@ -28,7 +28,7 @@ class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
28 implements { 28 implements {
29 Ector.Surface.renderer_factory_new; 29 Ector.Surface.renderer_factory_new;
30 Ector.Surface.reference_point.set; 30 Ector.Surface.reference_point.set;
31 Eo.Base.destructor; 31 Efl.Object.destructor;
32 Eo.Base.constructor; 32 Efl.Object.constructor;
33 } 33 }
34} 34}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.c b/src/lib/ector/cairo/ector_renderer_cairo.c
index eca5d0c..4f97d28 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo.c
@@ -180,9 +180,9 @@ _ector_renderer_cairo_ector_renderer_draw(Eo *obj EINA_UNUSED,
180} 180}
181 181
182static Eo * 182static Eo *
183_ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED) 183_ector_renderer_cairo_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED)
184{ 184{
185 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 185 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
186 if (!obj) return NULL; 186 if (!obj) return NULL;
187 187
188 pd->generic = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 188 pd->generic = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
@@ -190,10 +190,10 @@ _ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd
190 return obj; 190 return obj;
191} 191}
192 192
193static Eo_Base * 193static Efl_Object *
194_ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd) 194_ector_renderer_cairo_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
195{ 195{
196 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 196 obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
197 if (!obj) return NULL; 197 if (!obj) return NULL;
198 198
199 USE(pd->generic, cairo_matrix_init, NULL); 199 USE(pd->generic, cairo_matrix_init, NULL);
@@ -213,7 +213,7 @@ _ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
213} 213}
214 214
215static void 215static void
216_ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd) 216_ector_renderer_cairo_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
217{ 217{
218 Ector_Renderer_Data *base; 218 Ector_Renderer_Data *base;
219 219
@@ -223,7 +223,7 @@ _ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
223 223
224 free(pd->m); 224 free(pd->m);
225 225
226 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 226 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
227} 227}
228 228
229#include "ector_renderer_cairo.eo.c" 229#include "ector_renderer_cairo.eo.c"
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo
index f9e094f..56a894d 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo.eo
@@ -13,8 +13,8 @@ abstract Ector.Renderer.Cairo (Ector.Renderer)
13 Ector.Renderer.draw; 13 Ector.Renderer.draw;
14 Ector.Renderer.color.set; 14 Ector.Renderer.color.set;
15 Ector.Renderer.color.get; 15 Ector.Renderer.color.get;
16 Eo.Base.constructor; 16 Efl.Object.constructor;
17 Eo.Base.finalize; 17 Efl.Object.finalize;
18 Eo.Base.destructor; 18 Efl.Object.destructor;
19 } 19 }
20} 20}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
index 757d5c8..bf8a05d 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -129,12 +129,12 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_bounds_get(Eo *obj,
129 gld->end.y - gld->start.y); 129 gld->end.y - gld->start.y);
130} 130}
131 131
132static Eo_Base * 132static Efl_Object *
133_ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED) 133_ector_renderer_cairo_gradient_linear_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED)
134{ 134{
135 Ector_Renderer_Data *base; 135 Ector_Renderer_Data *base;
136 136
137 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 137 obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
138 if (!obj) return NULL; 138 if (!obj) return NULL;
139 139
140 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 140 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
@@ -153,7 +153,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_C
153} 153}
154 154
155static void 155static void
156_ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj, 156_ector_renderer_cairo_gradient_linear_efl_object_destructor(Eo *obj,
157 Ector_Renderer_Cairo_Gradient_Linear_Data *pd) 157 Ector_Renderer_Cairo_Gradient_Linear_Data *pd)
158{ 158{
159 Ector_Renderer_Data *base; 159 Ector_Renderer_Data *base;
@@ -161,7 +161,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj,
161 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 161 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
162 eo_data_xunref(base->surface, pd->parent, obj); 162 eo_data_xunref(base->surface, pd->parent, obj);
163 163
164 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 164 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
165} 165}
166 166
167static void 167static void
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
index 0f3fc1d..ebbf88f 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer
7 Ector.Renderer.bounds_get; 7 Ector.Renderer.bounds_get;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Ector.Renderer.Cairo.fill; 9 Ector.Renderer.Cairo.fill;
10 Eo.Base.finalize; 10 Efl.Object.finalize;
11 Eo.Base.destructor; 11 Efl.Object.destructor;
12 Efl.Gfx.Gradient.stop.set; 12 Efl.Gfx.Gradient.stop.set;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
index 97d0417..7127dab 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -134,12 +134,12 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNU
134 gld->radius * 2, gld->radius * 2); 134 gld->radius * 2, gld->radius * 2);
135} 135}
136 136
137static Eo_Base * 137static Efl_Object *
138_ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED) 138_ector_renderer_cairo_gradient_radial_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED)
139{ 139{
140 Ector_Renderer_Data *base; 140 Ector_Renderer_Data *base;
141 141
142 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 142 obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
143 if (!obj) return NULL; 143 if (!obj) return NULL;
144 144
145 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 145 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
@@ -157,7 +157,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_C
157} 157}
158 158
159static void 159static void
160_ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj, 160_ector_renderer_cairo_gradient_radial_efl_object_destructor(Eo *obj,
161 Ector_Renderer_Cairo_Gradient