summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/benchmarks/eo/class_simple.c8
-rw-r--r--src/benchmarks/eo/class_simple.h6
-rw-r--r--src/benchmarks/eo/eo_bench_callbacks.c6
-rw-r--r--src/benchmarks/eo/eo_bench_eo_do.c6
-rw-r--r--src/bin/elementary/test.c2
-rw-r--r--src/bin/elementary/test_anim.c2
-rw-r--r--src/bin/elementary/test_application_server.c24
-rw-r--r--src/bin/elementary/test_code.c6
-rw-r--r--src/bin/elementary/test_entry.c26
-rw-r--r--src/bin/elementary/test_events.c36
-rw-r--r--src/bin/elementary/test_grid_static.c8
-rw-r--r--src/bin/elementary/test_task_switcher.c12
-rw-r--r--src/bin/elementary/test_ui_box.c32
-rw-r--r--src/bin/elementary/test_ui_grid.c52
-rw-r--r--src/bin/elementary/test_win_plug.c6
-rw-r--r--src/bin/eolian/eo_generator.c12
-rw-r--r--src/bin/eolian/impl_generator.c4
-rw-r--r--src/examples/ecore/ecore_audio_playback.c6
-rw-r--r--src/examples/ecore/ecore_audio_to_ogg.c16
-rw-r--r--src/examples/eio/efl_io_manager_ls.c2
-rw-r--r--src/examples/eio/eio_sentry.c4
-rw-r--r--src/examples/elementary/filemvc.c4
-rw-r--r--src/examples/elementary/performance/graphical.c4
-rw-r--r--src/examples/emotion/emotion_basic_example.c2
-rw-r--r--src/examples/emotion/emotion_border_example.c4
-rw-r--r--src/examples/emotion/emotion_generic_example.c6
-rw-r--r--src/examples/emotion/emotion_generic_subtitle_example.c2
-rw-r--r--src/examples/emotion/emotion_signals_example.c6
-rw-r--r--src/examples/eolian_cxx/colourable.c8
-rw-r--r--src/examples/eolian_cxx/colourable_stub.h4
-rw-r--r--src/examples/eolian_cxx/ns_colourable.eo6
-rw-r--r--src/examples/evas/evas-3d-shadows.c12
-rw-r--r--src/examples/evas/evas-vg-simple.c2
-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
-rw-r--r--src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c14
-rw-r--r--src/modules/elementary/prefs/elm_button.c2
-rw-r--r--src/modules/elementary/prefs/elm_check.c2
-rw-r--r--src/modules/elementary/prefs/elm_datetime.c2
-rw-r--r--src/modules/elementary/prefs/elm_entry.c4
-rw-r--r--src/modules/elementary/prefs/elm_slider.c2
-rw-r--r--src/modules/elementary/prefs/elm_spinner.c2
-rw-r--r--src/modules/elementary/web/none/elm_web_none.c2
-rw-r--r--src/modules/emotion/libvlc/emotion_libvlc.c2
-rw-r--r--src/modules/ethumb/emotion/emotion.c14
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c4
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.eo2
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c16
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo6
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c14
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.eo6
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c2
-rw-r--r--src/modules/evas/engines/software_generic/evas_ector_software_buffer.c14
-rw-r--r--src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo6
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c2
-rw-r--r--src/tests/ecore/ecore_test_args.c6
-rw-r--r--src/tests/ecore/ecore_test_ecore.c20
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c50
-rw-r--r--src/tests/ecore/ecore_test_timer.c8
-rw-r--r--src/tests/edje/edje_test_edje.c22
-rw-r--r--src/tests/efl_js/benchmark_object.eo2
-rw-r--r--src/tests/eina_cxx/simple.c4
-rw-r--r--src/tests/eina_cxx/simple.eo4
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c4
-rw-r--r--src/tests/eio/eio_test_manager.c14
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c2
-rw-r--r--src/tests/eio/eio_test_sentry.c34
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c12
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.h2
-rw-r--r--src/tests/elementary/elm_test_atspi.c2
-rw-r--r--src/tests/elementary/elm_test_config.c10
-rw-r--r--src/tests/elementary/elm_test_image.c8
-rw-r--r--src/tests/elementary/elm_test_layout.c10
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c20
-rw-r--r--src/tests/eo/access/access_inherit.c4
-rw-r--r--src/tests/eo/access/access_inherit.h2
-rw-r--r--src/tests/eo/access/access_simple.c12
-rw-r--r--src/tests/eo/access/access_simple.h4
-rw-r--r--src/tests/eo/children/children_main.c14
-rw-r--r--src/tests/eo/children/children_simple.c4
-rw-r--r--src/tests/eo/children/children_simple.h2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c18
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.h2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c20
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c12
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.h4
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c12
-rw-r--r--src/tests/eo/constructors/constructors_mixin.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple.c20
-rw-r--r--src/tests/eo/constructors/constructors_simple.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c8
-rw-r--r--src/tests/eo/constructors/constructors_simple2.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c6
-rw-r--r--src/tests/eo/constructors/constructors_simple3.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple4.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple4.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c6
-rw-r--r--src/tests/eo/constructors/constructors_simple5.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c8
-rw-r--r--src/tests/eo/constructors/constructors_simple6.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c8
-rw-r--r--src/tests/eo/constructors/constructors_simple7.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c8
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.h4
-rw-r--r--src/tests/eo/interface/interface_interface.c4
-rw-r--r--src/tests/eo/interface/interface_interface.h2
-rw-r--r--src/tests/eo/interface/interface_interface2.c4
-rw-r--r--src/tests/eo/interface/interface_interface2.h2
-rw-r--r--src/tests/eo/interface/interface_simple.c4
-rw-r--r--src/tests/eo/interface/interface_simple.h2
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c4
-rw-r--r--src/tests/eo/mixin/mixin_inherit.h2
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c12
-rw-r--r--src/tests/eo/mixin/mixin_mixin.h2
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c12
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.h2
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c12
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.h2
-rw-r--r--src/tests/eo/mixin/mixin_mixin4.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin4.h2
-rw-r--r--src/tests/eo/mixin/mixin_simple.c4
-rw-r--r--src/tests/eo/mixin/mixin_simple.h2
-rw-r--r--src/tests/eo/signals/signals_main.c108
-rw-r--r--src/tests/eo/signals/signals_simple.c30
-rw-r--r--src/tests/eo/signals/signals_simple.h6
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c24
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c58
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c40
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.h12
-rw-r--r--src/tests/eo/suite/eo_test_class_singleton.c8
-rw-r--r--src/tests/eo/suite/eo_test_class_singleton.h2
-rw-r--r--src/tests/eo/suite/eo_test_general.c450
-rw-r--r--src/tests/eo/suite/eo_test_init.c4
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c6
-rw-r--r--src/tests/eo/suite/eo_test_value.c4
-rw-r--r--src/tests/eolian/data/class_simple_ref.c4
-rw-r--r--src/tests/eolian/data/class_simple_ref_eo.h2
-rw-r--r--src/tests/eolian/data/docs_ref.h4
-rw-r--r--src/tests/eolian/data/object_impl_add_ref.c4
-rw-r--r--src/tests/eolian/data/object_impl_ref.c4
-rw-r--r--src/tests/eolian/data/override_ref.c4
-rw-r--r--src/tests/eolian/data/struct_ref.c2
-rw-r--r--src/tests/eolian/data/typedef_ref.c2
-rw-r--r--src/tests/eolian/generated_promise.eo2
-rw-r--r--src/tests/eolian_cxx/a.c4
-rw-r--r--src/tests/eolian_cxx/a.eo4
-rw-r--r--src/tests/eolian_cxx/b.c4
-rw-r--r--src/tests/eolian_cxx/b.eo2
-rw-r--r--src/tests/eolian_cxx/c.c4
-rw-r--r--src/tests/eolian_cxx/c.eo2
-rw-r--r--src/tests/eolian_cxx/callback.eo2
-rw-r--r--src/tests/eolian_cxx/complex.eo6
-rw-r--r--src/tests/eolian_cxx/d.c4
-rw-r--r--src/tests/eolian_cxx/d.eo2
-rw-r--r--src/tests/eolian_cxx/generic.c14
-rw-r--r--src/tests/eolian_cxx/generic.eo4
-rw-r--r--src/tests/eolian_cxx/name1_name2_type_generation.eo2
-rw-r--r--src/tests/eolian_cxx/simple.c4
-rw-r--r--src/tests/eolian_cxx/simple.eo4
-rw-r--r--src/tests/eolian_js/constructor_method_class.eo6
-rw-r--r--src/tests/eolian_js/eolian_js_test_constructor_method_impl.c10
-rw-r--r--src/tests/eolian_js/eolian_js_test_test_object_impl.c26
-rw-r--r--src/tests/eolian_js/test_object.eo8
-rw-r--r--src/tests/evas/evas_test_image.c6
-rw-r--r--src/tests/evas/evas_test_mesh.c4
644 files changed, 3718 insertions, 3718 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index a448272..e825291 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -7,8 +7,8 @@
7 7
8#define MY_CLASS SIMPLE_CLASS 8#define MY_CLASS SIMPLE_CLASS
9 9
10EOAPI const Eo_Event_Description _SIMPLE_FOO = EO_EVENT_DESCRIPTION("foo"); 10EOAPI const Efl_Event_Description _SIMPLE_FOO = EFL_EVENT_DESCRIPTION("foo");
11EOAPI const Eo_Event_Description _SIMPLE_BAR = EO_EVENT_DESCRIPTION("bar"); 11EOAPI const Efl_Event_Description _SIMPLE_BAR = EFL_EVENT_DESCRIPTION("bar");
12 12
13static void 13static void
14_other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int times) 14_other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int times)
@@ -30,12 +30,12 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
30 30
31EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); 31EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
32 32
33static Eo_Op_Description op_desc[] = { 33static Efl_Op_Description op_desc[] = {
34 EO_OP_FUNC(simple_a_set, _a_set), 34 EO_OP_FUNC(simple_a_set, _a_set),
35 EO_OP_FUNC(simple_other_call, _other_call), 35 EO_OP_FUNC(simple_other_call, _other_call),
36}; 36};
37 37
38static const Eo_Class_Description class_desc = { 38static const Efl_Class_Description class_desc = {
39 EO_VERSION, 39 EO_VERSION,
40 "Simple", 40 "Simple",
41 EO_CLASS_TYPE_REGULAR, 41 EO_CLASS_TYPE_REGULAR,
diff --git a/src/benchmarks/eo/class_simple.h b/src/benchmarks/eo/class_simple.h
index ecfbfa7..8445116 100644
--- a/src/benchmarks/eo/class_simple.h
+++ b/src/benchmarks/eo/class_simple.h
@@ -12,10 +12,10 @@ EAPI void simple_a_set(Eo *self, int a);
12EAPI void simple_other_call(Eo*self, Eo *other, int times); 12EAPI void simple_other_call(Eo*self, Eo *other, int times);
13 13
14#define SIMPLE_CLASS simple_class_get() 14#define SIMPLE_CLASS simple_class_get()
15const Eo_Class *simple_class_get(void); 15const Efl_Class *simple_class_get(void);
16 16
17EOAPI extern const Eo_Event_Description _SIMPLE_FOO; 17EOAPI extern const Efl_Event_Description _SIMPLE_FOO;
18EOAPI extern const Eo_Event_Description _SIMPLE_BAR; 18EOAPI extern const Efl_Event_Description _SIMPLE_BAR;
19 19
20#define SIMPLE_FOO (&(_SIMPLE_FOO)) 20#define SIMPLE_FOO (&(_SIMPLE_FOO))
21#define SIMPLE_BAR (&(_SIMPLE_BAR)) 21#define SIMPLE_BAR (&(_SIMPLE_BAR))
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c
index 69ea71e..ed76228 100644
--- a/src/benchmarks/eo/eo_bench_callbacks.c
+++ b/src/benchmarks/eo/eo_bench_callbacks.c
@@ -20,7 +20,7 @@ bench_eo_callbacks_add(int request)
20 20
21 for (i = 0 ; i < request ; i++) 21 for (i = 0 ; i < request ; i++)
22 { 22 {
23 eo_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL); 23 efl_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL);
24 } 24 }
25 25
26 eo_unref(obj); 26 eo_unref(obj);
@@ -56,7 +56,7 @@ bench_eo_callbacks_call(int request)
56 56
57 for (j = 0 ; j < i ; j++) 57 for (j = 0 ; j < i ; j++)
58 { 58 {
59 eo_event_callback_priority_add(obj[i], SIMPLE_FOO, (short) j, _cb, NULL); 59 efl_event_callback_priority_add(obj[i], SIMPLE_FOO, (short) j, _cb, NULL);
60 } 60 }
61 } 61 }
62 62
@@ -65,7 +65,7 @@ bench_eo_callbacks_call(int request)
65 for (j = 0 ; j < (int) (distribution[i] * request) ; j++) 65 for (j = 0 ; j < (int) (distribution[i] * request) ; j++)
66 { 66 {
67 /* Miss finding the callbacks on purpose, so we measure worst case scenario. */ 67 /* Miss finding the callbacks on purpose, so we measure worst case scenario. */
68 eo_event_callback_call(obj[i], SIMPLE_BAR, NULL); 68 efl_event_callback_call(obj[i], SIMPLE_BAR, NULL);
69 } 69 }
70 } 70 }
71 71
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index 9f84535..485f297 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -50,7 +50,7 @@ bench_eo_do_two_objs_growing_stack(int request)
50 eo_unref(obj2); 50 eo_unref(obj2);
51} 51}
52 52
53static const Eo_Class *cur_klass; 53static const Efl_Class *cur_klass;
54 54
55static void 55static void
56_a_set(Eo *obj, void *class_data EINA_UNUSED, int a) 56_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
@@ -58,14 +58,14 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
58 simple_a_set(eo_super(obj, cur_klass), a); 58 simple_a_set(eo_super(obj, cur_klass), a);
59} 59}
60 60
61static Eo_Op_Description op_desc[] = { 61static Efl_Op_Description op_desc[] = {
62 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 62 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
63}; 63};
64 64
65static void 65static void
66bench_eo_do_super(int request) 66bench_eo_do_super(int request)
67{ 67{
68 static Eo_Class_Description class_desc = { 68 static Efl_Class_Description class_desc = {
69 EO_VERSION, 69 EO_VERSION,
70 "Simple2", 70 "Simple2",
71 EO_CLASS_TYPE_REGULAR, 71 EO_CLASS_TYPE_REGULAR,
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 4dc0bb6..a27cd20 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -1078,7 +1078,7 @@ efl_main(void *data EINA_UNUSED,
1078 { 1078 {
1079 _log_domain = eina_log_domain_register("elementary_test", NULL); 1079 _log_domain = eina_log_domain_register("elementary_test", NULL);
1080 1080
1081 eo_event_callback_add(ev->object, EO_EVENT_DEL, _main_loop_death, NULL); 1081 efl_event_callback_add(ev->object, EFL_EVENT_DEL, _main_loop_death, NULL);
1082 1082
1083 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); 1083 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
1084 1084
diff --git a/src/bin/elementary/test_anim.c b/src/bin/elementary/test_anim.c
index 0cb608d..cc1b9ab 100644
--- a/src/bin/elementary/test_anim.c
+++ b/src/bin/elementary/test_anim.c
@@ -92,5 +92,5 @@ test_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
92 evas_object_resize(win, 480, 800); 92 evas_object_resize(win, 480, 800);
93 evas_object_show(win); 93 evas_object_show(win);
94 94
95 eo_event_callback_add(win, EFL_EVENT_ANIMATOR_TICK, _anim_tick, NULL); 95 efl_event_callback_add(win, EFL_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
96} 96}
diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c
index 7e89319..822a0c1 100644
--- a/src/bin/elementary/test_application_server.c
+++ b/src/bin/elementary/test_application_server.c
@@ -45,7 +45,7 @@ _close_cb(void *data, const Eo_Event *event)
45 App_View_Context *ctx = data; 45 App_View_Context *ctx = data;
46 if (ctx->win) 46 if (ctx->win)
47 evas_object_del(ctx->win); 47 evas_object_del(ctx->win);
48 eo_del(event->object); 48 efl_del(event->object);
49} 49}
50 50
51static void 51static void
@@ -108,10 +108,10 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
108 elm_app_server_view_new_events_set(view, 5); 108 elm_app_server_view_new_events_set(view, 5);
109 elm_app_server_view_window_set(view, ctx->win); 109 elm_app_server_view_window_set(view, ctx->win);
110 elm_app_server_view_resume(view); 110 elm_app_server_view_resume(view);
111 eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx); 111 efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx);
112 eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx); 112 efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx);
113 eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx); 113 efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx);
114 eo_event_callback_add(view, EO_EVENT_DEL, _view_del_cb, ctx); 114 efl_event_callback_add(view, EFL_EVENT_DEL, _view_del_cb, ctx);
115 115
116 return view; 116 return view;
117} 117}
@@ -139,7 +139,7 @@ test_application_server_common(const char *pkg)
139 server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(eo_self, pkg, _create_view_cb)); 139 server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(eo_self, pkg, _create_view_cb));
140 elm_app_server_title_set(server, pkg); 140 elm_app_server_title_set(server, pkg);
141 views_iter = elm_app_server_views_get(server); 141 views_iter = elm_app_server_views_get(server);
142 eo_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL); 142 efl_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL);
143 143
144 //views create in shallow state 144 //views create in shallow state
145 EINA_ITERATOR_FOREACH(views_iter, view) 145 EINA_ITERATOR_FOREACH(views_iter, view)
@@ -152,10 +152,10 @@ test_application_server_common(const char *pkg)
152 id = elm_app_server_view_id_get(view); 152 id = elm_app_server_view_id_get(view);
153 ctx->view_name = eina_stringshare_printf("%s %s", pkg, id); 153 ctx->view_name = eina_stringshare_printf("%s %s", pkg, id);
154 154
155 eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx); 155 efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx);
156 eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx); 156 efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx);
157 eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx); 157 efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx);
158 eo_event_callback_add(view, EO_EVENT_DEL, _view_del_cb, ctx); 158 efl_event_callback_add(view, EFL_EVENT_DEL, _view_del_cb, ctx);
159 } 159 }
160 eina_iterator_free(views_iter); 160 eina_iterator_free(views_iter);
161 161
@@ -181,7 +181,7 @@ test_application_server_phone(void *data EINA_UNUSED,
181 } 181 }
182 printf("Starting phone\n"); 182 printf("Starting phone\n");
183 phone_server = test_application_server_common("org.enlightenment.phone"); 183 phone_server = test_application_server_common("org.enlightenment.phone");
184 eo_event_callback_add(phone_server, EO_EVENT_DEL, _server_del_cb, &phone_server); 184 efl_event_callback_add(phone_server, EFL_EVENT_DEL, _server_del_cb, &phone_server);
185} 185}
186 186
187void 187void
@@ -196,5 +196,5 @@ test_application_server_message(void *data EINA_UNUSED,
196 } 196 }
197 printf("Starting message\n"); 197 printf("Starting message\n");
198 msg_server = test_application_server_common( "org.enlightenment.message"); 198 msg_server = test_application_server_common( "org.enlightenment.message");
199 eo_event_callback_add(msg_server, EO_EVENT_DEL, _server_del_cb, &msg_server); 199 efl_event_callback_add(msg_server, EFL_EVENT_DEL, _server_del_cb, &msg_server);
200} 200}
diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c
index 66fee91..51ce46a 100644
--- a/src/bin/elementary/test_code.c
+++ b/src/bin/elementary/test_code.c
@@ -45,7 +45,7 @@ _elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event)
45 else if (line->number == 4) 45 else if (line->number == 4)
46 line->status = ELM_CODE_STATUS_TYPE_ERROR; 46 line->status = ELM_CODE_STATUS_TYPE_ERROR;
47 47
48 eo_event_callback_stop(event->object); 48 efl_event_callback_stop(event->object);
49} 49}
50 50
51static Evas_Object * 51static Evas_Object *
@@ -57,8 +57,8 @@ _elm_code_test_welcome_setup(Evas_Object *parent)
57 code = elm_code_create(); 57 code = elm_code_create();
58 widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); 58 widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code));
59 elm_obj_code_widget_font_set(widget, NULL, 12); 59 elm_obj_code_widget_font_set(widget, NULL, 12);
60 eo_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL); 60 efl_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL);
61 eo_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code); 61 efl_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code);
62 62
63 _append_line(code->file, "❤ Hello World, Elm Code! ❤"); 63 _append_line(code->file, "❤ Hello World, Elm Code! ❤");
64 _append_line(code->file, ""); 64 _append_line(code->file, "");
diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c
index 6ff0bda..5f58b37 100644
--- a/src/bin/elementary/test_entry.c
+++ b/src/bin/elementary/test_entry.c
@@ -608,7 +608,7 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
608 evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en); 608 evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en);
609 evas_object_show(en); 609 evas_object_show(en);
610 elm_box_pack_end(bx, en); 610 elm_box_pack_end(bx, en);
611 eo_event_callback_add(en, ELM_ENTRY_EVENT_CONTEXT_OPEN, _context_menu_show_cb, NULL); 611 efl_event_callback_add(en, ELM_ENTRY_EVENT_CONTEXT_OPEN, _context_menu_show_cb, NULL);
612 612
613 bx2 = elm_box_add(win); 613 bx2 = elm_box_add(win);
614 elm_box_horizontal_set(bx2, EINA_TRUE); 614 elm_box_horizontal_set(bx2, EINA_TRUE);
@@ -697,7 +697,7 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
697static void 697static void
698my_pop_dismissed(void *data EINA_UNUSED, const Eo_Event *ev) 698my_pop_dismissed(void *data EINA_UNUSED, const Eo_Event *ev)
699{ 699{
700 eo_del(ev->object); 700 efl_del(ev->object);
701} 701}
702 702
703static void 703static void
@@ -705,7 +705,7 @@ my_pop_close_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
705{ 705{
706 Evas_Object *pop, *en; 706 Evas_Object *pop, *en;
707 pop = data; 707 pop = data;
708 en = eo_parent_get(pop); 708 en = efl_parent_get(pop);
709 elm_object_text_set(en, "This is very long text," 709 elm_object_text_set(en, "This is very long text,"
710 " it is longer than width of this page." 710 " it is longer than width of this page."
711 " So if scroller is moved to next page," 711 " So if scroller is moved to next page,"
@@ -713,7 +713,7 @@ my_pop_close_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
713 " and then click this entry text"); 713 " and then click this entry text");
714 elm_entry_cursor_end_set(en); 714 elm_entry_cursor_end_set(en);
715 715
716 eo_event_callback_add(pop, ELM_POPUP_EVENT_DISMISSED, my_pop_dismissed, NULL); 716 efl_event_callback_add(pop, ELM_POPUP_EVENT_DISMISSED, my_pop_dismissed, NULL);
717 elm_popup_dismiss(pop); 717 elm_popup_dismiss(pop);
718} 718}
719 719
@@ -724,8 +724,8 @@ my_pop_bt_clr(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
724 elm_object_text_set(en, ""); 724 elm_object_text_set(en, "");
725 elm_entry_cursor_end_set(en); 725 elm_entry_cursor_end_set(en);
726 726
727 pop = elm_popup_add(eo_key_data_get(en, "win")); 727 pop = elm_popup_add(efl_key_data_get(en, "win"));
728 eo_parent_set(pop, en); 728 efl_parent_set(pop, en);
729 elm_object_text_set(pop, "If you click confirm, " 729 elm_object_text_set(pop, "If you click confirm, "
730 "set long text to entry " 730 "set long text to entry "
731 "and delete popup obj"); 731 "and delete popup obj");
@@ -785,7 +785,7 @@ test_entry_on_page_scroll(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
785 elm_object_part_content_set(ly, "element1", en); 785 elm_object_part_content_set(ly, "element1", en);
786 elm_entry_scrollable_set(en, EINA_TRUE); 786 elm_entry_scrollable_set(en, EINA_TRUE);
787 elm_entry_single_line_set(en, EINA_TRUE); 787 elm_entry_single_line_set(en, EINA_TRUE);
788 eo_key_data_set(en, "win", win); // no ref 788 efl_key_data_set(en, "win", win); // no ref
789 evas_object_show(en); 789 evas_object_show(en);
790 790
791 btn = elm_button_add(ly); 791 btn = elm_button_add(ly);
@@ -2606,8 +2606,8 @@ _test_regex_bt_cb(void *data,
2606 2606
2607 if (test_data->re) 2607 if (test_data->re)
2608 { 2608 {
2609 eo_event_callback_del(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re); 2609 efl_event_callback_del(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
2610 eo_event_callback_del(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re); 2610 efl_event_callback_del(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
2611 elm_validator_regexp_free(test_data->re); 2611 elm_validator_regexp_free(test_data->re);
2612 } 2612 }
2613 test_data->re = elm_validator_regexp_new(elm_entry_entry_get(test_data->en_regex), NULL); 2613 test_data->re = elm_validator_regexp_new(elm_entry_entry_get(test_data->en_regex), NULL);
@@ -2631,8 +2631,8 @@ _test_regex_bt_cb(void *data,
2631 } 2631 }
2632 if (!status) 2632 if (!status)
2633 { 2633 {
2634 eo_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re); 2634 efl_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
2635 eo_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re); 2635 efl_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
2636 } 2636 }
2637 2637
2638 elm_object_text_set(test_data->lb_regex, eina_strbuf_string_get(tmp)); 2638 elm_object_text_set(test_data->lb_regex, eina_strbuf_string_get(tmp));
@@ -2731,8 +2731,8 @@ test_entry_regex(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
2731 2731
2732 test_data->re = elm_validator_regexp_new(REGEX, NULL); 2732 test_data->re = elm_validator_regexp_new(REGEX, NULL);
2733 elm_entry_entry_set(test_data->en_regex, REGEX); 2733 elm_entry_entry_set(test_data->en_regex, REGEX);
2734 eo_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re); 2734 efl_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
2735 eo_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re); 2735 efl_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
2736 2736
2737 evas_object_resize(win, 400, 400); 2737 evas_object_resize(win, 400, 400);
2738 evas_object_show(win); 2738 evas_object_show(win);
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 5ae64ed..094ca19 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -22,7 +22,7 @@ _pointer_down(void *data, const Eo_Event *ev)
22{ 22{
23 testdata *td = data; 23 testdata *td = data;
24 td->down = 1; 24 td->down = 1;
25 eo_del(td->evdown); 25 efl_del(td->evdown);
26 td->evdown = efl_event_dup(ev->info); 26 td->evdown = efl_event_dup(ev->info);
27} 27}
28 28
@@ -30,7 +30,7 @@ static void
30_pointer_move(void *data, const Eo_Event *ev) 30_pointer_move(void *data, const Eo_Event *ev)
31{ 31{
32 testdata *td = data; 32 testdata *td = data;
33 eo_del(td->evmove); 33 efl_del(td->evmove);
34 td->evmove = efl_event_dup(ev->info); 34 td->evmove = efl_event_dup(ev->info);
35} 35}
36 36
@@ -39,7 +39,7 @@ _pointer_up(void *data, const Eo_Event *ev)
39{ 39{
40 testdata *td = data; 40 testdata *td = data;
41 td->down = 0; 41 td->down = 0;
42 eo_del(td->evup); 42 efl_del(td->evup);
43 td->evup = efl_event_dup(ev->info); 43 td->evup = efl_event_dup(ev->info);
44} 44}
45 45
@@ -64,7 +64,7 @@ _key_down(void *data, const Eo_Event *ev)
64 64
65 if (!efl_event_fake_get(ev->info)) 65 if (!efl_event_fake_get(ev->info))
66 { 66 {
67 eo_del(td->evkeydown); 67 efl_del(td->evkeydown);
68 td->evkeydown = efl_event_dup(ev->info); 68 td->evkeydown = efl_event_dup(ev->info);
69 } 69 }
70} 70}
@@ -98,7 +98,7 @@ _key_up(void *data, const Eo_Event *ev)
98 98
99 if (!efl_event_fake_get(ev->info)) 99 if (!efl_event_fake_get(ev->info))
100 { 100 {
101 eo_del(td->evkeyup); 101 efl_del(td->evkeyup);
102 td->evkeyup = efl_event_dup(ev->info); 102 td->evkeyup = efl_event_dup(ev->info);
103 } 103 }
104 104
@@ -108,7 +108,7 @@ _key_up(void *data, const Eo_Event *ev)
108 // 2bis I need to pass the loop object itself rather than a provider 108 // 2bis I need to pass the loop object itself rather than a provider
109 // 3. All calls to eina_promise crash if the promise is null 109 // 3. All calls to eina_promise crash if the promise is null
110 110
111 if (td->timer) eo_del(td->timer); 111 if (td->timer) efl_del(td->timer);
112 td->timer = ecore_timer_add(0.5, _ecore_timeout_cb, td); 112 td->timer = ecore_timer_add(0.5, _ecore_timeout_cb, td);
113} 113}
114 114
@@ -144,16 +144,16 @@ _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED)
144 efl_event_pointer_position_set(td->evdown, x, y); 144 efl_event_pointer_position_set(td->evdown, x, y);
145 efl_event_pointer_position_set(td->evup, x, y); 145 efl_event_pointer_position_set(td->evup, x, y);
146 146
147 eo_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove); 147 efl_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove);
148 eo_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown); 148 efl_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown);
149 eo_event_callback_call(td->win, EFL_EVENT_POINTER_UP, td->evup); 149 efl_event_callback_call(td->win, EFL_EVENT_POINTER_UP, td->evup);
150 } 150 }
151 else 151 else
152 { 152 {
153 eo_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown); 153 efl_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown);
154 eo_event_callback_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup); 154 efl_event_callback_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup);
155 eo_del(td->evkeydown); 155 efl_del(td->evkeydown);
156 eo_del(td->evkeyup); 156 efl_del(td->evkeyup);
157 td->evkeydown = NULL; 157 td->evkeydown = NULL;
158 td->evkeyup = NULL; 158 td->evkeyup = NULL;
159 } 159 }
@@ -222,11 +222,11 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
222 efl_pack(bx, o); 222 efl_pack(bx, o);
223 evas_object_show(o); 223 evas_object_show(o);
224 224
225 eo_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td); 225 efl_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td);
226 eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td); 226 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td);
227 eo_event_callback_add(win, EO_EVENT_DEL, _win_del, td); 227 efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, td);
228 eo_event_callback_array_add(o, rect_pointer_callbacks(), td); 228 efl_event_callback_array_add(o, rect_pointer_callbacks(), td);
229 eo_event_callback_array_add(win, win_key_callbacks(), td); 229 efl_event_callback_array_add(win, win_key_callbacks(), td);
230 230
231 evas_object_resize(td->win, 200, 100); 231 evas_object_resize(td->win, 200, 100);
232 evas_object_show(td->win); 232 evas_object_show(td->win);
diff --git a/src/bin/elementary/test_grid_static.c b/src/bin/elementary/test_grid_static.c
index 2e1ac89..59d7062 100644
--- a/src/bin/elementary/test_grid_static.c
+++ b/src/bin/elementary/test_grid_static.c
@@ -42,7 +42,7 @@ set_api_state(api_data *api)
42 42
43 case GRID_UNPACK: /* 1 */ 43 case GRID_UNPACK: /* 1 */
44 efl_pack_unpack(dt->grid, dt->child); 44 efl_pack_unpack(dt->grid, dt->child);
45 eo_del(dt->child); 45 efl_del(dt->child);
46 break; 46 break;
47 47
48 case GRID_SIZE: /* 2 */ 48 case GRID_SIZE: /* 2 */
@@ -108,7 +108,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
108 efl_ui_win_name_set(eo_self, "grid"), 108 efl_ui_win_name_set(eo_self, "grid"),
109 efl_text_set(eo_self, "Grid"), 109 efl_text_set(eo_self, "Grid"),
110 efl_ui_win_autodel_set(eo_self, EINA_TRUE), 110 efl_ui_win_autodel_set(eo_self, EINA_TRUE),
111 eo_event_callback_add(eo_self, EO_EVENT_DEL, _win_del, api)); 111 efl_event_callback_add(eo_self, EFL_EVENT_DEL, _win_del, api));
112 112
113 static int run_count = 0; 113 static int run_count = 0;
114 if (((run_count++) % 2) == 0) 114 if (((run_count++) % 2) == 0)
@@ -144,7 +144,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
144 144
145 bt = elm_button_add(win); 145 bt = elm_button_add(win);
146 elm_object_text_set(bt, "Next API function"); 146 elm_object_text_set(bt, "Next API function");
147 eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api); 147 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
148 efl_pack_grid(gd, bt, 30, 0, 40, 10); 148 efl_pack_grid(gd, bt, 30, 0, 40, 10);
149 elm_object_disabled_set(bt, api->state == API_STATE_LAST); 149 elm_object_disabled_set(bt, api->state == API_STATE_LAST);
150 efl_gfx_visible_set(bt, 1); 150 efl_gfx_visible_set(bt, 1);
@@ -173,7 +173,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
173 bt = elm_button_add(win); 173 bt = elm_button_add(win);
174 elm_object_text_set(bt, "Change"); 174 elm_object_text_set(bt, "Change");
175 efl_pack_grid(gd, bt, 40, 40, 20, 20); 175 efl_pack_grid(gd, bt, 40, 40, 20, 20);
176 eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_grid, gd); 176 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_grid, gd);
177 efl_gfx_visible_set(bt, 1); 177 efl_gfx_visible_set(bt, 1);
178 178
179 rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win); 179 rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c
index 09380a1..df0ab2d 100644
--- a/src/bin/elementary/test_task_switcher.c
+++ b/src/bin/elementary/test_task_switcher.c
@@ -67,7 +67,7 @@ _app_view_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
67 Elm_App_Client_View *old_view; 67 Elm_App_Client_View *old_view;
68 68
69 old_view = evas_object_data_del(view_props, "view"); 69 old_view = evas_object_data_del(view_props, "view");
70 eo_event_callback_del(old_view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table); 70 efl_event_callback_del(old_view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table);
71 elm_list_clear(view_props); 71 elm_list_clear(view_props);
72 } 72 }
73 else 73 else
@@ -86,7 +86,7 @@ _app_view_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
86 progress = elm_app_client_view_progress_get(view); 86 progress = elm_app_client_view_progress_get(view);
87 new_events = elm_app_client_view_new_events_get(view); 87 new_events = elm_app_client_view_new_events_get(view);
88 window = elm_app_client_view_window_get(view); 88 window = elm_app_client_view_window_get(view);
89 eo_event_callback_add(view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table); 89 efl_event_callback_add(view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table);
90 90
91 snprintf(buffer, sizeof(buffer), "Title=%s", title); 91 snprintf(buffer, sizeof(buffer), "Title=%s", title);
92 elm_list_item_append(view_props, buffer, NULL, NULL, NULL, NULL); 92 elm_list_item_append(view_props, buffer, NULL, NULL, NULL, NULL);
@@ -280,7 +280,7 @@ _win_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_
280{ 280{
281 Elm_App_Client *app; 281 Elm_App_Client *app;
282 EINA_LIST_FREE(apps_list, app) 282 EINA_LIST_FREE(apps_list, app)
283 eo_del(app); 283 efl_del(app);
284} 284}
285 285
286static void 286static void
@@ -301,9 +301,9 @@ _app_open(const char *package)
301 } 301 }
302 302
303 app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(eo_self, package)); 303 app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(eo_self, package));
304 eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table); 304 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table);
305 eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table); 305 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table);
306 eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table); 306 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table);
307 apps_list = eina_list_append(apps_list, app); 307 apps_list = eina_list_append(apps_list, app);
308} 308}
309 309
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index fbfaf6e..bf14767f 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -240,7 +240,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
240 240
241 chk = o = elm_radio_add(win); 241 chk = o = elm_radio_add(win);
242 elm_object_text_set(o, "No weight"); 242 elm_object_text_set(o, "No weight");
243 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox); 243 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
244 efl_gfx_size_hint_align_set(o, 0, 0.5); 244 efl_gfx_size_hint_align_set(o, 0, 0.5);
245 elm_radio_state_value_set(o, NONE); 245 elm_radio_state_value_set(o, NONE);
246 efl_pack(bx, o); 246 efl_pack(bx, o);
@@ -248,7 +248,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
248 248
249 o = elm_radio_add(win); 249 o = elm_radio_add(win);
250 elm_object_text_set(o, "No weight + box fill"); 250 elm_object_text_set(o, "No weight + box fill");
251 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox); 251 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
252 efl_gfx_size_hint_align_set(o, 0, 0.5); 252 efl_gfx_size_hint_align_set(o, 0, 0.5);
253 elm_radio_state_value_set(o, NONE_BUT_FILL); 253 elm_radio_state_value_set(o, NONE_BUT_FILL);
254 elm_radio_group_add(o, chk); 254 elm_radio_group_add(o, chk);
@@ -257,7 +257,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
257 257
258 o = elm_radio_add(win); 258 o = elm_radio_add(win);
259 elm_object_text_set(o, "Equal weights"); 259 elm_object_text_set(o, "Equal weights");
260 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox); 260 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
261 efl_gfx_size_hint_align_set(o, 0, 0.5); 261 efl_gfx_size_hint_align_set(o, 0, 0.5);
262 elm_radio_state_value_set(o, EQUAL); 262 elm_radio_state_value_set(o, EQUAL);
263 elm_radio_group_add(o, chk); 263 elm_radio_group_add(o, chk);
@@ -266,7 +266,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
266 266
267 o = elm_radio_add(win); 267 o = elm_radio_add(win);
268 elm_object_text_set(o, "One weight only"); 268 elm_object_text_set(o, "One weight only");
269 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox); 269 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
270 efl_gfx_size_hint_align_set(o, 0, 0.5); 270 efl_gfx_size_hint_align_set(o, 0, 0.5);
271 elm_radio_state_value_set(o, ONE); 271 elm_radio_state_value_set(o, ONE);
272 elm_radio_group_add(o, chk); 272 elm_radio_group_add(o, chk);
@@ -275,7 +275,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
275 275
276 o = elm_radio_add(win); 276 o = elm_radio_add(win);
277 elm_object_text_set(o, "Two weights"); 277 elm_object_text_set(o, "Two weights");
278 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox); 278 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
279 efl_gfx_size_hint_align_set(o, 0, 0.5); 279 efl_gfx_size_hint_align_set(o, 0, 0.5);
280 elm_radio_state_value_set(o, TWO); 280 elm_radio_state_value_set(o, TWO);
281 elm_radio_group_add(o, chk); 281 elm_radio_group_add(o, chk);
@@ -301,7 +301,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
301 o = elm_check_add(win); 301 o = elm_check_add(win);
302 elm_check_selected_set(o, 0); 302 elm_check_selected_set(o, 0);
303 elm_object_text_set(o, "Flow"); 303 elm_object_text_set(o, "Flow");
304 eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, bottombox); 304 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, bottombox);
305 efl_gfx_size_hint_align_set(o, 0, 0); 305 efl_gfx_size_hint_align_set(o, 0, 0);
306 efl_pack(bx, o); 306 efl_pack(bx, o);
307 efl_gfx_visible_set(o, 1); 307 efl_gfx_visible_set(o, 1);
@@ -309,7 +309,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
309 o = elm_check_add(win); 309 o = elm_check_add(win);
310 elm_check_selected_set(o, 1); 310 elm_check_selected_set(o, 1);
311 elm_object_text_set(o, "Horizontal"); 311 elm_object_text_set(o, "Horizontal");
312 eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, bottombox); 312 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, bottombox);
313 efl_gfx_size_hint_align_set(o, 0, 0); 313 efl_gfx_size_hint_align_set(o, 0, 0);
314 efl_pack(bx, o); 314 efl_pack(bx, o);
315 efl_gfx_visible_set(o, 1); 315 efl_gfx_visible_set(o, 1);
@@ -317,7 +317,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
317 o = elm_check_add(win); 317 o = elm_check_add(win);
318 elm_check_selected_set(o, 0); 318 elm_check_selected_set(o, 0);
319 elm_object_text_set(o, "Homogenous"); 319 elm_object_text_set(o, "Homogenous");
320 eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, bottombox); 320 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, bottombox);
321 efl_gfx_size_hint_align_set(o, 0, 0); 321 efl_gfx_size_hint_align_set(o, 0, 0);
322 efl_pack(bx, o); 322 efl_pack(bx, o);
323 efl_gfx_visible_set(o, 1); 323 efl_gfx_visible_set(o, 1);
@@ -325,7 +325,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
325 o = elm_check_add(win); 325 o = elm_check_add(win);
326 elm_check_selected_set(o, 0); 326 elm_check_selected_set(o, 0);
327 elm_object_text_set(o, "Homogenous + Max"); 327 elm_object_text_set(o, "Homogenous + Max");
328 eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, bottombox); 328 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, bottombox);
329 efl_gfx_size_hint_align_set(o, 0, 0); 329 efl_gfx_size_hint_align_set(o, 0, 0);
330 efl_pack(bx, o); 330 efl_pack(bx, o);
331 efl_gfx_visible_set(o, 1); 331 efl_gfx_visible_set(o, 1);
@@ -333,7 +333,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
333 o = elm_check_add(win); 333 o = elm_check_add(win);
334 elm_check_selected_set(o, 0); 334 elm_check_selected_set(o, 0);
335 elm_object_text_set(o, "Align left"); 335 elm_object_text_set(o, "Align left");
336 eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, left_check_cb, bottombox); 336 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, left_check_cb, bottombox);
337 efl_gfx_size_hint_align_set(o, 0, 0); 337 efl_gfx_size_hint_align_set(o, 0, 0);
338 efl_pack(bx, o); 338 efl_pack(bx, o);
339 efl_gfx_visible_set(o, 1); 339 efl_gfx_visible_set(o, 1);
@@ -341,7 +341,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
341 o = elm_check_add(win); 341 o = elm_check_add(win);
342 elm_check_selected_set(o, 0); 342 elm_check_selected_set(o, 0);
343 elm_object_text_set(o, "Custom layout"); 343 elm_object_text_set(o, "Custom layout");
344 eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, custom_check_cb, bottombox); 344 efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, custom_check_cb, bottombox);
345 efl_gfx_size_hint_align_set(o, 0, 0); 345 efl_gfx_size_hint_align_set(o, 0, 0);
346 efl_gfx_size_hint_weight_set(o, 0, 1); 346 efl_gfx_size_hint_weight_set(o, 0, 1);
347 efl_pack(bx, o); 347 efl_pack(bx, o);
@@ -367,7 +367,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
367 elm_slider_horizontal_set(o, 0); 367 elm_slider_horizontal_set(o, 0);
368 efl_gfx_size_hint_align_set(o, 0.5, -1); 368 efl_gfx_size_hint_align_set(o, 0.5, -1);
369 efl_gfx_size_hint_weight_set(o, 1, 1); 369 efl_gfx_size_hint_weight_set(o, 1, 1);
370 eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); 370 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL);
371 elm_slider_min_max_set(o, 0, 250); 371 elm_slider_min_max_set(o, 0, 250);
372 elm_slider_inverted_set(o, 1); 372 elm_slider_inverted_set(o, 1);
373 elm_slider_value_set(o, 0); 373 elm_slider_value_set(o, 0);
@@ -394,7 +394,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
394 elm_slider_horizontal_set(o, 0); 394 elm_slider_horizontal_set(o, 0);
395 efl_gfx_size_hint_align_set(o, 0.5, -1); 395 efl_gfx_size_hint_align_set(o, 0.5, -1);
396 efl_gfx_size_hint_weight_set(o, 1, 1); 396 efl_gfx_size_hint_weight_set(o, 1, 1);
397 eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, bottombox); 397 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, bottombox);
398 elm_slider_min_max_set(o, 0, 40); 398 elm_slider_min_max_set(o, 0, 40);
399 elm_slider_inverted_set(o, 1); 399 elm_slider_inverted_set(o, 1);
400 elm_slider_value_set(o, 10); 400 elm_slider_value_set(o, 10);
@@ -421,7 +421,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
421 elm_slider_horizontal_set(o, 0); 421 elm_slider_horizontal_set(o, 0);
422 efl_gfx_size_hint_align_set(o, 0.5, -1); 422 efl_gfx_size_hint_align_set(o, 0.5, -1);
423 efl_gfx_size_hint_weight_set(o, 1, 1); 423 efl_gfx_size_hint_weight_set(o, 1, 1);
424 eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, bottombox); 424 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, bottombox);
425 elm_slider_min_max_set(o, 0, 40); 425 elm_slider_min_max_set(o, 0, 40);
426 elm_slider_inverted_set(o, 1); 426 elm_slider_inverted_set(o, 1);
427 elm_slider_value_set(o, 10); 427 elm_slider_value_set(o, 10);
@@ -448,7 +448,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
448 elm_slider_horizontal_set(o, 0); 448 elm_slider_horizontal_set(o, 0);
449 efl_gfx_size_hint_align_set(o, 0.5, -1); 449 efl_gfx_size_hint_align_set(o, 0.5, -1);
450 efl_gfx_size_hint_weight_set(o, 1, 1); 450 efl_gfx_size_hint_weight_set(o, 1, 1);
451 eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignv_slider_cb, bottombox); 451 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignv_slider_cb, bottombox);
452 elm_slider_min_max_set(o, -0.1, 1.0); 452 elm_slider_min_max_set(o, -0.1, 1.0);
453 elm_slider_step_set(o, 0.1); 453 elm_slider_step_set(o, 0.1);
454 elm_slider_value_set(o, 0.5); 454 elm_slider_value_set(o, 0.5);
@@ -462,7 +462,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
462 efl_gfx_size_hint_align_set(o, 0.5, -1); 462 efl_gfx_size_hint_align_set(o, 0.5, -1);
463 efl_gfx_size_hint_weight_set(o, 1, 0); 463 efl_gfx_size_hint_weight_set(o, 1, 0);
464 efl_gfx_size_hint_min_set(o, 100, 0); 464 efl_gfx_size_hint_min_set(o, 100, 0);
465 eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignh_slider_cb, bottombox); 465 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignh_slider_cb, bottombox);
466 elm_slider_min_max_set(o, -0.1, 1.0); 466 elm_slider_min_max_set(o, -0.1, 1.0);
467 elm_slider_step_set(o, 0.1); 467 elm_slider_step_set(o, 0.1);
468 elm_slider_value_set(o, 0.5); 468 elm_slider_value_set(o, 0.5);
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 136d902..0617bd9 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -18,12 +18,12 @@ typedef enum {
18 18
19static void _custom_engine_layout_do(Eo *obj, void *pd, Efl_Pack *pack, const void *data); 19static void _custom_engine_layout_do(Eo *obj, void *pd, Efl_Pack *pack, const void *data);
20 20
21/* Common Eo Class boilerplate. */ 21/* Common Efl Class boilerplate. */
22static const Eo_Op_Description custom_engine_op_desc[] = { 22static const Efl_Op_Description custom_engine_op_desc[] = {
23 EO_OP_CLASS_FUNC_OVERRIDE(efl_pack_layout_do, _custom_engine_layout_do), 23 EO_OP_CLASS_FUNC_OVERRIDE(efl_pack_layout_do, _custom_engine_layout_do),
24}; 24};
25 25
26static const Eo_Class_Description custom_engine_class_desc = { 26static const Efl_Class_Description custom_engine_class_desc = {
27 EO_VERSION, "Custom Layout Engine", EO_CLASS_TYPE_INTERFACE, 27 EO_VERSION, "Custom Layout Engine", EO_CLASS_TYPE_INTERFACE,
28 EO_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), NULL, 0, NULL, NULL 28 EO_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), NULL, 0, NULL, NULL
29}; 29};
@@ -227,7 +227,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
227 227
228 chk = o = elm_radio_add(win); 228 chk = o = elm_radio_add(win);
229 elm_object_text_set(o, "No weight"); 229 elm_object_text_set(o, "No weight");
230 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); 230 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
231 efl_gfx_size_hint_align_set(o, 0, 0.5); 231 efl_gfx_size_hint_align_set(o, 0, 0.5);
232 elm_radio_state_value_set(o, NONE); 232 elm_radio_state_value_set(o, NONE);
233 efl_pack(bx, o); 233 efl_pack(bx, o);
@@ -235,7 +235,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
235 235
236 o = elm_radio_add(win); 236 o = elm_radio_add(win);
237 elm_object_text_set(o, "No weight + grid fill"); 237 elm_object_text_set(o, "No weight + grid fill");
238 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); 238 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
239 efl_gfx_size_hint_align_set(o, 0, 0.5); 239 efl_gfx_size_hint_align_set(o, 0, 0.5);
240 elm_radio_state_value_set(o, NONE_BUT_FILL); 240 elm_radio_state_value_set(o, NONE_BUT_FILL);
241 elm_radio_group_add(o, chk); 241 elm_radio_group_add(o, chk);
@@ -244,7 +244,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
244 244
245 o = elm_radio_add(win); 245 o = elm_radio_add(win);
246 elm_object_text_set(o, "Equal weights"); 246 elm_object_text_set(o, "Equal weights");
247 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); 247 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
248 efl_gfx_size_hint_align_set(o, 0, 0.5); 248 efl_gfx_size_hint_align_set(o, 0, 0.5);
249 elm_radio_state_value_set(o, EQUAL); 249 elm_radio_state_value_set(o, EQUAL);
250 elm_radio_group_add(o, chk); 250 elm_radio_group_add(o, chk);
@@ -253,7 +253,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
253 253
254 o = elm_radio_add(win); 254 o = elm_radio_add(win);
255 elm_object_text_set(o, "One weight only"); 255 elm_object_text_set(o, "One weight only");
256 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); 256 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
257 efl_gfx_size_hint_align_set(o, 0, 0.5); 257 efl_gfx_size_hint_align_set(o, 0, 0.5);
258 elm_radio_state_value_set(o, ONE); 258 elm_radio_state_value_set(o, ONE);
259 elm_radio_group_add(o, chk); 259 elm_radio_group_add(o, chk);
@@ -262,7 +262,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
262 262
263 o = elm_radio_add(win); 263 o = elm_radio_add(win);
264 elm_object_text_set(o, "Two weights"); 264 elm_object_text_set(o, "Two weights");
265 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); 265 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
266 efl_gfx_size_hint_align_set(o, 0, 0.5); 266 efl_gfx_size_hint_align_set(o, 0, 0.5);
267 elm_radio_state_value_set(o, TWO); 267 elm_radio_state_value_set(o, TWO);
268 elm_radio_group_add(o, chk); 268 elm_radio_group_add(o, chk);
@@ -271,7 +271,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
271 271
272 o = elm_radio_add(win); 272 o = elm_radio_add(win);
273 elm_object_text_set(o, "Custom layout"); 273 elm_object_text_set(o, "Custom layout");
274 eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); 274 efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
275 efl_gfx_size_hint_align_set(o, 0, 0.5); 275 efl_gfx_size_hint_align_set(o, 0, 0.5);
276 elm_radio_state_value_set(o, CUSTOM); 276 elm_radio_state_value_set(o, CUSTOM);
277 elm_radio_group_add(o, chk); 277 elm_radio_group_add(o, chk);
@@ -300,7 +300,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
300 elm_slider_horizontal_set(o, 0); 300 elm_slider_horizontal_set(o, 0);
301 efl_gfx_size_hint_align_set(o, 0.5, -1); 301 efl_gfx_size_hint_align_set(o, 0.5, -1);
302 efl_gfx_size_hint_weight_set(o, 1, 1); 302 efl_gfx_size_hint_weight_set(o, 1, 1);
303 eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); 303 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL);
304 elm_slider_min_max_set(o, 0, 250); 304 elm_slider_min_max_set(o, 0, 250);
305 elm_slider_inverted_set(o, 1); 305 elm_slider_inverted_set(o, 1);
306 elm_slider_value_set(o, 0); 306 elm_slider_value_set(o, 0);
@@ -327,7 +327,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
327 elm_slider_horizontal_set(o, 0); 327 elm_slider_horizontal_set(o, 0);
328 efl_gfx_size_hint_align_set(o, 0.5, -1); 328 efl_gfx_size_hint_align_set(o, 0.5, -1);
329 efl_gfx_size_hint_weight_set(o, 1, 1); 329 efl_gfx_size_hint_weight_set(o, 1, 1);
330 eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, grid); 330 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, grid);
331 elm_slider_min_max_set(o, 0, 40); 331 elm_slider_min_max_set(o, 0, 40);
332 elm_slider_inverted_set(o, 1); 332 elm_slider_inverted_set(o, 1);
333 elm_slider_value_set(o, 10); 333 elm_slider_value_set(o, 10);
@@ -354,7 +354,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
354 elm_slider_horizontal_set(o, 0); 354 elm_slider_horizontal_set(o, 0);
355 efl_gfx_size_hint_align_set(o, 0.5, -1); 355 efl_gfx_size_hint_align_set(o, 0.5, -1);
356 efl_gfx_size_hint_weight_set(o, 1, 1); 356 efl_gfx_size_hint_weight_set(o, 1, 1);
357 eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, grid); 357 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, grid);
358 elm_slider_min_max_set(o, 0, 40); 358 elm_slider_min_max_set(o, 0, 40);
359 elm_slider_inverted_set(o, 1); 359 elm_slider_inverted_set(o, 1);
360 elm_slider_value_set(o, 10); 360 elm_slider_value_set(o, 10);
@@ -381,7 +381,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
381 elm_slider_horizontal_set(o, 0); 381 elm_slider_horizontal_set(o, 0);
382 efl_gfx_size_hint_align_set(o, 0.5, -1); 382 efl_gfx_size_hint_align_set(o, 0.5, -1);
383 efl_gfx_size_hint_weight_set(o, 1, 1); 383 efl_gfx_size_hint_weight_set(o, 1, 1);
384 eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, grid); 384 efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, grid);
385 elm_slider_min_max_set(o, 0, 40); 385 elm_slider_min_max_set(o, 0, 40);
386 elm_slider_inverted_set(o, 1); 386 elm_slider_inverted_set(o, 1);
387 elm_slider_value_set(o, 10); 387 elm_slider_value_set(o, 10);
@@ -403,13 +403,13 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
403 efl_gfx_visible_set(o, 1); 403 efl_gfx_visible_set(o, 1);
404 404
405 o = elm_label_add(win); 405 o = elm_label_add(win);
406 eo_event_callback_add(grid, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o); 406 efl_event_callback_add(grid, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
407 efl_pack(bx, o); 407 efl_pack(bx, o);
408 efl_gfx_visible_set(o, 1); 408 efl_gfx_visible_set(o, 1);
409 409
410 o = elm_label_add(win); 410 o = elm_label_add(win);
411 eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); 411 efl_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
412 eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o); 412 efl_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o);
413 efl_gfx_size_hint_align_set(o, 0.5, 0); 413 efl_gfx_size_hint_align_set(o, 0.5, 0);
414 efl_gfx_size_hint_weight_set(o, 1, 1); 414 efl_gfx_size_hint_weight_set(o, 1, 1);
415 efl_pack(bx, o); 415 efl_pack(bx, o);
@@ -493,7 +493,7 @@ btn_text(const char *str)
493static void 493static void
494remove_cb(void *data EINA_UNUSED, const Eo_Event *ev) 494remove_cb(void *data EINA_UNUSED, const Eo_Event *ev)
495{ 495{
496 eo_del(ev->object); 496 efl_del(ev->object);
497} 497}
498 498
499static void 499static void
@@ -502,7 +502,7 @@ append_cb(void *data, const Eo_Event *ev EINA_UNUSED)
502 Eo *grid = data; 502 Eo *grid = data;
503 Eo *o = elm_button_add(grid); 503 Eo *o = elm_button_add(grid);
504 elm_object_text_set(o, btn_text("appended")); 504 elm_object_text_set(o, btn_text("appended"));
505 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 505 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
506 elm_object_tooltip_text_set(o, "Click to unpack"); 506 elm_object_tooltip_text_set(o, "Click to unpack");
507 efl_pack_end(grid, o); 507 efl_pack_end(grid, o);
508 efl_gfx_visible_set(o, 1); 508 efl_gfx_visible_set(o, 1);
@@ -556,7 +556,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
556 o = elm_button_add(win); 556 o = elm_button_add(win);
557 elm_object_content_set(o, ico); 557 elm_object_content_set(o, ico);
558 elm_object_text_set(o, "Append"); 558 elm_object_text_set(o, "Append");
559 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, grid); 559 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, grid);
560 efl_pack(hbox, o); 560 efl_pack(hbox, o);
561 efl_gfx_visible_set(o, 1); 561 efl_gfx_visible_set(o, 1);
562 562
@@ -565,7 +565,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
565 o = elm_button_add(win); 565 o = elm_button_add(win);
566 elm_object_content_set(o, ico); 566 elm_object_content_set(o, ico);
567 elm_object_text_set(o, "Clear"); 567 elm_object_text_set(o, "Clear");
568 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, grid); 568 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, grid);
569 efl_pack(hbox, o); 569 efl_pack(hbox, o);
570 efl_gfx_visible_set(o, 1); 570 efl_gfx_visible_set(o, 1);
571 571
@@ -584,13 +584,13 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
584 efl_gfx_visible_set(o, 1); 584 efl_gfx_visible_set(o, 1);
585 585
586 o = elm_label_add(win); 586 o = elm_label_add(win);
587 eo_event_callback_add(grid, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o); 587 efl_event_callback_add(grid, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
588 efl_pack(bx, o); 588 efl_pack(bx, o);
589 efl_gfx_visible_set(o, 1); 589 efl_gfx_visible_set(o, 1);
590 590
591 o = elm_label_add(win); 591 o = elm_label_add(win);
592 eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); 592 efl_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
593 eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o); 593 efl_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o);
594 efl_gfx_size_hint_align_set(o, 0.5, 0); 594 efl_gfx_size_hint_align_set(o, 0.5, 0);
595 efl_gfx_size_hint_weight_set(o, 1, 1); 595 efl_gfx_size_hint_weight_set(o, 1, 1);
596 efl_pack(bx, o); 596 efl_pack(bx, o);
@@ -613,19 +613,19 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
613 613
614 o = elm_button_add(win); 614 o = elm_button_add(win);
615 elm_object_text_set(o, btn_text(NULL)); 615 elm_object_text_set(o, btn_text(NULL));
616 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 616 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
617 efl_pack(grid, o); 617 efl_pack(grid, o);
618 efl_gfx_visible_set(o, 1); 618 efl_gfx_visible_set(o, 1);
619 619
620 o = elm_button_add(win); 620 o = elm_button_add(win);
621 elm_object_text_set(o, btn_text(NULL)); 621 elm_object_text_set(o, btn_text(NULL));
622 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 622 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
623 efl_pack(grid, o); 623 efl_pack(grid, o);
624 efl_gfx_visible_set(o, 1); 624 efl_gfx_visible_set(o, 1);
625 625
626 o = elm_button_add(win); 626 o = elm_button_add(win);
627 elm_object_text_set(o, btn_text(NULL)); 627 elm_object_text_set(o, btn_text(NULL));
628 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); 628 efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
629 efl_pack(grid, o); 629 efl_pack(grid, o);
630 efl_gfx_visible_set(o, 1); 630 efl_gfx_visible_set(o, 1);
631 631
diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c
index 4f28f24..72cc6fd 100644
--- a/src/bin/elementary/test_win_plug.c
+++ b/src/bin/elementary/test_win_plug.c
@@ -146,8 +146,8 @@ create_handles(Evas_Object *obj)
146static void 146static void
147_notify_end(void *data EINA_UNUSED, const Eo_Event *event) 147_notify_end(void *data EINA_UNUSED, const Eo_Event *event)
148{ 148{
149 eo_del(event->object); 149 efl_del(event->object);
150 eo_event_callback_stop(event->object); 150 efl_event_callback_stop(event->object);
151} 151}
152 152
153static inline void 153static inline void
@@ -161,7 +161,7 @@ _notify_error(Evas_Object *parent, const char *msg)
161 evas_object_size_hint_weight_set(notif, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 161 evas_object_size_hint_weight_set(notif, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
162 elm_notify_align_set(notif, 0.5, 1.0); 162 elm_notify_align_set(notif, 0.5, 1.0);
163 elm_notify_timeout_set(notif, 3.0); 163 elm_notify_timeout_set(notif, 3.0);
164 eo_event_callback_add(notif, ELM_NOTIFY_EVENT_DISMISSED, _notify_end, NULL); 164 efl_event_callback_add(notif, ELM_NOTIFY_EVENT_DISMISSED, _notify_end, NULL);
165 165
166 txt = elm_label_add(notif); 166 txt = elm_label_add(notif);
167 elm_object_text_set(txt, msg); 167 elm_object_text_set(txt, msg);
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index ee1ce31..5c2259d 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -19,11 +19,11 @@ static Eina_Hash *_funcs_params_init = NULL;
19 19
20static const char 20static const char
21tmpl_eo_ops_desc[] = "\ 21tmpl_eo_ops_desc[] = "\
22static const Eo_Op_Description _@#class_op_desc[] = {@#list_op\n};\n\n"; 22static const Efl_Op_Description _@#class_op_desc[] = {@#list_op\n};\n\n";
23 23
24static const char 24static const char
25tmpl_events_desc[] = "\ 25tmpl_events_desc[] = "\
26static const Eo_Event_Description *_@#class_event_desc[] = {@#list_evdesc\n\ 26static const Efl_Event_Description *_@#class_event_desc[] = {@#list_evdesc\n\
27 NULL\n\ 27 NULL\n\
28};\n\n"; 28};\n\n";
29 29
@@ -35,7 +35,7 @@ tmpl_eo_src[] = "\
35@#dtor_func\ 35@#dtor_func\
36@#ops_desc\ 36@#ops_desc\
37@#events_desc\ 37@#events_desc\
38static const Eo_Class_Description _@#class_class_desc = {\n\ 38static const Efl_Class_Description _@#class_class_desc = {\n\
39 EO_VERSION,\n\ 39 EO_VERSION,\n\
40 \"@#Class\",\n\ 40 \"@#Class\",\n\
41 @#type_class,\n\ 41 @#type_class,\n\
@@ -53,7 +53,7 @@ static const char
53tmpl_eo_obj_header[] = "\ 53tmpl_eo_obj_header[] = "\
54#define @#CLASS_@#CLASSTYPE @#klasstype_get()\n\ 54#define @#CLASS_@#CLASSTYPE @#klasstype_get()\n\
55\n\ 55\n\
56EWAPI const Eo_Class *@#klasstype_get(void);\n\ 56EWAPI const Efl_Class *@#klasstype_get(void);\n\
57\n\ 57\n\
58"; 58";
59 59
@@ -231,7 +231,7 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf *buf)
231 eina_strbuf_append(str_ev, "/**\n * No description\n */\n"); 231 eina_strbuf_append(str_ev, "/**\n * No description\n */\n");
232 232
233 eina_strbuf_append_printf(str_ev, "#define %s (&(_%s))\n", evname, evname); 233 eina_strbuf_append_printf(str_ev, "#define %s (&(_%s))\n", evname, evname);
234 eina_strbuf_append_printf(str_extrn_ev, "EOAPI extern const Eo_Event_Description _%s;\n", evname); 234 eina_strbuf_append_printf(str_extrn_ev, "EOAPI extern const Efl_Event_Description _%s;\n", evname);
235 eina_stringshare_del(evname); 235 eina_stringshare_del(evname);
236 236
237 if (scope == EOLIAN_SCOPE_PROTECTED) 237 if (scope == EOLIAN_SCOPE_PROTECTED)
@@ -657,7 +657,7 @@ eo_source_beginning_generate(const Eolian_Class *class, Eina_Strbuf *buf)
657 Eina_Stringshare *evname = eolian_event_c_name_get(event); 657 Eina_Stringshare *evname = eolian_event_c_name_get(event);
658 658
659 eina_strbuf_append_printf(tmpbuf, 659 eina_strbuf_append_printf(tmpbuf,
660 "EOAPI const Eo_Event_Description _%s =\n EO_EVENT_DESCRIPTION%s%s(\"%s\");\n", 660 "EOAPI const Efl_Event_Description _%s =\n EFL_EVENT_DESCRIPTION%s%s(\"%s\");\n",
661 evname, 661 evname,
662 eolian_event_is_hot(event) ? "_HOT" : "", 662 eolian_event_is_hot(event) ? "_HOT" : "",
663 eolian_event_is_restart(event) ? "_RESTART" : "", 663 eolian_event_is_restart(event) ? "_RESTART" : "",
diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 4002dc6..3aacf47 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -292,7 +292,7 @@ impl_source_generate(const Eolian_Class *class, Eina_Strbuf *buffer)
292 { 292 {
293 printf("Generation of function %s\n", func_name); 293 printf("Generation of function %s\n", func_name);
294 eina_strbuf_append_printf(buffer, 294 eina_strbuf_append_printf(buffer,
295 "EOLIAN static void\n_%s_class_constructor(Eo_Class *klass)\n{\n\n}\n\n", 295 "EOLIAN static void\n_%s_class_constructor(Efl_Class *klass)\n{\n\n}\n\n",
296 class_env.lower_classname); 296 class_env.lower_classname);
297 } 297 }
298 } 298 }
@@ -304,7 +304,7 @@ impl_source_generate(const Eolian_Class *class, Eina_Strbuf *buffer)
304 if (!_function_exists(func_name, buffer)) 304 if (!_function_exists(func_name, buffer))
305 { 305 {
306 printf("Generation of function %s\n", func_name); 306 printf("Generation of function %s\n", func_name);
307 eina_strbuf_append_printf(buffer, "EOLIAN static void\n_%s_class_destructor(Eo_Class *klass)\n{\n\n}\n\n", 307 eina_strbuf_append_printf(buffer, "EOLIAN static void\n_%s_class_destructor(Efl_Class *klass)\n{\n\n}\n\n",
308 class_env.lower_classname); 308 class_env.lower_classname);
309 } 309 }
310 } 310 }
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 0b1ea08..e4ab597 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -201,7 +201,7 @@ static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
201 201
202 inputs = eina_list_remove(inputs, event->object); 202 inputs = eina_list_remove(inputs, event->object);
203 ret = ecore_audio_obj_out_input_detach(out, event->object); 203 ret = ecore_audio_obj_out_input_detach(out, event->object);
204 eo_del(event->object); 204 efl_del(event->object);
205 205
206 if (!ret) 206 if (!ret)
207 printf("Could not detach input %s\n", name); 207 printf("Could not detach input %s\n", name);
@@ -266,7 +266,7 @@ main(int argc, const char *argv[])
266 { 266 {
267 if (!strncmp(val, "freq=", 5)) { 267 if (!strncmp(val, "freq=", 5)) {
268 freq = atoi(&val[5]); 268 freq = atoi(&val[5]);
269 eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq); 269 efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
270 } else if (!strncmp(val, "duration=", 9)) { 270 } else if (!strncmp(val, "duration=", 9)) {
271 ecore_audio_obj_in_length_set(in, atof(&val[9])); 271 ecore_audio_obj_in_length_set(in, atof(&val[9]));
272 } 272 }
@@ -291,7 +291,7 @@ main(int argc, const char *argv[])
291 continue; 291 continue;
292 } 292 }
293 } 293 }
294 eo_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL); 294 efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
295 inputs = eina_list_append(inputs, in); 295 inputs = eina_list_append(inputs, in);
296 } 296 }
297 297
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 2e1e92c..13abdb1 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -24,8 +24,8 @@ static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
24 printf("Done: %s\n", name); 24 printf("Done: %s\n", name);
25 25
26 ecore_audio_obj_in_output_get(event->object, &out); 26 ecore_audio_obj_in_output_get(event->object, &out);
27 eo_del(event->object); 27 efl_del(event->object);
28 eo_del(out); 28 efl_del(out);
29 29
30 ecore_main_loop_quit(); 30 ecore_main_loop_quit();
31 31
@@ -54,26 +54,26 @@ main(int argc, char *argv[])
54 ret = ecore_audio_obj_source_set(in, argv[1]); 54 ret = ecore_audio_obj_source_set(in, argv[1]);
55 if (!ret) { 55 if (!ret) {
56 printf("Could not set %s as input\n", argv[1]); 56 printf("Could not set %s as input\n", argv[1]);
57 eo_del(in); 57 efl_del(in);
58 return 1; 58 return 1;
59 } 59 }
60 60
61 eo_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL); 61 efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
62 62
63 out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL); 63 out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
64 ret = ecore_audio_obj_source_set(out, argv[2]); 64 ret = ecore_audio_obj_source_set(out, argv[2]);
65 if (!ret) { 65 if (!ret) {
66 printf("Could not set %s as output\n", argv[2]); 66 printf("Could not set %s as output\n", argv[2]);
67 eo_del(in); 67 efl_del(in);
68 eo_del(out); 68 efl_del(out);
69 return 1; 69 return 1;
70 } 70 }
71 71
72 ret = ecore_audio_obj_out_input_attach(out, in); 72 ret = ecore_audio_obj_out_input_attach(out, in);
73 if (!ret) { 73 if (!ret) {
74 printf("Could not attach input\n"); 74 printf("Could not attach input\n");
75 eo_del(out); 75 efl_del(out);
76 eo_del(in); 76 efl_del(in);
77 return 1; 77 return 1;
78 } 78 }
79 79
diff --git a/src/examples/eio/efl_io_manager_ls.c b/src/examples/eio/efl_io_manager_ls.c
index c231bad..a411de1 100644
--- a/src/examples/eio/efl_io_manager_ls.c
+++ b/src/examples/eio/efl_io_manager_ls.c
@@ -52,7 +52,7 @@ void list_files(void *data)
52 const char *path = data; 52 const char *path = data;
53 53
54 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 54 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
55 eo_event_callback_add(job, EFL_IO_MANAGER_EVENT_FILTER_NAME, (Eo_Event_Cb)&filter_cb, NULL); 55 efl_event_callback_add(job, EFL_IO_MANAGER_EVENT_FILTER_NAME, (Efl_Event_Cb)&filter_cb, NULL);
56 promise = efl_io_manager_file_ls(job, path); 56 promise = efl_io_manager_file_ls(job, path);
57 eina_promise_progress_cb_add(promise, (Eina_Promise_Progress_Cb)&progress_cb, NULL, NULL); 57 eina_promise_progress_cb_add(promise, (Eina_Promise_Progress_Cb)&progress_cb, NULL, NULL);
58 eina_promise_then(promise, &done_cb, &error_cb, job); 58 eina_promise_then(promise, &done_cb, &error_cb, job);
diff --git a/src/examples/eio/eio_sentry.c b/src/examples/eio/eio_sentry.c
index 2952902..9f8d03d 100644
--- a/src/examples/eio/eio_sentry.c
+++ b/src/examples/eio/eio_sentry.c
@@ -20,7 +20,7 @@ sentry_cb(void *data EINA_UNUSED, const Eo_Event *event)
20 20
21 ecore_main_loop_quit(); 21 ecore_main_loop_quit();
22 22
23 eo_event_callback_stop(event->object); 23 efl_event_callback_stop(event->object);
24} 24}
25 25
26void 26void
@@ -28,7 +28,7 @@ monitor_stuff(void *data)
28{ 28{
29 const char *path = data; 29 const char *path = data;
30 Eio_Sentry *sentry = eo_add(EIO_SENTRY_CLASS, NULL); 30 Eio_Sentry *sentry = eo_add(EIO_SENTRY_CLASS, NULL);
31 eo_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Eo_Event_Cb)&sentry_cb, NULL); 31 efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)&sentry_cb, NULL);
32 32
33 printf("Starting monitoring path %s\n", path); 33 printf("Starting monitoring path %s\n", path);
34 eio_sentry_add(sentry, path); 34 eio_sentry_add(sentry, path);
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index 0995021..b669c02 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -160,7 +160,7 @@ elm_main(int argc, char **argv)
160 vpanes = elm_panes_add(win); 160 vpanes = elm_panes_add(win);
161 _widget_init(vpanes); 161 _widget_init(vpanes);
162 elm_object_part_content_set(panes, "right", vpanes); 162 elm_object_part_content_set(panes, "right", vpanes);
163 eo_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv); 163 efl_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv);
164 164
165 //listview 165 //listview
166 genlist = elm_genlist_add(win); 166 genlist = elm_genlist_add(win);
@@ -172,7 +172,7 @@ elm_main(int argc, char **argv)
172 _widget_init(genlist); 172 _widget_init(genlist);
173 elm_object_part_content_set(vpanes, "left", genlist); 173 elm_object_part_content_set(vpanes, "left", genlist);
174 174
175 eo_event_callback_add(priv.fileview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _list_selected_cb, &priv); 175 efl_event_callback_add(priv.fileview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _list_selected_cb, &priv);
176 176
177 //formview 177 //formview
178 bxr = elm_box_add(win); 178 bxr = elm_box_add(win);
diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 239655e..1dd5822 100644
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -289,7 +289,7 @@ _change_scene_setup()
289 { 289 {
290 evas_canvas3d_node_member_del(globalGraphical.root_node, node); 290 evas_canvas3d_node_member_del(globalGraphical.root_node, node);
291 globalGraphical.list_nodes = eina_list_remove(globalGraphical.list_nodes, node); 291 globalGraphical.list_nodes = eina_list_remove(globalGraphical.list_nodes, node);
292 /*eo_del(node);Unless evas_canvas3d_destructors work properly*/ 292 /*efl_del(node);Unless evas_canvas3d_destructors work properly*/
293 } 293 }
294 eina_list_free(globalGraphical.list_nodes); 294 eina_list_free(globalGraphical.list_nodes);
295 eina_list_free(l); 295 eina_list_free(l);
@@ -298,7 +298,7 @@ _change_scene_setup()
298 EINA_LIST_FOREACH (globalGraphical.list_meshes, l, m) 298 EINA_LIST_FOREACH (globalGraphical.list_meshes, l, m)
299 { 299 {
300 globalGraphical.list_meshes = eina_list_remove(globalGraphical.list_meshes, m); 300 globalGraphical.list_meshes = eina_list_remove(globalGraphical.list_meshes, m);
301 /*eo_del(m); Unless evas_canvas3d_destructors work properly*/ 301 /*efl_del(m); Unless evas_canvas3d_destructors work properly*/
302 } 302 }
303 eina_list_free(globalGraphical.list_meshes); 303 eina_list_free(globalGraphical.list_meshes);
304 eina_list_free(l); 304 eina_list_free(l);
diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c
index 7f14486..5ea23bf 100644
--- a/src/examples/emotion/emotion_basic_example.c
+++ b/src/examples/emotion/emotion_basic_example.c
@@ -62,7 +62,7 @@ main(int argc, const char *argv[])
62 em = emotion_object_add(e); 62 em = emotion_object_add(e);
63 emotion_object_init(em, NULL); 63 emotion_object_init(em, NULL);
64 64
65 eo_event_callback_add 65 efl_event_callback_add
66 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 66 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
67 67
68 emotion_object_file_set(em, filename); 68 emotion_object_file_set(em, filename);
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index e106a11..d2328a6 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -30,7 +30,7 @@ _create_emotion_object(Evas *e)
30 30
31 emotion_object_init(em, "gstreamer1"); 31 emotion_object_init(em, "gstreamer1");
32 32
33 eo_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 33 efl_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
34 34
35 return em; 35 return em;
36} 36}
@@ -220,7 +220,7 @@ main(int argc, const char *argv[])
220 220
221 ecore_evas_data_set(ee, "emotion", em); 221 ecore_evas_data_set(ee, "emotion", em);
222 222
223 eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL); 223 efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
224 224
225 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em); 225 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
226 evas_object_focus_set(bg, EINA_TRUE); 226 evas_object_focus_set(bg, EINA_TRUE);
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index f7afeba..71c8e7d 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -39,9 +39,9 @@ _create_emotion_object(Evas *e)
39 39
40 emotion_object_init(em, "generic"); 40 emotion_object_init(em, "generic");
41 41
42 eo_event_callback_add 42 efl_event_callback_add
43 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 43 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
44 eo_event_callback_add 44 efl_event_callback_add
45 (em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL); 45 (em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL);
46 46
47 return em; 47 return em;
@@ -207,7 +207,7 @@ main(int argc, const char *argv[])
207 evas_object_resize(em, WIDTH, HEIGHT); 207 evas_object_resize(em, WIDTH, HEIGHT);
208 evas_object_show(em); 208 evas_object_show(em);
209 209
210 eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL); 210 efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
211 211
212 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em); 212 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
213 evas_object_focus_set(bg, EINA_TRUE); 213 evas_object_focus_set(bg, EINA_TRUE);
diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c
index 8bfa151..275298b 100644
--- a/src/examples/emotion/emotion_generic_subtitle_example.c
+++ b/src/examples/emotion/emotion_generic_subtitle_example.c
@@ -77,7 +77,7 @@ main(int argc, const char *argv[])
77 if (subtitle_filename) 77 if (subtitle_filename)
78 emotion_object_video_subtitle_file_set(em, subtitle_filename); 78 emotion_object_video_subtitle_file_set(em, subtitle_filename);
79 79
80 eo_event_callback_add 80 efl_event_callback_add
81 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 81 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
82 82
83 emotion_object_file_set(em, filename); 83 emotion_object_file_set(em, filename);
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index c85f86a..7cf57e3 100644
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -58,7 +58,7 @@ static void
58_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) 58_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
59{ 59{
60 printf(">>> Emotion object first position update.\n"); 60 printf(">>> Emotion object first position update.\n");
61 eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); 61 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL);
62 _display_info(ev->object); 62 _display_info(ev->object);
63} 63}
64 64
@@ -66,7 +66,7 @@ static void
66_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev) 66_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev)
67{ 67{
68 printf(">>> Emotion object first frame decode.\n"); 68 printf(">>> Emotion object first frame decode.\n");
69 eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); 69 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
70 _display_info(ev->object); 70 _display_info(ev->object);
71} 71}
72 72
@@ -144,7 +144,7 @@ main(int argc, const char *argv[])
144 fprintf(stderr, "Emotion: \"%s\" module could not be initialized.\n", module); 144 fprintf(stderr, "Emotion: \"%s\" module could not be initialized.\n", module);
145 145
146 _display_info(em); 146 _display_info(em);
147 eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL); 147 efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
148 148
149 if (!emotion_object_file_set(em, filename)) 149 if (!emotion_object_file_set(em, filename))
150 fprintf(stderr, "Emotion: Could not load the file \"%s\"\n", filename); 150 fprintf(stderr, "Emotion: Could not load the file \"%s\"\n", filename);
diff --git a/src/examples/eolian_cxx/colourable.c b/src/examples/eolian_cxx/colourable.c
index 04c233a..3dcaf36 100644
--- a/src/examples/eolian_cxx/colourable.c
+++ b/src/examples/eolian_cxx/colourable.c
@@ -27,7 +27,7 @@ struct _Colourable_Data
27typedef struct _Colourable_Data Colourable_Data; 27typedef struct _Colourable_Data Colourable_Data;
28 28
29Eo * 29Eo *
30_ns_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED) 30_ns_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
31{ 31{
32 if(!_ns_colourable_impl_logdomain) 32 if(!_ns_colourable_impl_logdomain)
33 { 33 {
@@ -35,11 +35,11 @@ _ns_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
35 = eina_log_domain_register("colourable", EINA_COLOR_BLUE); 35 = eina_log_domain_register("colourable", EINA_COLOR_BLUE);
36 } 36 }
37 DBG("_ns_colourable_constructor(%p, %p)\n", obj, MY_CLASS); 37 DBG("_ns_colourable_constructor(%p, %p)\n", obj, MY_CLASS);
38 return eo_constructor(eo_super(obj, MY_CLASS)); 38 return efl_constructor(eo_super(obj, MY_CLASS));
39} 39}
40 40
41void 41void
42_ns_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED) 42_ns_colourable_efl_object_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
43{ 43{
44 if(_ns_colourable_impl_logdomain) 44 if(_ns_colourable_impl_logdomain)
45 { 45 {
@@ -47,7 +47,7 @@ _ns_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
47 _ns_colourable_impl_logdomain = 0; 47 _ns_colourable_impl_logdomain = 0;
48 } 48 }
49 DBG("_ns_colourable_destructor()\n"); 49 DBG("_ns_colourable_destructor()\n");
50 eo_destructor(eo_super(obj, MY_CLASS)); 50 efl_destructor(eo_super(obj, MY_CLASS));
51} 51}
52 52
53void 53void
diff --git a/src/examples/eolian_cxx/colourable_stub.h b/src/examples/eolian_cxx/colourable_stub.h
index 26b44b1..e57d7f0 100644
--- a/src/examples/eolian_cxx/colourable_stub.h
+++ b/src/examples/eolian_cxx/colourable_stub.h
@@ -13,8 +13,8 @@ struct _Colourable_Data
13}; 13};
14typedef struct _Colourable_Data Colourable_Data; 14typedef struct _Colourable_Data Colourable_Data;
15 15
16Eo *_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self); 16Eo *_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self);
17void _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self); 17void _colourable_efl_object_destructor(Eo *obj, Colourable_Data *self);
18void _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb); 18void _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb);
19void _colourable_print_colour(Eo *obj, Colourable_Data *self); 19void _colourable_print_colour(Eo *obj, Colourable_Data *self);
20void _colourable_print_colour(Eo *obj, Colourable_Data *self); 20void _colourable_print_colour(Eo *obj, Colourable_Data *self);
diff --git a/src/examples/eolian_cxx/ns_colourable.eo b/src/examples/eolian_cxx/ns_colourable.eo
index 21af926..bfb08b2 100644
--- a/src/examples/eolian_cxx/ns_colourable.eo
+++ b/src/examples/eolian_cxx/ns_colourable.eo
@@ -1,4 +1,4 @@
1class Ns.Colourable (Eo.Base) 1class Ns.Colourable (Efl.Object)
2{ 2{
3 [[Colourable class.]] 3 [[Colourable class.]]
4 data: Colourable_Data; 4 data: Colourable_Data;
@@ -44,8 +44,8 @@ class Ns.Colourable (Eo.Base)
44 } 44 }
45 } 45 }
46 implements { 46 implements {
47 Eo.Base.constructor; 47 Efl.Object.constructor;
48 Eo.Base.destructor; 48 Efl.Object.destructor;
49 } 49 }
50 constructors { 50 constructors {
51 .rgb_24bits_constructor; 51 .rgb_24bits_constructor;
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index e7eeb1d..2467340 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -655,14 +655,14 @@ main(void)
655 nodes2 = eina_list_append(nodes2, data.cone.node); 655 nodes2 = eina_list_append(nodes2, data.cone.node);
656 656
657 /*Set callbacks*/ 657 /*Set callbacks*/
658 eo_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL); 658 efl_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
659 eo_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes2); 659 efl_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes2);
660 660
661 eo_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL); 661 efl_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
662 eo_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1); 662 efl_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
663 663
664 eo_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL); 664 efl_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
665 eo_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1); 665 efl_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
666 666
667 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, &data); 667 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, &data);
668 evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _on_key_down, &data); 668 evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _on_key_down, &data);
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 487cfd6..61a646b 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -204,7 +204,7 @@ vector_set(int x, int y, int w, int h)
204 204
205 root_node = evas_object_vg_root_node_get(d.vg); 205 root_node = evas_object_vg_root_node_get(d.vg);
206 // check if the dupe is working properly or not 206 // check if the dupe is working properly or not
207 eo_parent_set(beginning, root_node); 207 efl_parent_set(beginning, root_node);
208 208
209 tmp_vg = root; 209 tmp_vg = root;
210 root = beginning; 210 root = beginning;
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 ;