summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore/Ecore_Eo.h2
-rw-r--r--src/lib/ecore/ecore.c14
-rw-r--r--src/lib/ecore/ecore_exe.c82
-rw-r--r--src/lib/ecore/ecore_exe_posix.c16
-rw-r--r--src/lib/ecore/ecore_exe_win32.c10
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c4
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c2
-rw-r--r--src/lib/ecore/ecore_idler.c4
-rw-r--r--src/lib/ecore/ecore_main.c28
-rw-r--r--src/lib/ecore/ecore_poller.c30
-rw-r--r--src/lib/ecore/ecore_timer.c44
-rw-r--r--src/lib/ecore/efl_loop_fd.c8
-rw-r--r--src/lib/ecore/efl_loop_user.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio.c4
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c10
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c18
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c14
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c16
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c26
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c30
-rw-r--r--src/lib/ecore_audio/ecore_audio_sndfile_vio.c10
-rw-r--r--src/lib/ecore_con/ecore_con.c174
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c76
-rw-r--r--src/lib/ecore_con/ecore_con_info.c2
-rw-r--r--src/lib/ecore_con/ecore_con_local.c4
-rw-r--r--src/lib/ecore_con/ecore_con_local_win32.c42
-rw-r--r--src/lib/ecore_con/ecore_con_socks.c16
-rw-r--r--src/lib/ecore_con/ecore_con_ssl.c90
-rw-r--r--src/lib/ecore_con/ecore_con_url.c158
-rw-r--r--src/lib/ecore_evas/ecore_evas.c2
-rw-r--r--src/lib/ector/cairo/ector_cairo_software_surface.c12
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.c12
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.c16
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c38
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c38
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c32
-rw-r--r--src/lib/ector/ector_main.c6
-rw-r--r--src/lib/ector/ector_private.h12
-rw-r--r--src/lib/ector/ector_renderer.c10
-rw-r--r--src/lib/ector/ector_renderer_buffer.c2
-rw-r--r--src/lib/ector/ector_renderer_shape.c6
-rw-r--r--src/lib/ector/gl/ector_gl_surface.c12
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.c6
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c20
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c20
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c20
-rw-r--r--src/lib/ector/software/ector_renderer_software_buffer.c14
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.c24
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.c24
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c22
-rw-r--r--src/lib/ector/software/ector_software_buffer.c12
-rw-r--r--src/lib/ector/software/ector_software_rasterizer.c2
-rw-r--r--src/lib/ector/software/ector_software_surface.c18
-rw-r--r--src/lib/edje/edje_box_layout.c2
-rw-r--r--src/lib/edje/edje_calc.c4
-rw-r--r--src/lib/edje/edje_callbacks.c16
-rw-r--r--src/lib/edje/edje_containers.c18
-rw-r--r--src/lib/edje/edje_edit.c30
-rw-r--r--src/lib/edje/edje_load.c30
-rw-r--r--src/lib/edje/edje_multisense.c12
-rw-r--r--src/lib/edje/edje_smart.c30
-rw-r--r--src/lib/edje/edje_util.c24
-rw-r--r--src/lib/efl/interfaces/efl_gfx_shape.c12
-rw-r--r--src/lib/efl/interfaces/efl_input_device.c14
-rw-r--r--src/lib/efl/interfaces/efl_model_common.c2
-rw-r--r--src/lib/efl/interfaces/efl_vpath_core.c8
-rw-r--r--src/lib/efl/interfaces/efl_vpath_file_core.c10
-rw-r--r--src/lib/efl/interfaces/efl_vpath_manager.c2
-rw-r--r--src/lib/eio/efl_io_manager.c8
-rw-r--r--src/lib/eio/eio_main.c2
-rw-r--r--src/lib/eio/eio_model.c38
-rw-r--r--src/lib/eio/eio_sentry.c4
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.c4
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c8
-rw-r--r--src/lib/eldbus/eldbus_model_method.c8
-rw-r--r--src/lib/eldbus/eldbus_model_object.c8
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c10
-rw-r--r--src/lib/eldbus/eldbus_model_signal.c10
-rw-r--r--src/lib/elementary/efl_ui_box.c14
-rw-r--r--src/lib/elementary/efl_ui_box_flow.c8
-rw-r--r--src/lib/elementary/efl_ui_box_layout.c2
-rw-r--r--src/lib/elementary/efl_ui_flip.c20
-rw-r--r--src/lib/elementary/efl_ui_frame.c6
-rw-r--r--src/lib/elementary/efl_ui_grid.c30
-rw-r--r--src/lib/elementary/efl_ui_grid_static.c6
-rw-r--r--src/lib/elementary/efl_ui_image.c44
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c26
-rw-r--r--src/lib/elementary/efl_ui_nstate.c8
-rw-r--r--src/lib/elementary/efl_ui_text.c74
-rw-r--r--src/lib/elementary/efl_ui_video.c12
-rw-r--r--src/lib/elementary/efl_ui_video_legacy.h4
-rw-r--r--src/lib/elementary/efl_ui_video_private.h4
-rw-r--r--src/lib/elementary/efl_ui_widget_flip.h4
-rw-r--r--src/lib/elementary/efl_ui_widget_frame.h4
-rw-r--r--src/lib/elementary/efl_ui_widget_image.h4
-rw-r--r--src/lib/elementary/efl_ui_win.c46
-rw-r--r--src/lib/elementary/efl_ui_win_standard.c4
-rw-r--r--src/lib/elementary/elc_combobox.c24
-rw-r--r--src/lib/elementary/elc_ctxpopup.c46
-rw-r--r--src/lib/elementary/elc_fileselector.c138
-rw-r--r--src/lib/elementary/elc_fileselector_button.c42
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c32
-rw-r--r--src/lib/elementary/elc_hoversel.c32
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c50
-rw-r--r--src/lib/elementary/elc_naviframe.c26
-rw-r--r--src/lib/elementary/elc_player.c18
-rw-r--r--src/lib/elementary/elc_popup.c28
-rw-r--r--src/lib/elementary/elm_access.c6
-rw-r--r--src/lib/elementary/elm_actionslider.c14
-rw-r--r--src/lib/elementary/elm_app_client.c18
-rw-r--r--src/lib/elementary/elm_app_client_view.c12
-rw-r--r--src/lib/elementary/elm_app_server.c16
-rw-r--r--src/lib/elementary/elm_app_server_view.c26
-rw-r--r--src/lib/elementary/elm_atspi_app_object.c4
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c40
-rw-r--r--src/lib/elementary/elm_bg.c6
-rw-r--r--src/lib/elementary/elm_box.c12
-rw-r--r--src/lib/elementary/elm_bubble.c8
-rw-r--r--src/lib/elementary/elm_button.c12
-rw-r--r--src/lib/elementary/elm_calendar.c34
-rw-r--r--src/lib/elementary/elm_check.c14
-rw-r--r--src/lib/elementary/elm_clock.c10
-rw-r--r--src/lib/elementary/elm_cnp.c22
-rw-r--r--src/lib/elementary/elm_code_diff_widget.c4
-rw-r--r--src/lib/elementary/elm_code_widget.c76
-rw-r--r--src/lib/elementary/elm_code_widget_selection.c16
-rw-r--r--src/lib/elementary/elm_code_widget_undo.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c30
-rw-r--r--src/lib/elementary/elm_config.c2
-rw-r--r--src/lib/elementary/elm_conform.c14
-rw-r--r--src/lib/elementary/elm_datetime.c16
-rw-r--r--src/lib/elementary/elm_dayselector.c26
-rw-r--r--src/lib/elementary/elm_diskselector.c32
-rw-r--r--src/lib/elementary/elm_entry.c50
-rw-r--r--src/lib/elementary/elm_flipselector.c18
-rw-r--r--src/lib/elementary/elm_gengrid.c88
-rw-r--r--src/lib/elementary/elm_genlist.c102
-rw-r--r--src/lib/elementary/elm_gesture_layer.c12
-rw-r--r--src/lib/elementary/elm_glview.c18
-rw-r--r--src/lib/elementary/elm_grid.c10
-rw-r--r--src/lib/elementary/elm_hover.c36
-rw-r--r--src/lib/elementary/elm_icon.c24
-rw-r--r--src/lib/elementary/elm_index.c26
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c20
-rw-r--r--src/lib/elementary/elm_interface_atspi_component.c2
-rw-r--r--src/lib/elementary/elm_interface_atspi_widget_action.c2
-rw-r--r--src/lib/elementary/elm_interface_fileselector.h2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c28
-rw-r--r--src/lib/elementary/elm_interface_scrollable.h2
-rw-r--r--src/lib/elementary/elm_inwin.c8
-rw-r--r--src/lib/elementary/elm_label.c10
-rw-r--r--src/lib/elementary/elm_layout.c36
-rw-r--r--src/lib/elementary/elm_layout_pack.c22
-rw-r--r--src/lib/elementary/elm_list.c46
-rw-r--r--src/lib/elementary/elm_main.c2
-rw-r--r--src/lib/elementary/elm_map.c28
-rw-r--r--src/lib/elementary/elm_mapbuf.c20
-rw-r--r--src/lib/elementary/elm_menu.c38
-rw-r--r--src/lib/elementary/elm_notify.c24
-rw-r--r--src/lib/elementary/elm_panel.c30
-rw-r--r--src/lib/elementary/elm_panes.c8
-rw-r--r--src/lib/elementary/elm_part_helper.h30
-rw-r--r--src/lib/elementary/elm_photo.c10
-rw-r--r--src/lib/elementary/elm_photocam.c36
-rw-r--r--src/lib/elementary/elm_plug.c10
-rw-r--r--src/lib/elementary/elm_prefs.c8
-rw-r--r--src/lib/elementary/elm_progressbar.c14
-rw-r--r--src/lib/elementary/elm_radio.c12
-rw-r--r--src/lib/elementary/elm_removed.h2
-rw-r--r--src/lib/elementary/elm_route.c10
-rw-r--r--src/lib/elementary/elm_scroller.c28
-rw-r--r--src/lib/elementary/elm_segment_control.c24
-rw-r--r--src/lib/elementary/elm_separator.c8
-rw-r--r--src/lib/elementary/elm_slider.c12
-rw-r--r--src/lib/elementary/elm_slideshow.c18
-rw-r--r--src/lib/elementary/elm_spinner.c14
-rw-r--r--src/lib/elementary/elm_sys_notify.c8
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus.c4
-rw-r--r--src/lib/elementary/elm_table.c12
-rw-r--r--src/lib/elementary/elm_theme.c2
-rw-r--r--src/lib/elementary/elm_thumb.c28
-rw-r--r--src/lib/elementary/elm_toolbar.c36
-rw-r--r--src/lib/elementary/elm_view_form.c14
-rw-r--r--src/lib/elementary/elm_view_list.c22
-rw-r--r--src/lib/elementary/elm_web2.c4
-rw-r--r--src/lib/elementary/elm_widget.c124
-rw-r--r--src/lib/elementary/elm_widget.h8
-rw-r--r--src/lib/elementary/elm_widget_actionslider.h4
-rw-r--r--src/lib/elementary/elm_widget_bg.h4
-rw-r--r--src/lib/elementary/elm_widget_box.h4
-rw-r--r--src/lib/elementary/elm_widget_bubble.h4
-rw-r--r--src/lib/elementary/elm_widget_button.h4
-rw-r--r--src/lib/elementary/elm_widget_calendar.h4
-rw-r--r--src/lib/elementary/elm_widget_check.h4
-rw-r--r--src/lib/elementary/elm_widget_clipper.h4
-rw-r--r--src/lib/elementary/elm_widget_clock.h4
-rw-r--r--src/lib/elementary/elm_widget_colorselector.h10
-rw-r--r--src/lib/elementary/elm_widget_combobox.h4
-rw-r--r--src/lib/elementary/elm_widget_conform.h4
-rw-r--r--src/lib/elementary/elm_widget_ctxpopup.h6
-rw-r--r--src/lib/elementary/elm_widget_datetime.h4
-rw-r--r--src/lib/elementary/elm_widget_dayselector.h6
-rw-r--r--src/lib/elementary/elm_widget_diskselector.h8
-rw-r--r--src/lib/elementary/elm_widget_entry.h4
-rw-r--r--src/lib/elementary/elm_widget_fileselector.h4
-rw-r--r--src/lib/elementary/elm_widget_fileselector_button.h4
-rw-r--r--src/lib/elementary/elm_widget_fileselector_entry.h4
-rw-r--r--src/lib/elementary/elm_widget_flipselector.h10
-rw-r--r--src/lib/elementary/elm_widget_gengrid.h10
-rw-r--r--src/lib/elementary/elm_widget_genlist.h10
-rw-r--r--src/lib/elementary/elm_widget_glview.h4
-rw-r--r--src/lib/elementary/elm_widget_grid.h2
-rw-r--r--src/lib/elementary/elm_widget_hover.h4
-rw-r--r--src/lib/elementary/elm_widget_hoversel.h10
-rw-r--r--src/lib/elementary/elm_widget_icon.h4
-rw-r--r--src/lib/elementary/elm_widget_index.h10
-rw-r--r--src/lib/elementary/elm_widget_inwin.h4
-rw-r--r--src/lib/elementary/elm_widget_label.h4
-rw-r--r--src/lib/elementary/elm_widget_layout.h4
-rw-r--r--src/lib/elementary/elm_widget_list.h6
-rw-r--r--src/lib/elementary/elm_widget_map.h6
-rw-r--r--src/lib/elementary/elm_widget_mapbuf.h4
-rw-r--r--src/lib/elementary/elm_widget_menu.h10
-rw-r--r--src/lib/elementary/elm_widget_multibuttonentry.h12
-rw-r--r--src/lib/elementary/elm_widget_naviframe.h10
-rw-r--r--src/lib/elementary/elm_widget_notify.h4
-rw-r--r--src/lib/elementary/elm_widget_panel.h4
-rw-r--r--src/lib/elementary/elm_widget_panes.h4
-rw-r--r--src/lib/elementary/elm_widget_photo.h4
-rw-r--r--src/lib/elementary/elm_widget_photocam.h6
-rw-r--r--src/lib/elementary/elm_widget_player.h4
-rw-r--r--src/lib/elementary/elm_widget_plug.h4
-rw-r--r--src/lib/elementary/elm_widget_popup.h6
-rw-r--r--src/lib/elementary/elm_widget_prefs.h4
-rw-r--r--src/lib/elementary/elm_widget_progressbar.h4
-rw-r--r--src/lib/elementary/elm_widget_radio.h4
-rw-r--r--src/lib/elementary/elm_widget_route.h4
-rw-r--r--src/lib/elementary/elm_widget_scroller.h4
-rw-r--r--src/lib/elementary/elm_widget_segment_control.h10
-rw-r--r--src/lib/elementary/elm_widget_separator.h4
-rw-r--r--src/lib/elementary/elm_widget_slider.h4
-rw-r--r--src/lib/elementary/elm_widget_slideshow.h10
-rw-r--r--src/lib/elementary/elm_widget_spinner.h4
-rw-r--r--src/lib/elementary/elm_widget_table.h2
-rw-r--r--src/lib/elementary/elm_widget_thumb.h4
-rw-r--r--src/lib/elementary/elm_widget_toolbar.h8
-rw-r--r--src/lib/elementary/elm_widget_web.h4
-rw-r--r--src/lib/elementary/els_cursor.c2
-rw-r--r--src/lib/elementary/els_tooltip.c2
-rw-r--r--src/lib/emotion/emotion_modules.c4
-rw-r--r--src/lib/emotion/emotion_modules.h2
-rw-r--r--src/lib/emotion/emotion_private.h2
-rw-r--r--src/lib/emotion/emotion_smart.c14
-rw-r--r--src/lib/eo/Eo.h490
-rw-r--r--src/lib/eo/eo.c254
-rw-r--r--src/lib/eo/eo_add_fallback.c50
-rw-r--r--src/lib/eo/eo_add_fallback.h8
-rw-r--r--src/lib/eo/eo_base_class.c34
-rw-r--r--src/lib/eo/eo_private.h12
-rw-r--r--src/lib/evas/Evas_Common.h4
-rw-r--r--src/lib/evas/Evas_Legacy.h4
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c108
-rw-r--r--src/lib/evas/canvas/efl_canvas_proxy.c50
-rw-r--r--src/lib/evas/canvas/efl_canvas_scene3d.c30
-rw-r--r--src/lib/evas/canvas/efl_canvas_snapshot.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_tbm.c10
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_wayland.c10
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_x11.c10
-rw-r--r--src/lib/evas/canvas/efl_event_hold.c10
-rw-r--r--src/lib/evas/canvas/efl_event_key.c8
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.c8
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c26
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.c16
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.c12
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.c16
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c18
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c88
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_primitive.c6
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c30
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.c56
-rw-r--r--src/lib/evas/canvas/evas_clip.c6
-rw-r--r--src/lib/evas/canvas/evas_device.c44
-rw-r--r--src/lib/evas/canvas/evas_events.c286
-rw-r--r--src/lib/evas/canvas/evas_events_legacy.c6
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c32
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c16
-rw-r--r--src/lib/evas/canvas/evas_gl.c8
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c92
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c4
-rw-r--r--src/lib/evas/canvas/evas_layer.c20
-rw-r--r--src/lib/evas/canvas/evas_main.c54
-rw-r--r--src/lib/evas/canvas/evas_map.c22
-rw-r--r--src/lib/evas/canvas/evas_name.c10
-rw-r--r--src/lib/evas/canvas/evas_object_box.c14
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c8
-rw-r--r--src/lib/evas/canvas/evas_object_image.c136
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c16
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c10
-rw-r--r--src/lib/evas/canvas/evas_object_line.c18
-rw-r--r--src/lib/evas/canvas/evas_object_main.c156
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c22
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c14
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c152
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c14
-rw-r--r--src/lib/evas/canvas/evas_object_table.c12
-rw-r--r--src/lib/evas/canvas/evas_object_text.c92
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c486
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c54
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c36
-rw-r--r--src/lib/evas/canvas/evas_out.c16
-rw-r--r--src/lib/evas/canvas/evas_render.c50
-rw-r--r--src/lib/evas/canvas/evas_stack.c4
-rw-r--r--src/lib/evas/canvas/evas_textblock_hyphenation.x4
-rw-r--r--src/lib/evas/canvas/evas_touch_point.c6
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c28
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient.c10
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c20
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c20
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c52
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h4
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c16
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c46
-rw-r--r--src/lib/evas/canvas/render2/evas_render2.c2
-rw-r--r--src/lib/evas/canvas/render2/evas_render2_old.c14
-rw-r--r--src/lib/evas/canvas/render2/evas_render2_th_main.c6
-rw-r--r--src/lib/evas/common3d/save_load/evas_model_load_save_common.c2
-rw-r--r--src/lib/evas/filters/evas_filter.c8
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c6
-rw-r--r--src/lib/evas/include/evas_inline.x8
-rw-r--r--src/lib/evas/include/evas_private.h12
334 files changed, 3992 insertions, 3992 deletions
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 60d4367..a7e8d93 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -54,7 +54,7 @@ extern "C" {
54 54
55#include "efl_loop_fd.eo.h" 55#include "efl_loop_fd.eo.h"
56 56
57/* We ue the factory pattern here, so you shouldn't call eo_add directly. */ 57/* We ue the factory pattern here, so you shouldn't call efl_add directly. */
58EAPI Eo *ecore_main_loop_get(void); 58EAPI Eo *ecore_main_loop_get(void);
59 59
60/** 60/**
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 3a96c1c..b09184e 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -243,17 +243,17 @@ ecore_init(void)
243 goto shutdown_log_dom; 243 goto shutdown_log_dom;
244 } 244 }
245 245
246 eo_init(); 246 efl_object_init();
247 247
248 if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1; 248 if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
249 if (_ecore_fps_debug) _ecore_fps_debug_init(); 249 if (_ecore_fps_debug) _ecore_fps_debug_init();
250 if (!ecore_mempool_init()) goto shutdown_mempool; 250 if (!ecore_mempool_init()) goto shutdown_mempool;
251 _ecore_main_loop_init(); 251 _ecore_main_loop_init();
252 252
253 vpath = eo_add(EFL_VPATH_CORE_CLASS, NULL); 253 vpath = efl_add(EFL_VPATH_CORE_CLASS, NULL);
254 if (vpath) efl_vpath_manager_register(EFL_VPATH_MANAGER_CLASS, 0, vpath); 254 if (vpath) efl_vpath_manager_register(EFL_VPATH_MANAGER_CLASS, 0, vpath);
255 255
256 _mainloop_singleton = eo_add(EFL_LOOP_CLASS, NULL); 256 _mainloop_singleton = efl_add(EFL_LOOP_CLASS, NULL);
257 257
258 _ecore_signal_init(); 258 _ecore_signal_init();
259#ifndef HAVE_EXOTIC 259#ifndef HAVE_EXOTIC
@@ -277,7 +277,7 @@ ecore_init(void)
277#if defined(GLIB_INTEGRATION_ALWAYS) 277#if defined(GLIB_INTEGRATION_ALWAYS)
278 if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate(); 278 if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
279#endif 279#endif
280 _ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL); 280 _ecore_parent = efl_add(ECORE_PARENT_CLASS, NULL);
281 281
282#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) 282#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
283 if (getenv("ECORE_MEM_STAT")) 283 if (getenv("ECORE_MEM_STAT"))
@@ -323,7 +323,7 @@ ecore_init(void)
323 323
324shutdown_mempool: 324shutdown_mempool:
325 ecore_mempool_shutdown(); 325 ecore_mempool_shutdown();
326 eo_shutdown(); 326 efl_object_shutdown();
327shutdown_log_dom: 327shutdown_log_dom:
328 eina_shutdown(); 328 eina_shutdown();
329shutdown_evil: 329shutdown_evil:
@@ -439,8 +439,8 @@ ecore_shutdown(void)
439 eina_prefix_free(_ecore_pfx); 439 eina_prefix_free(_ecore_pfx);
440 _ecore_pfx = NULL; 440 _ecore_pfx = NULL;
441 441
442 eo_unref(_ecore_parent); 442 efl_unref(_ecore_parent);
443 eo_shutdown(); 443 efl_object_shutdown();
444 444
445 eina_shutdown(); 445 eina_shutdown();
446#ifdef HAVE_EVIL 446#ifdef HAVE_EVIL
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index d48219d..e1616ce 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -68,10 +68,10 @@ ecore_exe_pipe_run(const char *exe_cmd,
68 const void *data) 68 const void *data)
69{ 69{
70 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 70 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
71 Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(eo_self, exe_cmd, flags)); 71 Ecore_Exe *ret = efl_add(MY_CLASS, NULL, ecore_obj_exe_command_set(efl_self, exe_cmd, flags));
72 if (ret) 72 if (ret)
73 { 73 {
74 Ecore_Exe_Data *pd = eo_data_scope_get(ret, MY_CLASS); 74 Ecore_Exe_Data *pd = efl_data_scope_get(ret, MY_CLASS);
75 pd->data = (void *) data; 75 pd->data = (void *) data;
76 } 76 }
77 77
@@ -97,7 +97,7 @@ EOLIAN static Eo *
97_ecore_exe_efl_object_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 = efl_finalize(eo_super(obj, MY_CLASS)); 100 obj = efl_finalize(efl_super(obj, MY_CLASS));
101 101
102 if (!obj) 102 if (!obj)
103 return obj; 103 return obj;
@@ -110,8 +110,8 @@ ecore_exe_callback_pre_free_set(Ecore_Exe *obj,
110 Ecore_Exe_Cb func) 110 Ecore_Exe_Cb func)
111{ 111{
112 EINA_MAIN_LOOP_CHECK_RETURN; 112 EINA_MAIN_LOOP_CHECK_RETURN;
113 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 113 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
114 if (!eo_isa(obj, MY_CLASS)) 114 if (!efl_isa(obj, MY_CLASS))
115 return; 115 return;
116 exe->pre_free_cb = func; 116 exe->pre_free_cb = func;
117} 117}
@@ -122,8 +122,8 @@ ecore_exe_send(Ecore_Exe *obj,
122 int size) 122 int size)
123{ 123{
124 EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE); 124 EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
125 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 125 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
126 if (!eo_isa(obj, MY_CLASS)) 126 if (!efl_isa(obj, MY_CLASS))
127 return EINA_FALSE; 127 return EINA_FALSE;
128 128
129 if (exe->close_stdin) 129 if (exe->close_stdin)
@@ -140,8 +140,8 @@ EAPI void
140ecore_exe_close_stdin(Ecore_Exe *obj) 140ecore_exe_close_stdin(Ecore_Exe *obj)
141{ 141{
142 EINA_MAIN_LOOP_CHECK_RETURN; 142 EINA_MAIN_LOOP_CHECK_RETURN;
143 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 143 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
144 if (!eo_isa(obj, MY_CLASS)) 144 if (!efl_isa(obj, MY_CLASS))
145 return; 145 return;
146 146
147 exe->close_stdin = 1; 147 exe->close_stdin = 1;
@@ -155,8 +155,8 @@ ecore_exe_auto_limits_set(Ecore_Exe *obj,
155 int end_lines) 155 int end_lines)
156{ 156{
157 EINA_MAIN_LOOP_CHECK_RETURN; 157 EINA_MAIN_LOOP_CHECK_RETURN;
158 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 158 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
159 if (!eo_isa(obj, MY_CLASS)) 159 if (!efl_isa(obj, MY_CLASS))
160 return; 160 return;
161 161
162 _impl_ecore_exe_auto_limits_set(obj, exe, start_bytes, end_bytes, start_lines, end_lines); 162 _impl_ecore_exe_auto_limits_set(obj, exe, start_bytes, end_bytes, start_lines, end_lines);
@@ -167,8 +167,8 @@ ecore_exe_event_data_get(Ecore_Exe *obj,
167 Ecore_Exe_Flags flags) 167 Ecore_Exe_Flags flags)
168{ 168{
169 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 169 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
170 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 170 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
171 if (!eo_isa(obj, MY_CLASS)) 171 if (!efl_isa(obj, MY_CLASS))
172 return NULL; 172 return NULL;
173 173
174 return _impl_ecore_exe_event_data_get(obj, exe, flags); 174 return _impl_ecore_exe_event_data_get(obj, exe, flags);
@@ -179,8 +179,8 @@ ecore_exe_tag_set(Ecore_Exe *obj,
179 const char *tag) 179 const char *tag)
180{ 180{
181 EINA_MAIN_LOOP_CHECK_RETURN; 181 EINA_MAIN_LOOP_CHECK_RETURN;
182 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 182 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
183 if (!eo_isa(obj, MY_CLASS)) 183 if (!efl_isa(obj, MY_CLASS))
184 return; 184 return;
185 185
186 IF_FREE(exe->tag); 186 IF_FREE(exe->tag);
@@ -194,8 +194,8 @@ EAPI const char *
194ecore_exe_tag_get(const Ecore_Exe *obj) 194ecore_exe_tag_get(const Ecore_Exe *obj)
195{ 195{
196 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 196 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
197 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 197 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
198 if (!eo_isa(obj, MY_CLASS)) 198 if (!efl_isa(obj, MY_CLASS))
199 return NULL; 199 return NULL;
200 200
201 return exe->tag; 201 return exe->tag;
@@ -205,8 +205,8 @@ EAPI void *
205ecore_exe_free(Ecore_Exe *obj) 205ecore_exe_free(Ecore_Exe *obj)
206{ 206{
207 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 207 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
208 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 208 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
209 if (!eo_isa(obj, MY_CLASS)) 209 if (!efl_isa(obj, MY_CLASS))
210 return NULL; 210 return NULL;
211 211
212 void *data = exe->data; 212 void *data = exe->data;
@@ -218,7 +218,7 @@ ecore_exe_free(Ecore_Exe *obj)
218EOLIAN static void 218EOLIAN static void
219_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe) 219_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
220{ 220{
221 efl_destructor(eo_super(obj, ECORE_EXE_CLASS)); 221 efl_destructor(efl_super(obj, ECORE_EXE_CLASS));
222 222
223 _impl_ecore_exe_efl_object_destructor(obj, exe); 223 _impl_ecore_exe_efl_object_destructor(obj, exe);
224} 224}
@@ -236,8 +236,8 @@ EAPI pid_t
236ecore_exe_pid_get(const Ecore_Exe *obj) 236ecore_exe_pid_get(const Ecore_Exe *obj)
237{ 237{
238 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); 238 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
239 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 239 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
240 if (!eo_isa(obj, MY_CLASS)) 240 if (!efl_isa(obj, MY_CLASS))
241 return -1; 241 return -1;
242 242
243 return exe->pid; 243 return exe->pid;
@@ -258,8 +258,8 @@ EAPI void *
258ecore_exe_data_get(const Ecore_Exe *obj) 258ecore_exe_data_get(const Ecore_Exe *obj)
259{ 259{
260 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 260 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
261 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 261 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
262 if (!eo_isa(obj, MY_CLASS)) 262 if (!efl_isa(obj, MY_CLASS))
263 return NULL; 263 return NULL;
264 264
265 return exe->data; 265 return exe->data;
@@ -271,8 +271,8 @@ ecore_exe_data_set(Ecore_Exe *obj,
271{ 271{
272 void *ret; 272 void *ret;
273 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 273 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
274 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 274 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
275 if (!eo_isa(obj, MY_CLASS)) 275 if (!efl_isa(obj, MY_CLASS))
276 return NULL; 276 return NULL;
277 277
278 ret = exe->data; 278 ret = exe->data;
@@ -284,8 +284,8 @@ EAPI Ecore_Exe_Flags
284ecore_exe_flags_get(const Ecore_Exe *obj) 284ecore_exe_flags_get(const Ecore_Exe *obj)
285{ 285{
286 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); 286 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
287 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 287 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
288 if (!eo_isa(obj, MY_CLASS)) 288 if (!efl_isa(obj, MY_CLASS))
289 return 0; 289 return 0;
290 290
291 return exe->flags; 291 return exe->flags;
@@ -322,8 +322,8 @@ EAPI void
322ecore_exe_interrupt(Ecore_Exe *obj) 322ecore_exe_interrupt(Ecore_Exe *obj)
323{ 323{
324 EINA_MAIN_LOOP_CHECK_RETURN; 324 EINA_MAIN_LOOP_CHECK_RETURN;
325 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 325 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
326 if (!eo_isa(obj, MY_CLASS)) 326 if (!efl_isa(obj, MY_CLASS))
327 return; 327 return;
328 328
329 _impl_ecore_exe_interrupt(obj, exe); 329 _impl_ecore_exe_interrupt(obj, exe);
@@ -333,8 +333,8 @@ EAPI void
333ecore_exe_quit(Ecore_Exe *obj) 333ecore_exe_quit(Ecore_Exe *obj)
334{ 334{
335 EINA_MAIN_LOOP_CHECK_RETURN; 335 EINA_MAIN_LOOP_CHECK_RETURN;
336 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 336 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
337 if (!eo_isa(obj, MY_CLASS)) 337 if (!efl_isa(obj, MY_CLASS))
338 return; 338 return;
339 339
340 _impl_ecore_exe_quit(obj, exe); 340 _impl_ecore_exe_quit(obj, exe);
@@ -344,8 +344,8 @@ EAPI void
344ecore_exe_terminate(Ecore_Exe *obj) 344ecore_exe_terminate(Ecore_Exe *obj)
345{ 345{
346 EINA_MAIN_LOOP_CHECK_RETURN; 346 EINA_MAIN_LOOP_CHECK_RETURN;
347 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 347 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
348 if (!eo_isa(obj, MY_CLASS)) 348 if (!efl_isa(obj, MY_CLASS))
349 return; 349 return;
350 350
351 _impl_ecore_exe_terminate(obj, exe); 351 _impl_ecore_exe_terminate(obj, exe);
@@ -355,8 +355,8 @@ EAPI void
355ecore_exe_kill(Ecore_Exe *obj) 355ecore_exe_kill(Ecore_Exe *obj)
356{ 356{
357 EINA_MAIN_LOOP_CHECK_RETURN; 357 EINA_MAIN_LOOP_CHECK_RETURN;
358 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 358 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
359 if (!eo_isa(obj, MY_CLASS)) 359 if (!efl_isa(obj, MY_CLASS))
360 return; 360 return;
361 361
362 _impl_ecore_exe_kill(obj, exe); 362 _impl_ecore_exe_kill(obj, exe);
@@ -367,8 +367,8 @@ ecore_exe_signal(Ecore_Exe *obj,
367 int num) 367 int num)
368{ 368{
369 EINA_MAIN_LOOP_CHECK_RETURN; 369 EINA_MAIN_LOOP_CHECK_RETURN;
370 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 370 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
371 if (!eo_isa(obj, MY_CLASS)) 371 if (!efl_isa(obj, MY_CLASS))
372 return; 372 return;
373 373
374 _impl_ecore_exe_signal(obj, exe, num); 374 _impl_ecore_exe_signal(obj, exe, num);
@@ -378,8 +378,8 @@ EAPI void
378ecore_exe_hup(Ecore_Exe *obj) 378ecore_exe_hup(Ecore_Exe *obj)
379{ 379{
380 EINA_MAIN_LOOP_CHECK_RETURN; 380 EINA_MAIN_LOOP_CHECK_RETURN;
381 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 381 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
382 if (!eo_isa(obj, MY_CLASS)) 382 if (!efl_isa(obj, MY_CLASS))
383 return; 383 return;
384 384
385 _impl_ecore_exe_hup(obj, exe); 385 _impl_ecore_exe_hup(obj, exe);
@@ -411,7 +411,7 @@ _ecore_exe_find(pid_t pid)
411 411
412 EINA_LIST_FOREACH(_ecore_exe_exes, itr, obj) 412 EINA_LIST_FOREACH(_ecore_exe_exes, itr, obj)
413 { 413 {
414 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 414 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
415 if (exe->pid == pid) 415 if (exe->pid == pid)
416 return obj; 416 return obj;
417 } 417 }
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index 2babbbf..5ad60f9 100644
--- a/src/lib/ecore/ecore_exe_posix.c
+++ b/src/lib/ecore/ecore_exe_posix.c
@@ -889,7 +889,7 @@ _ecore_exe_make_sure_its_dead(void *data)
889 889
890 if ((obj = _ecore_exe_is_it_alive(dead->pid))) 890 if ((obj = _ecore_exe_is_it_alive(dead->pid)))
891 { 891 {
892 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 892 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
893 if (dead->cmd) 893 if (dead->cmd)
894 INF("Sending KILL signal to allegedly dead %s (%d).", 894 INF("Sending KILL signal to allegedly dead %s (%d).",
895 dead->cmd, dead->pid); 895 dead->cmd, dead->pid);
@@ -922,7 +922,7 @@ _ecore_exe_make_sure_its_really_dead(void *data)
922 922
923 if ((obj = _ecore_exe_is_it_alive(dead->pid))) 923 if ((obj = _ecore_exe_is_it_alive(dead->pid)))
924 { 924 {
925 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 925 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
926 ERR("RUN! The zombie wants to eat your brains! And your CPU!"); 926 ERR("RUN! The zombie wants to eat your brains! And your CPU!");
927 if (dead->cmd) 927 if (dead->cmd)
928 INF("%s (%d) is not really dead.", dead->cmd, dead->pid); 928 INF("%s (%d) is not really dead.", dead->cmd, dead->pid);
@@ -939,7 +939,7 @@ _ecore_exe_make_sure_its_really_dead(void *data)
939Ecore_Timer * 939Ecore_Timer *
940_ecore_exe_doomsday_clock_get(Ecore_Exe *obj) 940_ecore_exe_doomsday_clock_get(Ecore_Exe *obj)
941{ 941{
942 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 942 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
943 return exe->doomsday_clock; 943 return exe->doomsday_clock;
944} 944}
945 945
@@ -947,7 +947,7 @@ void
947_ecore_exe_doomsday_clock_set(Ecore_Exe *obj, 947_ecore_exe_doomsday_clock_set(Ecore_Exe *obj,
948 Ecore_Timer *dc) 948 Ecore_Timer *dc)
949{ 949{
950 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 950 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
951 exe->doomsday_clock = dc; 951 exe->doomsday_clock = dc;
952} 952}
953 953
@@ -1070,7 +1070,7 @@ _ecore_exe_data_generic_handler(void *data,
1070 int event_type; 1070 int event_type;
1071 const Efl_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 = efl_data_scope_get(obj, MY_CLASS);
1074 1074
1075 /* Sort out what sort of handler we are. */ 1075 /* Sort out what sort of handler we are. */
1076 if (flags & ECORE_EXE_PIPE_READ) 1076 if (flags & ECORE_EXE_PIPE_READ)
@@ -1223,7 +1223,7 @@ _ecore_exe_data_write_handler(void *data,
1223 Ecore_Fd_Handler *fd_handler EINA_UNUSED) 1223 Ecore_Fd_Handler *fd_handler EINA_UNUSED)
1224{ 1224{
1225 Ecore_Exe *obj = data; 1225 Ecore_Exe *obj = data;
1226 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 1226 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
1227 1227
1228 if ((exe->write_fd_handler) && 1228 if ((exe->write_fd_handler) &&
1229 (ecore_main_fd_handler_active_get 1229 (ecore_main_fd_handler_active_get
@@ -1253,7 +1253,7 @@ static void
1253_ecore_exe_flush(Ecore_Exe *obj) 1253_ecore_exe_flush(Ecore_Exe *obj)
1254{ 1254{
1255 int count; 1255 int count;
1256 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 1256 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
1257 1257
1258 /* check whether we need to write anything at all. */ 1258 /* check whether we need to write anything at all. */
1259 if ((exe->child_fd_write == -1) || (!exe->write_data_buf)) 1259 if ((exe->child_fd_write == -1) || (!exe->write_data_buf))
@@ -1291,7 +1291,7 @@ static void
1291_ecore_exe_dead_attach(Ecore_Exe *obj) 1291_ecore_exe_dead_attach(Ecore_Exe *obj)
1292{ 1292{
1293 struct _ecore_exe_dead_exe *dead; 1293 struct _ecore_exe_dead_exe *dead;
1294 Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS); 1294 Ecore_Exe_Data *exe = efl_data_scope_get(obj, MY_CLASS);
1295 1295
1296 if (exe->doomsday_clock_dead) return; 1296 if (exe->doomsday_clock_dead) return;
1297 dead = calloc(1, sizeof(struct _ecore_exe_dead_exe)); 1297 dead = calloc(1, sizeof(struct _ecore_exe_dead_exe));
diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c
index 0316754..e2ef5ac 100644
--- a/src/lib/ecore/ecore_exe_win32.c
+++ b/src/lib/ecore/ecore_exe_win32.c
@@ -39,7 +39,7 @@ static int run_pri = NORMAL_PRIORITY_CLASS;
39static void 39static void
40_ecore_exe_threads_terminate(Ecore_Exe *obj) 40_ecore_exe_threads_terminate(Ecore_Exe *obj)
41{ 41{
42 Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS); 42 Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
43 HANDLE threads[2] = { NULL, NULL }; 43 HANDLE threads[2] = { NULL, NULL };
44 int i = 0; 44 int i = 0;
45 45
@@ -68,7 +68,7 @@ _ecore_exe_close_cb(void *data,
68{ 68{
69 Ecore_Exe_Event_Del *e; 69 Ecore_Exe_Event_Del *e;
70 Ecore_Exe *obj = data; 70 Ecore_Exe *obj = data;
71 Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS); 71 Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
72 DWORD exit_code = 0; 72 DWORD exit_code = 0;
73 73
74 _ecore_exe_threads_terminate(obj); 74 _ecore_exe_threads_terminate(obj);
@@ -105,7 +105,7 @@ _ecore_exe_pipe_read_thread_cb(void *data)
105{ 105{
106 char buf[64]; 106 char buf[64];
107 Ecore_Exe *obj = data; 107 Ecore_Exe *obj = data;
108 Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS); 108 Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
109 Ecore_Exe_Event_Data *event_data; 109 Ecore_Exe_Event_Data *event_data;
110 char *current_buf = NULL; 110 char *current_buf = NULL;
111 DWORD size; 111 DWORD size;
@@ -175,7 +175,7 @@ _ecore_exe_pipe_error_thread_cb(void *data)
175{ 175{
176 char buf[64]; 176 char buf[64];
177 Ecore_Exe *obj = data; 177 Ecore_Exe *obj = data;
178 Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS); 178 Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
179 Ecore_Exe_Event_Data *event_data; 179 Ecore_Exe_Event_Data *event_data;
180 char *current_buf = NULL; 180 char *current_buf = NULL;
181 DWORD size; 181 DWORD size;
@@ -253,7 +253,7 @@ _ecore_exe_enum_windows_procedure(HWND window,
253 LPARAM data) 253 LPARAM data)
254{ 254{
255 Ecore_Exe *obj = (Ecore_Exe *) data; 255 Ecore_Exe *obj = (Ecore_Exe *) data;
256 Ecore_Exe_Data *exe = eo_data_scope_get(obj, ECORE_EXE_CLASS); 256 Ecore_Exe_Data *exe = efl_data_scope_get(obj, ECORE_EXE_CLASS);
257 DWORD thread_id; 257 DWORD thread_id;
258 258
259 thread_id = GetWindowThreadProcessId(window, NULL); 259 thread_id = GetWindowThreadProcessId(window, NULL);
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index ecc74dc..08e7d9d 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -9,7 +9,7 @@
9#include "Ecore.h" 9#include "Ecore.h"
10#include "ecore_private.h" 10#include "ecore_private.h"
11 11
12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks, 12EFL_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 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
@@ -31,7 +31,7 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
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 efl_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 efl_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(), EFL_CALLBACK_PRIORITY_BEFORE, ie);
35 35
36 return ie; 36 return ie;
37} 37}
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index c53a182..8295af2 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -9,7 +9,7 @@
9#include "Ecore.h" 9#include "Ecore.h"
10#include "ecore_private.h" 10#include "ecore_private.h"
11 11
12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks, 12EFL_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 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 3c94e6d..e116852 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -96,7 +96,7 @@ _ecore_factorized_idle_add(const Efl_Callback_Array_Item *desc,
96 96
97/* Specific to Ecore_Idler implementation */ 97/* Specific to Ecore_Idler implementation */
98 98
99EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks, 99EFL_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 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del }); 101 { EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
102 102
@@ -122,7 +122,7 @@ _ecore_idler_all_call(Eo *loop)
122int 122int
123_ecore_idler_exist(Eo *loop) 123_ecore_idler_exist(Eo *loop)
124{ 124{
125 Efl_Loop_Data *dt = eo_data_scope_get(loop, EFL_LOOP_CLASS); 125 Efl_Loop_Data *dt = efl_data_scope_get(loop, EFL_LOOP_CLASS);
126 126
127 return dt->idlers; 127 return dt->idlers;
128} 128}
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index f0e1878..5e941ed 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2721,7 +2721,7 @@ _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 {
2724 _mainloop_singleton = eo_add(EFL_LOOP_CLASS, NULL); 2724 _mainloop_singleton = efl_add(EFL_LOOP_CLASS, NULL);
2725 } 2725 }
2726 2726
2727 return _mainloop_singleton; 2727 return _mainloop_singleton;
@@ -2768,7 +2768,7 @@ _efl_loop_efl_object_provider_find(Eo *obj, Efl_Loop_Data *pd, const Efl_Object
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 efl_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass); 2771 return efl_provider_find(efl_super(obj, EFL_LOOP_CLASS), klass);
2772} 2772}
2773 2773
2774static void 2774static void
@@ -2803,19 +2803,19 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
2803 } 2803 }
2804} 2804}
2805 2805
2806EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, 2806EFL_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
2807 { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add }, 2807 { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add },
2808 { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del }); 2808 { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del });
2809 2809
2810EOLIAN static Efl_Object * 2810EOLIAN static Efl_Object *
2811_efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd) 2811_efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
2812{ 2812{
2813 obj = efl_constructor(eo_super(obj, EFL_LOOP_CLASS)); 2813 obj = efl_constructor(efl_super(obj, EFL_LOOP_CLASS));
2814 if (!obj) return NULL; 2814 if (!obj) return NULL;
2815 2815
2816 efl_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*) efl_unref);
2819 2819
2820 return obj; 2820 return obj;
2821} 2821}
@@ -2823,7 +2823,7 @@ _efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
2823EOLIAN static void 2823EOLIAN static void
2824_efl_loop_efl_object_destructor(Eo *obj, Efl_Loop_Data *pd) 2824_efl_loop_efl_object_destructor(Eo *obj, Efl_Loop_Data *pd)
2825{ 2825{
2826 efl_destructor(eo_super(obj, EFL_LOOP_CLASS)); 2826 efl_destructor(efl_super(obj, EFL_LOOP_CLASS));
2827 2827
2828 eina_hash_free(pd->providers); 2828 eina_hash_free(pd->providers);
2829} 2829}
@@ -2905,7 +2905,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
2905static void _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED); 2905static void _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED);
2906static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED); 2906static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED);
2907 2907
2908EO_CALLBACKS_ARRAY_DEFINE(timeout, 2908EFL_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 { EFL_EVENT_DEL, _efl_loop_timeout_force_cancel_cb }); 2910 { EFL_EVENT_DEL, _efl_loop_timeout_force_cancel_cb });
2911 2911
@@ -3007,9 +3007,9 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time, const voi
3007 if (!t) goto on_error; 3007 if (!t) goto on_error;
3008 3008
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 = efl_add(EFL_LOOP_TIMER_CLASS, obj,
3011 efl_loop_timer_interval_set(eo_self, time), 3011 efl_loop_timer_interval_set(efl_self, time),
3012 efl_event_callback_array_add(eo_self, timeout(), t)); 3012 efl_event_callback_array_add(efl_self, timeout(), t));
3013 3013
3014 if (!t->u.timer) goto on_error; 3014 if (!t->u.timer) goto on_error;
3015 3015
@@ -3026,11 +3026,11 @@ static Eina_Bool
3026_efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Efl_Class *klass, const Efl_Object *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 (!efl_isa(provider, klass)) return EINA_FALSE;
3030 3030
3031 // Note: I would prefer to use eo_xref here, but I can't figure a nice way to 3031 // Note: I would prefer to use efl_xref here, but I can't figure a nice way to
3032 // call eo_xunref on hash destruction. 3032 // call efl_xunref on hash destruction.
3033 return eina_hash_add(pd->providers, &klass, eo_ref(provider)); 3033 return eina_hash_add(pd->providers, &klass, efl_ref(provider));
3034} 3034}
3035 3035
3036static Eina_Bool 3036static Eina_Bool
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index cc4e4f4..d1c645a 100644
--- a/src/lib/ecore/ecore_poller.c
+++ b/src/lib/ecore/ecore_poller.c
@@ -14,7 +14,7 @@
14#define MY_CLASS_NAME "Ecore_Poller" 14#define MY_CLASS_NAME "Ecore_Poller"
15 15
16#define ECORE_POLLER_CHECK(obj) \ 16#define ECORE_POLLER_CHECK(obj) \
17 if (!eo_isa((obj), ECORE_POLLER_CLASS)) \ 17 if (!efl_isa((obj), ECORE_POLLER_CLASS)) \
18 return 18 return
19 19
20struct _Ecore_Poller_Data 20struct _Ecore_Poller_Data
@@ -174,10 +174,10 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED)
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 efl_parent_set(poller->obj, NULL); 176 efl_parent_set(poller->obj, NULL);
177 if (eo_destructed_is(poller->obj)) 177 if (efl_destructed_is(poller->obj))
178 eo_manual_free(poller->obj); 178 efl_manual_free(poller->obj);
179 else 179 else
180 eo_manual_free_set(poller->obj, EINA_FALSE); 180 efl_manual_free_set(poller->obj, EINA_FALSE);
181 181
182 poller_delete_count--; 182 poller_delete_count--;
183 changes++; 183 changes++;
@@ -237,7 +237,7 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
237 const void *data) 237 const void *data)
238{ 238{
239 Ecore_Poller *poller; 239 Ecore_Poller *poller;
240 poller = eo_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(eo_self, type, interval, func, data)); 240 poller = efl_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(efl_self, type, interval, func, data));
241 return poller; 241 return poller;
242} 242}
243 243
@@ -253,7 +253,7 @@ _ecore_poller_constructor(Eo *obj, Ecore_Poller_Data *poller, Ecore_Poller_Type
253 EINA_MAIN_LOOP_CHECK_RETURN; 253 EINA_MAIN_LOOP_CHECK_RETURN;
254 } 254 }
255 255
256 eo_manual_free_set(obj, EINA_TRUE); 256 efl_manual_free_set(obj, EINA_TRUE);
257 257
258 if (!func) 258 if (!func)
259 { 259 {
@@ -337,7 +337,7 @@ ecore_poller_del(Ecore_Poller *obj)
337 337
338 if (!obj) return NULL; 338 if (!obj) return NULL;
339 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 339 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
340 Ecore_Poller_Data *poller = eo_data_scope_get(obj, MY_CLASS); 340 Ecore_Poller_Data *poller = efl_data_scope_get(obj, MY_CLASS);
341 /* we are walking the poller list - a bad idea to remove from it while 341 /* we are walking the poller list - a bad idea to remove from it while
342 * walking it, so just flag it as delete_me and come back to it after 342 * walking it, so just flag it as delete_me and come back to it after
343 * the loop has finished */ 343 * the loop has finished */
@@ -352,10 +352,10 @@ ecore_poller_del(Ecore_Poller *obj)
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 efl_parent_set(poller->obj, NULL); 354 efl_parent_set(poller->obj, NULL);
355 if (eo_destructed_is(poller->obj)) 355 if (efl_destructed_is(poller->obj))
356 eo_manual_free(obj); 356 efl_manual_free(obj);
357 else 357 else
358 eo_manual_free_set(obj, EINA_FALSE); 358 efl_manual_free_set(obj, EINA_FALSE);
359 359
360 _ecore_poller_next_tick_eval(); 360 _ecore_poller_next_tick_eval();
361 return data; 361 return data;
@@ -370,7 +370,7 @@ _ecore_poller_efl_object_destructor(Eo *obj, Ecore_Poller_Data *pd)
370 poller_delete_count++; 370 poller_delete_count++;
371 } 371 }
372 372
373 efl_destructor(eo_super(obj, MY_CLASS)); 373 efl_destructor(efl_super(obj, MY_CLASS));
374} 374}
375 375
376EOLIAN static Eo * 376EOLIAN static Eo *
@@ -381,7 +381,7 @@ _ecore_poller_efl_object_finalize(Eo *obj, Ecore_Poller_Data *pd)
381 return NULL; 381 return NULL;
382 } 382 }
383 383
384 return efl_finalize(eo_super(obj, MY_CLASS)); 384 return efl_finalize(efl_super(obj, MY_CLASS));
385} 385}
386 386
387void 387void
@@ -396,10 +396,10 @@ _ecore_poller_shutdown(void)
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 efl_parent_set(poller->obj, NULL); 398 efl_parent_set(poller->obj, NULL);
399 if (eo_destructed_is(poller->obj)) 399 if (efl_destructed_is(poller->obj))
400 eo_manual_free(poller->obj); 400 efl_manual_free(poller->obj);
401 else 401 else
402 eo_manual_free_set(poller->obj, EINA_FALSE); 402 efl_manual_free_set(poller->obj, EINA_FALSE);
403 } 403 }
404 } 404 }
405} 405}
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index d9572f0..9998ff3 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -14,7 +14,7 @@
14#define MY_CLASS_NAME "Efl_Loop_Timer" 14#define MY_CLASS_NAME "Efl_Loop_Timer"
15 15
16#define ECORE_TIMER_CHECK(obj) \ 16#define ECORE_TIMER_CHECK(obj) \
17 if (!eo_isa((obj), MY_CLASS)) \ 17 if (!efl_isa((obj), MY_CLASS)) \
18 return 18 return
19 19
20struct _Efl_Loop_Timer_Data 20struct _Efl_Loop_Timer_Data
@@ -112,14 +112,14 @@ _check_timer_event_catcher_del(void *data, const Eo_Event *event)
112 } 112 }
113} 113}
114 114
115EO_CALLBACKS_ARRAY_DEFINE(timer_watch, 115EFL_CALLBACKS_ARRAY_DEFINE(timer_watch,
116 { EFL_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add }, 116 { EFL_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add },
117 { EFL_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_efl_object_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 efl_constructor(eo_super(obj, MY_CLASS)); 122 efl_constructor(efl_super(obj, MY_CLASS));
123 123
124 efl_event_callback_array_add(obj, timer_watch(), timer); 124 efl_event_callback_array_add(obj, timer_watch(), timer);
125 125
@@ -137,7 +137,7 @@ _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 efl_finalize(eo_super(obj, MY_CLASS)); 140 return efl_finalize(efl_super(obj, MY_CLASS));
141} 141}
142 142
143typedef struct _Ecore_Timer_Legacy Ecore_Timer_Legacy; 143typedef struct _Ecore_Timer_Legacy Ecore_Timer_Legacy;
@@ -172,7 +172,7 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
172 legacy->inside_call = 0; 172 legacy->inside_call = 0;
173} 173}
174 174
175EO_CALLBACKS_ARRAY_DEFINE(legacy_timer, 175EFL_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 { EFL_EVENT_DEL, _ecore_timer_legacy_del }); 177 { EFL_EVENT_DEL, _ecore_timer_legacy_del });
178 178
@@ -190,10 +190,10 @@ ecore_timer_add(double in,
190 190
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 = efl_add(MY_CLASS, ecore_main_loop_get(),
194 efl_event_callback_array_add(eo_self, legacy_timer(), legacy), 194 efl_event_callback_array_add(efl_self, legacy_timer(), legacy),
195 efl_key_data_set(eo_self, "_legacy", legacy), 195 efl_key_data_set(efl_self, "_legacy", legacy),
196 efl_loop_timer_interval_set(eo_self, in)); 196 efl_loop_timer_interval_set(efl_self, in));
197 197
198 return timer; 198 return timer;
199} 199}
@@ -212,11 +212,11 @@ ecore_timer_loop_add(double in,
212 212
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 = efl_add(MY_CLASS, ecore_main_loop_get(),
216 efl_event_callback_array_add(eo_self, legacy_timer(), legacy), 216 efl_event_callback_array_add(efl_self, legacy_timer(), legacy),
217 efl_key_data_set(eo_self, "_legacy", legacy), 217 efl_key_data_set(efl_self, "_legacy", legacy),
218 efl_loop_timer_loop_reset(eo_self), 218 efl_loop_timer_loop_reset(efl_self),
219 efl_loop_timer_interval_set(eo_self, in)); 219 efl_loop_timer_interval_set(efl_self, in));
220 220
221 return timer; 221 return timer;
222} 222}
@@ -236,7 +236,7 @@ ecore_timer_del(Ecore_Timer *timer)
236 { 236 {
237 // Just in case it is an Eo timer, but not a legacy one. 237 // Just in case it is an Eo timer, but not a legacy one.
238 ERR("You are trying to destroy a timer which seems dead already."); 238 ERR("You are trying to destroy a timer which seems dead already.");
239 eo_unref(timer); 239 efl_unref(timer);
240 return NULL; 240 return NULL;
241 } 241 }
242 242
@@ -356,7 +356,7 @@ _efl_loop_timer_efl_object_event_freeze(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data
356 356
357 EINA_MAIN_LOOP_CHECK_RETURN; 357 EINA_MAIN_LOOP_CHECK_RETURN;
358 358
359 efl_event_freeze(eo_super(obj, MY_CLASS)); 359 efl_event_freeze(efl_super(obj, MY_CLASS));
360 360
361 /* Timer already frozen */ 361 /* Timer already frozen */
362 if (timer->frozen) 362 if (timer->frozen)
@@ -404,7 +404,7 @@ _efl_loop_timer_efl_object_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer)
404 404
405 EINA_MAIN_LOOP_CHECK_RETURN; 405 EINA_MAIN_LOOP_CHECK_RETURN;
406 406
407 efl_event_thaw(eo_super(obj, MY_CLASS)); 407 efl_event_thaw(efl_super(obj, MY_CLASS));
408 408
409 /* Timer not frozen */ 409 /* Timer not frozen */
410 if (!timer->frozen) 410 if (!timer->frozen)
@@ -479,7 +479,7 @@ _efl_loop_timer_efl_object_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *
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 efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent); 482 efl_parent_set(efl_super(obj, EFL_LOOP_USER_CLASS), parent);
483 483
484 if (efl_parent_get(obj) != parent) 484 if (efl_parent_get(obj) != parent)
485 return ; 485 return ;
@@ -511,7 +511,7 @@ _efl_loop_timer_efl_object_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 efl_destructor(eo_super(obj, MY_CLASS)); 514 efl_destructor(efl_super(obj, MY_CLASS));
515} 515}
516 516
517void 517void
@@ -575,7 +575,7 @@ _efl_loop_timer_next_get(void)
575 object = _efl_loop_timer_first_get(); 575 object = _efl_loop_timer_first_get();
576 if (!object) return -1; 576 if (!object) return -1;
577 577
578 first = _efl_loop_timer_after_get(eo_data_scope_get(object, MY_CLASS)); 578 first = _efl_loop_timer_after_get(efl_data_scope_get(object, MY_CLASS));
579 579
580 now = ecore_loop_time_get(); 580 now = ecore_loop_time_get();
581 in = first->at - now; 581 in = first->at - now;
@@ -656,7 +656,7 @@ _efl_loop_timer_expired_call(double when)
656 continue; 656 continue;
657 } 657 }
658 658
659 eo_ref(timer->object); 659 efl_ref(timer->object);
660 eina_evlog("+timer", timer, 0.0, NULL); 660 eina_evlog("+timer", timer, 0.0, NULL);
661 efl_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);
@@ -667,7 +667,7 @@ _efl_loop_timer_expired_call(double when)
667 timer_current = (Efl_Loop_Timer_Data *)EINA_INLIST_GET(timer_current)->next; 667 timer_current = (Efl_Loop_Timer_Data *)EINA_INLIST_GET(timer_current)->next;
668 668
669 _efl_loop_timer_reschedule(timer, when); 669 _efl_loop_timer_reschedule(timer, when);
670 eo_unref(timer->object); 670 efl_unref(timer->object);
671 } 671 }
672 return 0; 672 return 0;
673} 673}
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index dc7f472..672dc18 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -146,14 +146,14 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event)
146 } 146 }
147} 147}
148 148
149EO_CALLBACKS_ARRAY_DEFINE(fd_watch, 149EFL_CALLBACKS_ARRAY_DEFINE(fd_watch,
150 { EFL_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add }, 150 { EFL_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add },
151 { EFL_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del }); 151 { EFL_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del });
152 152
153static Efl_Object * 153static Efl_Object *
154_efl_loop_fd_efl_object_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 efl_constructor(eo_super(obj, MY_CLASS)); 156 efl_constructor(efl_super(obj, MY_CLASS));
157 157
158 efl_event_callback_array_add(obj, fd_watch(), pd); 158 efl_event_callback_array_add(obj, fd_watch(), pd);
159 159
@@ -168,7 +168,7 @@ _efl_loop_fd_efl_object_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Efl_Object *pa
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 efl_parent_set(eo_super(obj, MY_CLASS), parent); 171 efl_parent_set(efl_super(obj, MY_CLASS), parent);
172 172
173 if (parent == NULL) return ; 173 if (parent == NULL) return ;
174 174
@@ -178,7 +178,7 @@ _efl_loop_fd_efl_object_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Efl_Object *pa
178static void 178static void
179_efl_loop_fd_efl_object_destructor(Eo *obj, Efl_Loop_Fd_Data *pd) 179_efl_loop_fd_efl_object_destructor(Eo *obj, Efl_Loop_Fd_Data *pd)
180{ 180{
181 efl_destructor(eo_super(obj, MY_CLASS)); 181 efl_destructor(efl_super(obj, MY_CLASS));
182 182
183 ecore_main_fd_handler_del(pd->handler); 183 ecore_main_fd_handler_del(pd->handler);
184} 184}
diff --git a/src/lib/ecore/efl_loop_user.c b/src/lib/ecore/efl_loop_user.c
index 3dc8ffa..78ac3a8 100644
--- a/src/lib/ecore/efl_loop_user.c
+++ b/src/lib/ecore/efl_loop_user.c
@@ -23,7 +23,7 @@ _efl_loop_user_efl_object_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED
23 if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL) 23 if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL)
24 return ; 24 return ;
25 25
26 efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent); 26 efl_parent_set(efl_super(obj, EFL_LOOP_USER_CLASS), parent);
27} 27}
28 28
29#include "efl_loop_user.eo.c" 29#include "efl_loop_user.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio.c b/src/lib/ecore_audio/ecore_audio.c
index 2a104eb..f57eca8 100644
--- a/src/lib/ecore_audio/ecore_audio.c
+++ b/src/lib/ecore_audio/ecore_audio.c
@@ -37,7 +37,7 @@ ecore_audio_init(void)
37 if (!ecore_init()) 37 if (!ecore_init())
38 return --_ecore_audio_init_count; 38 return --_ecore_audio_init_count;
39 39
40 if (!eo_init()) { 40 if (!efl_object_init()) {
41 ecore_shutdown(); 41 ecore_shutdown();
42 return --_ecore_audio_init_count; 42 return --_ecore_audio_init_count;
43 } 43 }
@@ -85,7 +85,7 @@ ecore_audio_shutdown(void)
85 eina_log_domain_unregister(_ecore_audio_log_dom); 85 eina_log_domain_unregister(_ecore_audio_log_dom);
86 _ecore_audio_log_dom = -1; 86 _ecore_audio_log_dom = -1;
87 87
88 eo_shutdown(); 88 efl_object_shutdown();
89 ecore_shutdown(); 89 ecore_shutdown();
90 90
91 return _ecore_audio_init_count; 91 return _ecore_audio_init_count;
diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c
index 26b34ae..5c7abe2 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.c
+++ b/src/lib/ecore_audio/ecore_audio_obj.c
@@ -58,7 +58,7 @@ EOLIAN static Eo *
58_ecore_audio_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Object *obj) 58_ecore_audio_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Object *obj)
59{ 59{
60 obj->volume = 1.0; 60 obj->volume = 1.0;
61 return efl_constructor(eo_super(eo_obj, MY_CLASS)); 61 return efl_constructor(efl_super(eo_obj, MY_CLASS));
62} 62}
63 63
64#include "ecore_audio.eo.c" 64#include "ecore_audio.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index 6f20d43..ff8bd5b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -98,7 +98,7 @@ EOLIAN static ssize_t
98_ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len) 98_ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
99{ 99{
100 ssize_t len_read = 0; 100 ssize_t len_read = 0;
101 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 101 const Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
102 102
103 if (ea_obj->paused) { 103 if (ea_obj->paused) {
104 memset(buf, 0, len); 104 memset(buf, 0, len);
@@ -124,7 +124,7 @@ EOLIAN static ssize_t
124_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_Input *_pd EINA_UNUSED, void *buf, size_t len) 124_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_Input *_pd EINA_UNUSED, void *buf, size_t len)
125{ 125{
126 ssize_t len_read = 0; 126 ssize_t len_read = 0;
127 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 127 const Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
128 128
129 if (ea_obj->vio && ea_obj->vio->vio->read) { 129 if (ea_obj->vio && ea_obj->vio->vio->read) {
130 len_read = ea_obj->vio->vio->read(ea_obj->vio->data, eo_obj, buf, len); 130 len_read = ea_obj->vio->vio->read(ea_obj->vio->data, eo_obj, buf, len);
@@ -151,7 +151,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
151EOLIAN static void 151EOLIAN static void
152_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func) 152_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
153{ 153{
154 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 154 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
155 155
156 if (ea_obj->vio) 156 if (ea_obj->vio)
157 _free_vio(ea_obj); 157 _free_vio(ea_obj);
@@ -173,7 +173,7 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au
173EOLIAN static Eo * 173EOLIAN static Eo *
174_ecore_audio_in_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Input *obj) 174_ecore_audio_in_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
175{ 175{
176 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 176 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
177 177
178 obj->speed = 1.0; 178 obj->speed = 1.0;
179 179
@@ -186,7 +186,7 @@ _ecore_audio_in_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Input *obj)
186 if(obj->output) 186 if(obj->output)
187 ecore_audio_obj_out_input_detach(obj->output, eo_obj); 187 ecore_audio_obj_out_input_detach(obj->output, eo_obj);
188 188
189 efl_destructor(eo_super(eo_obj, MY_CLASS)); 189 efl_destructor(efl_super(eo_obj, MY_CLASS));
190} 190}
191 191
192#include "ecore_audio_in.eo.c" 192#include "ecore_audio_in.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
index 887ec8b..22ad63d 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -49,8 +49,8 @@ _ecore_audio_in_sndfile_ecore_audio_in_seek(Eo *eo_obj EINA_UNUSED, Ecore_Audio_
49EOLIAN static Eina_Bool 49EOLIAN static Eina_Bool
50_ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, const char *source) 50_ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, const char *source)
51{ 51{
52 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 52 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
53 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 53 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
54 54
55 if (!ESF_LOAD()) return EINA_FALSE; 55 if (!ESF_LOAD()) return EINA_FALSE;
56 if (obj->handle) { 56 if (obj->handle) {
@@ -92,14 +92,14 @@ _ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfil
92EOLIAN static const char* 92EOLIAN static const char*
93_ecore_audio_in_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) 93_ecore_audio_in_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED)
94{ 94{
95 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 95 Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
96 return obj->source; 96 return obj->source;
97} 97}
98 98
99EOLIAN static Eina_Bool 99EOLIAN static Eina_Bool
100_ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Format format) 100_ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Format format)
101{ 101{
102 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 102 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
103 103
104 if (ea_obj->source) { 104 if (ea_obj->source) {
105 ERR("Input is already open - cannot change format"); 105 ERR("Input is already open - cannot change format");
@@ -131,7 +131,7 @@ _ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfil
131EOLIAN static Ecore_Audio_Format 131EOLIAN static Ecore_Audio_Format
132_ecore_audio_in_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) 132_ecore_audio_in_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED)
133{ 133{
134 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 134 Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
135 return obj->format;; 135 return obj->format;;
136} 136}
137 137
@@ -147,8 +147,8 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
147EOLIAN static void 147EOLIAN static void
148_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func) 148_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
149{ 149{
150 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 150 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
151 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 151 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
152 152
153 if (!ESF_LOAD()) return; 153 if (!ESF_LOAD()) return;
154 if (obj->handle) { 154 if (obj->handle) {
@@ -201,7 +201,7 @@ _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_D
201EOLIAN static void 201EOLIAN static void
202_ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj) 202_ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj)
203{ 203{
204 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 204 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
205 205
206 if (!ESF_LOAD()) return; 206 if (!ESF_LOAD()) return;
207 if (obj->handle) 207 if (obj->handle)
@@ -210,7 +210,7 @@ _ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile
210 if (ea_obj->vio) 210 if (ea_obj->vio)
211 _free_vio(ea_obj); 211 _free_vio(ea_obj);
212 212
213 efl_destructor(eo_super(eo_obj, MY_CLASS)); 213 efl_destructor(efl_super(eo_obj, MY_CLASS));
214} 214}
215 215
216#include "ecore_audio_in_sndfile.eo.c" 216#include "ecore_audio_in_sndfile.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index a44387b..0c22edb 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -29,7 +29,7 @@ EOLIAN static ssize_t
29_ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, void *data, size_t len) 29_ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, void *data, size_t len)
30{ 30{
31 size_t i, remain; 31 size_t i, remain;
32 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 32 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
33 33
34 float *val = data; 34 float *val = data;
35 35
@@ -50,7 +50,7 @@ EOLIAN static double
50_ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, double offs, int mode) 50_ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, double offs, int mode)
51{ 51{
52 int tmp; 52 int tmp;
53 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 53 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
54 54
55 switch (mode) { 55 switch (mode) {
56 case SEEK_SET: 56 case SEEK_SET:
@@ -78,7 +78,7 @@ err:
78EOLIAN static void 78EOLIAN static void
79_ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *_pd EINA_UNUSED, double length) 79_ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *_pd EINA_UNUSED, double length)
80{ 80{
81 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 81 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
82 in_obj->length = length; 82 in_obj->length = length;
83} 83}
84 84
@@ -90,7 +90,7 @@ _ecore_audio_in_tone_efl_object_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Dat
90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
91 obj->freq = *(int *)val; 91 obj->freq = *(int *)val;
92 } else { 92 } else {
93 efl_key_data_set(eo_super(eo_obj, MY_CLASS), key, val); 93 efl_key_data_set(efl_super(eo_obj, MY_CLASS), key, val);
94 } 94 }
95 95
96} 96}
@@ -101,16 +101,16 @@ _ecore_audio_in_tone_efl_object_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Dat
101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
102 return (void *) (intptr_t) obj->freq; 102 return (void *) (intptr_t) obj->freq;
103 } else { 103 } else {
104 return efl_key_data_get(eo_super(eo_obj, MY_CLASS), key); 104 return efl_key_data_get(efl_super(eo_obj, MY_CLASS), key);
105 } 105 }
106} 106}
107 107
108EOLIAN static Eo * 108EOLIAN static Eo *
109_ecore_audio_in_tone_efl_object_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj) 109_ecore_audio_in_tone_efl_object_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj)
110{ 110{
111 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); 111 Ecore_Audio_Input *in_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
112 112
113 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 113 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
114 114
115 in_obj->channels = 1; 115 in_obj->channels = 1;
116 in_obj->samplerate = 44100; 116 in_obj->samplerate = 44100;
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index 10e26c5..7e1d39b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -22,8 +22,8 @@ static Eina_Bool _write_cb(void *data)
22 Eo *eo_obj = data; 22 Eo *eo_obj = data;
23 Eo *in; 23 Eo *in;
24 24
25 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 25 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
26 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 26 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
27 27
28 ssize_t written, bread = 0; 28 ssize_t written, bread = 0;
29 float buf[1024]; 29 float buf[1024];
@@ -54,9 +54,9 @@ _ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
54{ 54{
55 Ecore_Audio_Input *in; 55 Ecore_Audio_Input *in;
56 56
57 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 57 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
58 58
59 in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS); 59 in = efl_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
60 60
61 if (in->output == eo_obj) 61 if (in->output == eo_obj)
62 return EINA_FALSE; 62 return EINA_FALSE;
@@ -81,7 +81,7 @@ _ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
81{ 81{
82 Ecore_Audio_Input *in; 82 Ecore_Audio_Input *in;
83 83
84 in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS); 84 in = efl_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
85 85
86 if (in->output != eo_obj) 86 if (in->output != eo_obj)
87 return EINA_FALSE; 87 return EINA_FALSE;
@@ -115,7 +115,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
115EOLIAN static void 115EOLIAN static void
116_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func) 116_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
117{ 117{
118 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 118 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
119 119
120 if (ea_obj->vio) 120 if (ea_obj->vio)
121 _free_vio(ea_obj); 121 _free_vio(ea_obj);
@@ -132,7 +132,7 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN
132EOLIAN static Eo * 132EOLIAN static Eo *
133_ecore_audio_out_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Output *obj) 133_ecore_audio_out_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
134{ 134{
135 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 135 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
136 136
137 obj->need_writer = EINA_TRUE; 137 obj->need_writer = EINA_TRUE;
138 138
@@ -149,7 +149,7 @@ _ecore_audio_out_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
149 ecore_audio_obj_out_input_detach(eo_obj, in); 149 ecore_audio_obj_out_input_detach(eo_obj, in);
150 } 150 }
151 151
152 efl_destructor(eo_super(eo_obj, MY_CLASS)); 152 efl_destructor(efl_super(eo_obj, MY_CLASS));
153} 153}
154 154
155#include "ecore_audio_out.eo.c" 155#include "ecore_audio_out.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
index 91977b8..21c21c1 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
@@ -209,7 +209,7 @@ EOLIAN static void
209_ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, void *sd EINA_UNUSED, double volume) 209_ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, void *sd EINA_UNUSED, double volume)
210{ 210{
211 // TODO Change volume of playing inputs 211 // TODO Change volume of playing inputs
212 ecore_audio_obj_volume_set(eo_super(obj, MY_CLASS), volume); 212 ecore_audio_obj_volume_set(efl_super(obj, MY_CLASS), volume);
213} 213}
214 214
215EOLIAN static Eina_Bool 215EOLIAN static Eina_Bool
@@ -220,7 +220,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, void *sd EINA_
220 OSStatus err; 220 OSStatus err;
221 Eina_Bool chk; 221 Eina_Bool chk;
222 222
223 chk = ecore_audio_obj_out_input_attach(eo_super(obj, MY_CLASS), input); 223 chk = ecore_audio_obj_out_input_attach(efl_super(obj, MY_CLASS), input);
224 if (EINA_UNLIKELY(!chk)) 224 if (EINA_UNLIKELY(!chk))
225 { 225 {
226 ERR("Failed to attach input (eo_do_super)"); 226 ERR("Failed to attach input (eo_do_super)");
@@ -312,7 +312,7 @@ free_proc_id:
312free_helper: 312free_helper:
313 free(helper); 313 free(helper);
314detach: 314detach:
315 ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input); 315 ecore_audio_obj_out_input_detach(efl_super(obj, MY_CLASS), input);
316return_failure: 316return_failure:
317 return EINA_FALSE; 317 return EINA_FALSE;
318} 318}
@@ -328,7 +328,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, void *sd EINA_
328 data = efl_key_data_get(input, "coreaudio_data"); 328 data = efl_key_data_get(input, "coreaudio_data");
329 _core_audio_helper_free(data); 329 _core_audio_helper_free(data);
330 330
331 ret = ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input); 331 ret = ecore_audio_obj_out_input_detach(efl_super(obj, MY_CLASS), input);
332 332
333 return ret; 333 return ret;
334} 334}
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index c920f95..5adef64 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -52,7 +52,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
52 Eina_List *input; 52 Eina_List *input;
53 uint32_t idx; 53 uint32_t idx;
54 pa_cvolume pa_volume; 54 pa_cvolume pa_volume;
55 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 55 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
56 56
57 if (!EPA_LOAD()) return; 57 if (!EPA_LOAD()) return;
58 if (volume < 0) 58 if (volume < 0)
@@ -60,7 +60,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
60 60
61 EPA_CALL(pa_cvolume_set)(&pa_volume, 2, volume * PA_VOLUME_NORM); 61 EPA_CALL(pa_cvolume_set)(&pa_volume, 2, volume * PA_VOLUME_NORM);
62 62
63 ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume); 63 ecore_audio_obj_volume_set(efl_super(eo_obj, MY_CLASS), volume);
64 64
65 EINA_LIST_FOREACH(out_obj->inputs, input, in) { 65 EINA_LIST_FOREACH(out_obj->inputs, input, in) {
66 stream = efl_key_data_get(in, "pulse_data"); 66 stream = efl_key_data_get(in, "pulse_data");
@@ -110,10 +110,10 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
110 double speed = 0; 110 double speed = 0;
111 pa_stream *stream; 111 pa_stream *stream;
112 Eina_Bool ret = EINA_FALSE; 112 Eina_Bool ret = EINA_FALSE;
113 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 113 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
114 114
115 if (!EPA_LOAD()) return EINA_FALSE; 115 if (!EPA_LOAD()) return EINA_FALSE;
116 ret = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in); 116 ret = ecore_audio_obj_out_input_attach(efl_super(eo_obj, MY_CLASS), in);
117 if (!ret) 117 if (!ret)
118 return EINA_FALSE; 118 return EINA_FALSE;
119 119
@@ -128,7 +128,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
128 stream = EPA_CALL(pa_stream_new)(class_vars.context, name, &ss, NULL); 128 stream = EPA_CALL(pa_stream_new)(class_vars.context, name, &ss, NULL);
129 if (!stream) { 129 if (!stream) {
130 ERR("Could not create stream"); 130 ERR("Could not create stream");
131 ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); 131 ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in);
132 return EINA_FALSE; 132 return EINA_FALSE;
133 } 133 }
134 134
@@ -184,7 +184,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
184 pa_operation *op; 184 pa_operation *op;
185 185
186 if (!EPA_LOAD()) return EINA_FALSE; 186 if (!EPA_LOAD()) return EINA_FALSE;
187 ret2 = ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); 187 ret2 = ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in);
188 if (!ret2) 188 if (!ret2)
189 return EINA_FALSE; 189 return EINA_FALSE;
190 190
@@ -214,7 +214,7 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
214 214
215 //ref everything in the list to be sure... 215 //ref everything in the list to be sure...
216 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 216 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
217 eo_ref(eo_obj); 217 efl_ref(eo_obj);
218 } 218 }
219 // the callback here can delete things in the list.. 219 // the callback here can delete things in the list..
220 if (state == PA_CONTEXT_READY) { 220 if (state == PA_CONTEXT_READY) {
@@ -232,7 +232,7 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
232 } 232 }
233 // now unref everything safely 233 // now unref everything safely
234 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { 234 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
235 eo_unref(eo_obj); 235 efl_unref(eo_obj);
236 } 236 }
237} 237}
238 238
@@ -247,7 +247,7 @@ static void _state_job(void *data EINA_UNUSED)
247 DBG("PA context fail."); 247 DBG("PA context fail.");
248 //ref everything in the list to be sure... 248 //ref everything in the list to be sure...
249 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 249 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
250 eo_ref(eo_obj); 250 efl_ref(eo_obj);
251 } 251 }
252 // the callback here can delete things in the list.. 252 // the callback here can delete things in the list..
253 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 253 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
@@ -255,7 +255,7 @@ static void _state_job(void *data EINA_UNUSED)
255 } 255 }
256 // now unref everything safely 256 // now unref everything safely
257 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { 257 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
258 eo_unref(eo_obj); 258 efl_unref(eo_obj);
259 } 259 }
260 } 260 }
261 class_vars.state_job = NULL; 261 class_vars.state_job = NULL;
@@ -266,10 +266,10 @@ _ecore_audio_out_pulse_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_
266{ 266{
267 int argc; 267 int argc;
268 char **argv; 268 char **argv;
269 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 269 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
270 270
271 if (!EPA_LOAD()) return NULL; 271 if (!EPA_LOAD()) return NULL;
272 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 272 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
273 273
274 out_obj->need_writer = EINA_FALSE; 274 out_obj->need_writer = EINA_FALSE;
275 275
@@ -296,7 +296,7 @@ EOLIAN static void
296_ecore_audio_out_pulse_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED) 296_ecore_audio_out_pulse_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
297{ 297{
298 class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj); 298 class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj);
299 efl_destructor(eo_super(eo_obj, MY_CLASS)); 299 efl_destructor(efl_super(eo_obj, MY_CLASS));
300} 300}
301 301
302#include "ecore_audio_out_pulse.eo.c" 302#include "ecore_audio_out_pulse.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
index fddc898..ab8ad7b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -33,9 +33,9 @@ static Eina_Bool _write_cb(void *data)
33 Eo *eo_obj = data; 33 Eo *eo_obj = data;
34 Eo *in; 34 Eo *in;
35 35
36 Ecore_Audio_Out_Sndfile_Data *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS); 36 Ecore_Audio_Out_Sndfile_Data *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS);
37 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 37 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
38 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 38 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
39 39
40 ssize_t written, bread = 0; 40 ssize_t written, bread = 0;
41 float buf[1024]; 41 float buf[1024];
@@ -63,12 +63,12 @@ static Eina_Bool _write_cb(void *data)
63EOLIAN static Eina_Bool 63EOLIAN static Eina_Bool
64_ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Eo *in) 64_ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Eo *in)
65{ 65{
66 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 66 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
67 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 67 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
68 Eina_Bool ret2 = EINA_FALSE; 68 Eina_Bool ret2 = EINA_FALSE;
69 69
70 if (!ESF_LOAD()) return EINA_FALSE; 70 if (!ESF_LOAD()) return EINA_FALSE;
71 ret2 = ecore_audio_obj_out_input_attach(eo_super(eo_obj, MY_CLASS), in); 71 ret2 = ecore_audio_obj_out_input_attach(efl_super(eo_obj, MY_CLASS), in);
72 if (!ret2) 72 if (!ret2)
73 return EINA_FALSE; 73 return EINA_FALSE;
74 74
@@ -80,7 +80,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou
80 if (!obj->handle) { 80 if (!obj->handle) {
81 eina_stringshare_del(ea_obj->source); 81 eina_stringshare_del(ea_obj->source);
82 ea_obj->source = NULL; 82 ea_obj->source = NULL;
83 ecore_audio_obj_out_input_detach(eo_super(eo_obj, MY_CLASS), in); 83 ecore_audio_obj_out_input_detach(efl_super(eo_obj, MY_CLASS), in);
84 return EINA_FALSE; 84 return EINA_FALSE;
85 } 85 }
86 86
@@ -97,7 +97,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou
97EOLIAN static Eina_Bool 97EOLIAN static Eina_Bool
98_ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, const char *source) 98_ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, const char *source)
99{ 99{
100 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 100 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
101 101
102 if (!ESF_LOAD()) return EINA_FALSE; 102 if (!ESF_LOAD()) return EINA_FALSE;
103 if (obj->handle) { 103 if (obj->handle) {
@@ -118,14 +118,14 @@ _ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndf
118EOLIAN static const char* 118EOLIAN static const char*
119_ecore_audio_out_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 119_ecore_audio_out_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
120{ 120{
121 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 121 Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
122 return obj->source; 122 return obj->source;
123} 123}
124 124
125EOLIAN static Eina_Bool 125EOLIAN static Eina_Bool
126_ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Ecore_Audio_Format format) 126_ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Ecore_Audio_Format format)
127{ 127{
128 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 128 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
129 129
130 if (ea_obj->source) { 130 if (ea_obj->source) {
131 ERR("Input is already open - cannot change format"); 131 ERR("Input is already open - cannot change format");
@@ -157,16 +157,16 @@ _ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndf
157EOLIAN static Ecore_Audio_Format 157EOLIAN static Ecore_Audio_Format
158_ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 158_ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
159{ 159{
160 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 160 Ecore_Audio_Object *obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
161 return obj->format; 161 return obj->format;
162} 162}
163 163
164EOLIAN static Eo * 164EOLIAN static Eo *
165_ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 165_ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
166{ 166{
167 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 167 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
168 168
169 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 169 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
170 170
171 ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG); 171 ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG);
172 172
@@ -178,7 +178,7 @@ _ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndf
178EOLIAN static void 178EOLIAN static void
179_ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj) 179_ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj)
180{ 180{
181 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); 181 Ecore_Audio_Output *out_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
182 182
183 if (!ESF_LOAD()) return; 183 if (!ESF_LOAD()) return;
184 if (obj->handle) 184 if (obj->handle)
@@ -186,7 +186,7 @@ _ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfi
186 if (out_obj->write_idler) 186 if (out_obj->write_idler)
187 ecore_idler_del(out_obj->write_idler); 187 ecore_idler_del(out_obj->write_idler);
188 188
189 efl_destructor(eo_super(eo_obj, MY_CLASS)); 189 efl_destructor(efl_super(eo_obj, MY_CLASS));
190} 190}
191 191
192#include "ecore_audio_out_sndfile.eo.c" 192#include "ecore_audio_out_sndfile.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c
index 4a629c8..e24a178 100644
--- a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c
+++ b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c
@@ -16,7 +16,7 @@
16static sf_count_t _wrap_get_filelen(void *data) 16static sf_count_t _wrap_get_filelen(void *data)
17{ 17{
18 Eo *eo_obj = data; 18 Eo *eo_obj = data;
19 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 19 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
20 20
21 if (!ea_obj->vio->vio) 21 if (!ea_obj->vio->vio)
22 goto error; 22 goto error;
@@ -31,7 +31,7 @@ error:
31static sf_count_t _wrap_seek(sf_count_t offset, int whence, void *data) 31static sf_count_t _wrap_seek(sf_count_t offset, int whence, void *data)
32{ 32{
33 Eo *eo_obj = data; 33 Eo *eo_obj = data;
34 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 34 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
35 35
36 if (!ea_obj->vio->vio) 36 if (!ea_obj->vio->vio)
37 goto error; 37 goto error;
@@ -46,7 +46,7 @@ error:
46static sf_count_t _wrap_read(void *buffer, sf_count_t count, void *data) 46static sf_count_t _wrap_read(void *buffer, sf_count_t count, void *data)
47{ 47{
48 Eo *eo_obj = data; 48 Eo *eo_obj = data;
49 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 49 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
50 50
51 if (!ea_obj->vio->vio) 51 if (!ea_obj->vio->vio)
52 goto error; 52 goto error;
@@ -61,7 +61,7 @@ error:
61static sf_count_t _wrap_write(const void *buffer, sf_count_t count, void *data) 61static sf_count_t _wrap_write(const void *buffer, sf_count_t count, void *data)
62{ 62{
63 Eo *eo_obj = data; 63 Eo *eo_obj = data;
64 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 64 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
65 65
66 if (!ea_obj->vio->vio) 66 if (!ea_obj->vio->vio)
67 goto error; 67 goto error;
@@ -76,7 +76,7 @@ error:
76static sf_count_t _wrap_tell(void *data) 76static sf_count_t _wrap_tell(void *data)
77{ 77{
78 Eo *eo_obj = data; 78 Eo *eo_obj = data;
79 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); 79 Ecore_Audio_Object *ea_obj = efl_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
80 80
81 if (!ea_obj->vio->vio) 81 if (!ea_obj->vio->vio)
82 goto error; 82 goto error;
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index b1b87bf..9d304ac 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -123,7 +123,7 @@ int sd_fd_max = 0;
123void 123void
124_ecore_con_client_kill(Ecore_Con_Client *obj) 124_ecore_con_client_kill(Ecore_Con_Client *obj)
125{ 125{
126 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 126 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
127 if (cl->delete_me) 127 if (cl->delete_me)
128 DBG("Multi kill request for client %p", cl); 128 DBG("Multi kill request for client %p", cl);
129 else 129 else
@@ -141,7 +141,7 @@ _ecore_con_client_kill(Ecore_Con_Client *obj)
141void 141void
142_ecore_con_server_kill(Ecore_Con_Server *obj) 142_ecore_con_server_kill(Ecore_Con_Server *obj)
143{ 143{
144 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 144 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
145 if (svr->delete_me) 145 if (svr->delete_me)
146 DBG("Multi kill request for svr %p", svr); 146 DBG("Multi kill request for svr %p", svr);
147 else 147 else
@@ -267,7 +267,7 @@ ecore_con_shutdown(void)
267 267
268 EINA_LIST_FOREACH_SAFE(servers, l, l2, obj) 268 EINA_LIST_FOREACH_SAFE(servers, l, l2, obj)
269 { 269 {
270 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 270 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
271 Ecore_Con_Event_Server_Add *ev; 271 Ecore_Con_Event_Server_Add *ev;
272 272
273 if (!svr) continue; 273 if (!svr) continue;
@@ -305,7 +305,7 @@ _efl_network_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *n
305 if (!name || !done_cb) 305 if (!name || !done_cb)
306 return EINA_FALSE; 306 return EINA_FALSE;
307 307
308 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(eo_self, name), efl_network_port_set(eo_self, 1025)); 308 obj = efl_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(efl_self, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(efl_self, name), efl_network_port_set(efl_self, 1025));
309 309
310 lk = malloc(sizeof (Ecore_Con_Lookup)); 310 lk = malloc(sizeof (Ecore_Con_Lookup));
311 if (!lk) 311 if (!lk)
@@ -359,7 +359,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
359 359
360 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ 360 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
361 /* remote system socket: TCP/IP: [name]:[port] */ 361 /* remote system socket: TCP/IP: [name]:[port] */
362 obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_port_set(eo_self, port)); 362 obj = efl_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(efl_self, compl_type), efl_network_server_name_set(efl_self, name), efl_network_port_set(efl_self, port));
363 363
364 ecore_con_server_data_set(obj, (void *) data); 364 ecore_con_server_data_set(obj, (void *) data);
365 365
@@ -369,7 +369,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
369EOLIAN static Eo * 369EOLIAN static Eo *
370_efl_network_server_efl_object_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr) 370_efl_network_server_efl_object_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
371{ 371{
372 obj = efl_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); 372 obj = efl_constructor(efl_super(obj, EFL_NETWORK_SERVER_CLASS));
373 373
374 svr->fd = -1; 374 svr->fd = -1;
375 svr->reject_excess_clients = EINA_FALSE; 375 svr->reject_excess_clients = EINA_FALSE;
@@ -385,7 +385,7 @@ _efl_network_server_efl_object_finalize(Ecore_Con_Server *obj, Efl_Network_Serve
385 Ecore_Con_Type compl_type = svr->type; 385 Ecore_Con_Type compl_type = svr->type;
386 Ecore_Con_Type type; 386 Ecore_Con_Type type;
387 387
388 efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); 388 efl_finalize(efl_super(obj, EFL_NETWORK_SERVER_CLASS));
389 389
390 svr->created = EINA_TRUE; 390 svr->created = EINA_TRUE;
391 svr->ppid = getpid(); 391 svr->ppid = getpid();
@@ -455,7 +455,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
455 /* local user socket: FILE: ~/.ecore/[name]/[port] */ 455 /* local user socket: FILE: ~/.ecore/[name]/[port] */
456 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ 456 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
457 /* remote system socket: TCP/IP: [name]:[port] */ 457 /* remote system socket: TCP/IP: [name]:[port] */
458 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_port_set(eo_self, port)); 458 obj = efl_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(efl_self, compl_type), efl_network_server_name_set(efl_self, name), efl_network_port_set(efl_self, port));
459 459
460 ecore_con_server_data_set(obj, (void *) data); 460 ecore_con_server_data_set(obj, (void *) data);
461 461
@@ -465,13 +465,13 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
465EOLIAN static Eo * 465EOLIAN static Eo *
466_efl_network_connector_efl_object_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED) 466_efl_network_connector_efl_object_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED)
467{ 467{
468 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 468 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
469 Ecore_Con_Type compl_type = svr->type; 469 Ecore_Con_Type compl_type = svr->type;
470 Ecore_Con_Type type; 470 Ecore_Con_Type type;
471 471
472 /* XXX: We intentionally put SERVER class here and not connector, as we'd 472 /* XXX: We intentionally put SERVER class here and not connector, as we'd
473 * like to skip that one. */ 473 * like to skip that one. */
474 efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); 474 efl_finalize(efl_super(obj, EFL_NETWORK_SERVER_CLASS));
475 475
476 svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT; 476 svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT;
477 svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY; 477 svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY;
@@ -568,7 +568,7 @@ EAPI void *
568ecore_con_server_del(Ecore_Con_Server *obj) 568ecore_con_server_del(Ecore_Con_Server *obj)
569{ 569{
570 if (!obj) return NULL; 570 if (!obj) return NULL;
571 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 571 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
572 572
573 if (!svr || svr->delete_me) 573 if (!svr || svr->delete_me)
574 return NULL; 574 return NULL;
@@ -583,7 +583,7 @@ ecore_con_server_del(Ecore_Con_Server *obj)
583EAPI void * 583EAPI void *
584ecore_con_server_data_get(Ecore_Con_Server *obj) 584ecore_con_server_data_get(Ecore_Con_Server *obj)
585{ 585{
586 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 586 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
587 if (!svr) 587 if (!svr)
588 return NULL; 588 return NULL;
589 589
@@ -594,7 +594,7 @@ EAPI void *
594ecore_con_server_data_set(Ecore_Con_Server *obj, 594ecore_con_server_data_set(Ecore_Con_Server *obj,
595 void *data) 595 void *data)
596{ 596{
597 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 597 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
598 void *ret = NULL; 598 void *ret = NULL;
599 599
600 if (!svr) 600 if (!svr)
@@ -803,7 +803,7 @@ _efl_network_client_efl_network_send(Eo *obj EINA_UNUSED, Efl_Network_Client_Dat
803 ecore_main_fd_handler_active_set(cl->fd_handler, ECORE_FD_READ | ECORE_FD_WRITE); 803 ecore_main_fd_handler_active_set(cl->fd_handler, ECORE_FD_READ | ECORE_FD_WRITE);
804 804
805 if (cl->host_server) 805 if (cl->host_server)
806 host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_CLIENT_CLASS); 806 host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_CLIENT_CLASS);
807 807
808 808
809 if (cl->host_server && ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP)) 809 if (cl->host_server && ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP))
@@ -886,7 +886,7 @@ EAPI void *
886ecore_con_client_del(Ecore_Con_Client *obj) 886ecore_con_client_del(Ecore_Con_Client *obj)
887{ 887{
888 if (!obj) return NULL; 888 if (!obj) return NULL;
889 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 889 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
890 if (!cl) return NULL; 890 if (!cl) return NULL;
891 891
892#ifdef _WIN32 892#ifdef _WIN32
@@ -901,7 +901,7 @@ EAPI void
901ecore_con_client_data_set(Ecore_Con_Client *obj, 901ecore_con_client_data_set(Ecore_Con_Client *obj,
902 const void *data) 902 const void *data)
903{ 903{
904 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 904 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
905 if (!cl) 905 if (!cl)
906 return; 906 return;
907 907
@@ -911,7 +911,7 @@ ecore_con_client_data_set(Ecore_Con_Client *obj,
911EAPI void * 911EAPI void *
912ecore_con_client_data_get(Ecore_Con_Client *obj) 912ecore_con_client_data_get(Ecore_Con_Client *obj)
913{ 913{
914 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 914 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
915 if (!cl) 915 if (!cl)
916 return NULL; 916 return NULL;
917 917
@@ -936,7 +936,7 @@ ecore_con_client_ip_get(const Ecore_Con *obj)
936EOLIAN static int 936EOLIAN static int
937_efl_network_client_efl_network_port_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl) 937_efl_network_client_efl_network_port_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
938{ 938{
939 Efl_Network_Server_Data *sd = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 939 Efl_Network_Server_Data *sd = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
940 940
941 if (sd->type != ECORE_CON_REMOTE_TCP && 941 if (sd->type != ECORE_CON_REMOTE_TCP &&
942 sd->type != ECORE_CON_REMOTE_MCAST && 942 sd->type != ECORE_CON_REMOTE_MCAST &&
@@ -1017,7 +1017,7 @@ ecore_con_client_fd_get(const Ecore_Con *obj)
1017void 1017void
1018ecore_con_event_proxy_bind(Ecore_Con_Server *obj) 1018ecore_con_event_proxy_bind(Ecore_Con_Server *obj)
1019{ 1019{
1020 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1020 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1021 Ecore_Con_Event_Proxy_Bind *e; 1021 Ecore_Con_Event_Proxy_Bind *e;
1022 int ev = ECORE_CON_EVENT_PROXY_BIND; 1022 int ev = ECORE_CON_EVENT_PROXY_BIND;
1023 1023
@@ -1037,7 +1037,7 @@ ecore_con_event_proxy_bind(Ecore_Con_Server *obj)
1037void 1037void
1038ecore_con_event_server_add(Ecore_Con_Server *obj) 1038ecore_con_event_server_add(Ecore_Con_Server *obj)
1039{ 1039{
1040 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1040 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1041 /* we got our server! */ 1041 /* we got our server! */
1042 Ecore_Con_Event_Server_Add *e; 1042 Ecore_Con_Event_Server_Add *e;
1043 int ev = ECORE_CON_EVENT_SERVER_ADD; 1043 int ev = ECORE_CON_EVENT_SERVER_ADD;
@@ -1060,7 +1060,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
1060void 1060void
1061ecore_con_event_server_del(Ecore_Con_Server *obj) 1061ecore_con_event_server_del(Ecore_Con_Server *obj)
1062{ 1062{
1063 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1063 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1064 Ecore_Con_Event_Server_Del *e; 1064 Ecore_Con_Event_Server_Del *e;
1065 1065
1066 svr->delete_me = EINA_TRUE; 1066 svr->delete_me = EINA_TRUE;
@@ -1085,7 +1085,7 @@ ecore_con_event_server_del(Ecore_Con_Server *obj)
1085void 1085void
1086ecore_con_event_server_write(Ecore_Con_Server *obj, int num) 1086ecore_con_event_server_write(Ecore_Con_Server *obj, int num)
1087{ 1087{
1088 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1088 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1089 Ecore_Con_Event_Server_Write *e; 1089 Ecore_Con_Event_Server_Write *e;
1090 1090
1091 e = ecore_con_event_server_write_alloc(); 1091 e = ecore_con_event_server_write_alloc();
@@ -1103,7 +1103,7 @@ ecore_con_event_server_write(Ecore_Con_Server *obj, int num)
1103void 1103void
1104ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num, Eina_Bool duplicate) 1104ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num, Eina_Bool duplicate)
1105{ 1105{
1106 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1106 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1107 Ecore_Con_Event_Server_Data *e; 1107 Ecore_Con_Event_Server_Data *e;
1108 1108
1109 e = ecore_con_event_server_data_alloc(); 1109 e = ecore_con_event_server_data_alloc();
@@ -1140,14 +1140,14 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
1140void 1140void
1141ecore_con_event_client_add(Ecore_Con_Client *obj) 1141ecore_con_event_client_add(Ecore_Con_Client *obj)
1142{ 1142{
1143 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 1143 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
1144 Ecore_Con_Event_Client_Add *e; 1144 Ecore_Con_Event_Client_Add *e;
1145 int ev = ECORE_CON_EVENT_CLIENT_ADD; 1145 int ev = ECORE_CON_EVENT_CLIENT_ADD;
1146 1146
1147 e = ecore_con_event_client_add_alloc(); 1147 e = ecore_con_event_client_add_alloc();
1148 EINA_SAFETY_ON_NULL_RETURN(e); 1148 EINA_SAFETY_ON_NULL_RETURN(e);
1149 1149
1150 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 1150 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
1151 1151
1152 cl->event_count = eina_list_append(cl->event_count, e); 1152 cl->event_count = eina_list_append(cl->event_count, e);
1153 host_server->event_count = eina_list_append(host_server->event_count, e); 1153 host_server->event_count = eina_list_append(host_server->event_count, e);
@@ -1164,7 +1164,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
1164void 1164void
1165ecore_con_event_client_del(Ecore_Con_Client *obj) 1165ecore_con_event_client_del(Ecore_Con_Client *obj)
1166{ 1166{
1167 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 1167 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
1168 Ecore_Con_Event_Client_Del *e; 1168 Ecore_Con_Event_Client_Del *e;
1169 1169
1170 if (!cl) return; 1170 if (!cl) return;
@@ -1174,7 +1174,7 @@ ecore_con_event_client_del(Ecore_Con_Client *obj)
1174 EINA_SAFETY_ON_NULL_RETURN(e); 1174 EINA_SAFETY_ON_NULL_RETURN(e);
1175 cl->event_count = eina_list_append(cl->event_count, e); 1175 cl->event_count = eina_list_append(cl->event_count, e);
1176 1176
1177 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 1177 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
1178 1178
1179 host_server->event_count = eina_list_append(host_server->event_count, e); 1179 host_server->event_count = eina_list_append(host_server->event_count, e);
1180 _ecore_con_cl_timer_update(obj); 1180 _ecore_con_cl_timer_update(obj);
@@ -1187,13 +1187,13 @@ ecore_con_event_client_del(Ecore_Con_Client *obj)
1187void 1187void
1188ecore_con_event_client_write(Ecore_Con_Client *obj, int num) 1188ecore_con_event_client_write(Ecore_Con_Client *obj, int num)
1189{ 1189{
1190 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 1190 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
1191 Ecore_Con_Event_Client_Write *e; 1191 Ecore_Con_Event_Client_Write *e;
1192 1192
1193 e = ecore_con_event_client_write_alloc(); 1193 e = ecore_con_event_client_write_alloc();
1194 EINA_SAFETY_ON_NULL_RETURN(e); 1194 EINA_SAFETY_ON_NULL_RETURN(e);
1195 1195
1196 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 1196 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
1197 1197
1198 cl->event_count = eina_list_append(cl->event_count, e); 1198 cl->event_count = eina_list_append(cl->event_count, e);
1199 host_server->event_count = eina_list_append(host_server->event_count, e); 1199 host_server->event_count = eina_list_append(host_server->event_count, e);
@@ -1207,13 +1207,13 @@ ecore_con_event_client_write(Ecore_Con_Client *obj, int num)
1207void 1207void
1208ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num, Eina_Bool duplicate) 1208ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num, Eina_Bool duplicate)
1209{ 1209{
1210 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 1210 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
1211 Ecore_Con_Event_Client_Data *e; 1211 Ecore_Con_Event_Client_Data *e;
1212 1212
1213 e = ecore_con_event_client_data_alloc(); 1213 e = ecore_con_event_client_data_alloc();
1214 EINA_SAFETY_ON_NULL_RETURN(e); 1214 EINA_SAFETY_ON_NULL_RETURN(e);
1215 1215
1216 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 1216 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
1217 1217
1218 cl->event_count = eina_list_append(cl->event_count, e); 1218 cl->event_count = eina_list_append(cl->event_count, e);
1219 host_server->event_count = eina_list_append(host_server->event_count, e); 1219 host_server->event_count = eina_list_append(host_server->event_count, e);
@@ -1247,14 +1247,14 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
1247void 1247void
1248ecore_con_server_infos_del(Ecore_Con_Server *obj, void *info) 1248ecore_con_server_infos_del(Ecore_Con_Server *obj, void *info)
1249{ 1249{
1250 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1250 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1251 svr->infos = eina_list_remove(svr->infos, info); 1251 svr->infos = eina_list_remove(svr->infos, info);
1252} 1252}
1253 1253
1254void 1254void
1255_ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool duplicate) 1255_ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool duplicate)
1256{ 1256{
1257 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1257 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1258 Ecore_Con_Event_Server_Error *e; 1258 Ecore_Con_Event_Server_Error *e;
1259 1259
1260 e = ecore_con_event_server_error_alloc(); 1260 e = ecore_con_event_server_error_alloc();
@@ -1272,13 +1272,13 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
1272void 1272void
1273ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error) 1273ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
1274{ 1274{
1275 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 1275 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
1276 Ecore_Con_Event_Client_Error *e; 1276 Ecore_Con_Event_Client_Error *e;
1277 1277
1278 e = ecore_con_event_client_error_alloc(); 1278 e = ecore_con_event_client_error_alloc();
1279 EINA_SAFETY_ON_NULL_RETURN(e); 1279 EINA_SAFETY_ON_NULL_RETURN(e);
1280 1280
1281 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 1281 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
1282 1282
1283 e->client = obj; 1283 e->client = obj;
1284 e->error = strdup(error); 1284 e->error = strdup(error);
@@ -1335,7 +1335,7 @@ _efl_network_server_efl_object_destructor(Eo *obj, Efl_Network_Server_Data *svr)
1335 1335
1336 EINA_LIST_FREE(svr->clients, cl_obj) 1336 EINA_LIST_FREE(svr->clients, cl_obj)
1337 { 1337 {
1338 Efl_Network_Client_Data *cl = eo_data_scope_get(cl_obj, EFL_NETWORK_CLIENT_CLASS); 1338 Efl_Network_Client_Data *cl = efl_data_scope_get(cl_obj, EFL_NETWORK_CLIENT_CLASS);
1339 Ecore_Con_Event_Server_Add *ev; 1339 Ecore_Con_Event_Server_Add *ev;
1340 1340
1341 /* some pointer hacks here to prevent double frees if people are being stupid */ 1341 /* some pointer hacks here to prevent double frees if people are being stupid */
@@ -1373,7 +1373,7 @@ _efl_network_server_efl_object_destructor(Eo *obj, Efl_Network_Server_Data *svr)
1373 servers = eina_list_remove(servers, obj); 1373 servers = eina_list_remove(servers, obj);
1374 svr->data = NULL; 1374 svr->data = NULL;
1375 1375
1376 efl_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS)); 1376 efl_destructor(efl_super(obj, EFL_NETWORK_SERVER_CLASS));
1377end: 1377end:
1378 return; 1378 return;
1379} 1379}
@@ -1405,7 +1405,7 @@ _efl_network_client_efl_object_destructor(Eo *obj, Efl_Network_Client_Data *cl)
1405 break; 1405 break;
1406 } 1406 }
1407 } 1407 }
1408 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 1408 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
1409 1409
1410 if (host_server) 1410 if (host_server)
1411 { 1411 {
@@ -1439,13 +1439,13 @@ _efl_network_client_efl_object_destructor(Eo *obj, Efl_Network_Client_Data *cl)
1439 eina_stringshare_del(cl->ip); 1439 eina_stringshare_del(cl->ip);
1440 cl->data = NULL; 1440 cl->data = NULL;
1441 1441
1442 efl_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS)); 1442 efl_destructor(efl_super(obj, EFL_NETWORK_CLIENT_CLASS));
1443} 1443}
1444 1444
1445static Eina_Bool 1445static Eina_Bool
1446_ecore_con_server_timer(Ecore_Con_Server *obj) 1446_ecore_con_server_timer(Ecore_Con_Server *obj)
1447{ 1447{
1448 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1448 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1449 ecore_con_server_del(obj); 1449 ecore_con_server_del(obj);
1450 1450
1451 svr->until_deletion = NULL; 1451 svr->until_deletion = NULL;
@@ -1455,7 +1455,7 @@ _ecore_con_server_timer(Ecore_Con_Server *obj)
1455static void 1455static void
1456_ecore_con_server_timer_update(Ecore_Con_Server *obj) 1456_ecore_con_server_timer_update(Ecore_Con_Server *obj)
1457{ 1457{
1458 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1458 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1459 if (svr->disconnect_time) 1459 if (svr->disconnect_time)
1460 { 1460 {
1461 if (svr->disconnect_time > 0) 1461 if (svr->disconnect_time > 0)
@@ -1487,7 +1487,7 @@ _ecore_con_server_timer_update(Ecore_Con_Server *obj)
1487static Eina_Bool 1487static Eina_Bool
1488_ecore_con_client_timer(Ecore_Con_Client *obj) 1488_ecore_con_client_timer(Ecore_Con_Client *obj)
1489{ 1489{
1490 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 1490 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
1491 ecore_con_client_del(obj); 1491 ecore_con_client_del(obj);
1492 1492
1493 cl->until_deletion = NULL; 1493 cl->until_deletion = NULL;
@@ -1497,7 +1497,7 @@ _ecore_con_client_timer(Ecore_Con_Client *obj)
1497static void 1497static void
1498_ecore_con_cl_timer_update(Ecore_Con_Client *obj) 1498_ecore_con_cl_timer_update(Ecore_Con_Client *obj)
1499{ 1499{
1500 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 1500 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
1501 if (cl->disconnect_time) 1501 if (cl->disconnect_time)
1502 { 1502 {
1503 if (cl->disconnect_time > 0) 1503 if (cl->disconnect_time > 0)
@@ -1518,7 +1518,7 @@ _ecore_con_cl_timer_update(Ecore_Con_Client *obj)
1518 } 1518 }
1519 else 1519 else
1520 { 1520 {
1521 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 1521 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
1522 1522
1523 if (host_server && host_server->client_disconnect_time > 0) 1523 if (host_server && host_server->client_disconnect_time > 0)
1524 { 1524 {
@@ -1543,7 +1543,7 @@ _ecore_con_cb_tcp_listen(void *data,
1543 Ecore_Con_Info *net_info) 1543 Ecore_Con_Info *net_info)
1544{ 1544{
1545 Ecore_Con_Server *obj = data; 1545 Ecore_Con_Server *obj = data;
1546 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1546 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1547 struct linger lin; 1547 struct linger lin;
1548 const char *memerr = NULL; 1548 const char *memerr = NULL;
1549#ifdef _WIN32 1549#ifdef _WIN32
@@ -1655,7 +1655,7 @@ _ecore_con_cb_udp_listen(void *data,
1655 Ecore_Con_Info *net_info) 1655 Ecore_Con_Info *net_info)
1656{ 1656{
1657 Ecore_Con_Server *obj = data; 1657 Ecore_Con_Server *obj = data;
1658 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1658 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1659 Ecore_Con_Type type; 1659 Ecore_Con_Type type;
1660 struct ip_mreq mreq; 1660 struct ip_mreq mreq;
1661#ifdef HAVE_IPV6 1661#ifdef HAVE_IPV6
@@ -1770,7 +1770,7 @@ _ecore_con_cb_tcp_connect(void *data,
1770 Ecore_Con_Info *net_info) 1770 Ecore_Con_Info *net_info)
1771{ 1771{
1772 Ecore_Con_Server *obj = data; 1772 Ecore_Con_Server *obj = data;
1773 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1773 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1774 int res; 1774 int res;
1775 int curstate = 0; 1775 int curstate = 0;
1776 const char *memerr = NULL; 1776 const char *memerr = NULL;
@@ -1877,7 +1877,7 @@ _ecore_con_cb_udp_connect(void *data,
1877 int curstate = 0; 1877 int curstate = 0;
1878 int broadcast = 1; 1878 int broadcast = 1;
1879 const char *memerr = NULL; 1879 const char *memerr = NULL;
1880 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1880 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1881#ifdef _WIN32 1881#ifdef _WIN32
1882 u_long mode = 1; 1882 u_long mode = 1;
1883#endif 1883#endif
@@ -1940,7 +1940,7 @@ error:
1940static Ecore_Con_State 1940static Ecore_Con_State
1941svr_try_connect_plain(Ecore_Con_Server *obj) 1941svr_try_connect_plain(Ecore_Con_Server *obj)
1942{ 1942{
1943 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 1943 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
1944 int res; 1944 int res;
1945 int so_err = 0; 1945 int so_err = 0;
1946 socklen_t size = sizeof(int); 1946 socklen_t size = sizeof(int);
@@ -2045,7 +2045,7 @@ _ecore_con_svr_tcp_handler(void *data,
2045 unsigned char client_addr[256]; 2045 unsigned char client_addr[256];
2046 unsigned int client_addr_len; 2046 unsigned int client_addr_len;
2047 const char *clerr = NULL; 2047 const char *clerr = NULL;
2048 Efl_Network_Server_Data *svr = eo_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS); 2048 Efl_Network_Server_Data *svr = efl_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS);
2049#ifdef _WIN32 2049#ifdef _WIN32
2050 u_long mode = 1; 2050 u_long mode = 1;
2051#endif 2051#endif
@@ -2059,8 +2059,8 @@ _ecore_con_svr_tcp_handler(void *data,
2059 2059
2060 /* a new client */ 2060 /* a new client */
2061 2061
2062 obj = eo_add(EFL_NETWORK_CLIENT_CLASS, NULL); 2062 obj = efl_add(EFL_NETWORK_CLIENT_CLASS, NULL);
2063 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 2063 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
2064 if (!cl) 2064 if (!cl)
2065 { 2065 {
2066 ecore_con_event_server_error(svr_obj, "Memory allocation failure when attempting to add a new client"); 2066 ecore_con_event_server_error(svr_obj, "Memory allocation failure when attempting to add a new client");
@@ -2138,7 +2138,7 @@ error:
2138static void 2138static void
2139_ecore_con_cl_read(Ecore_Con_Server *obj) 2139_ecore_con_cl_read(Ecore_Con_Server *obj)
2140{ 2140{
2141 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2141 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2142 int num = 0; 2142 int num = 0;
2143 Eina_Bool lost_server = EINA_TRUE; 2143 Eina_Bool lost_server = EINA_TRUE;
2144 unsigned char buf[READBUFSIZ]; 2144 unsigned char buf[READBUFSIZ];
@@ -2198,7 +2198,7 @@ _ecore_con_cl_handler(void *data,
2198{ 2198{
2199 Ecore_Con_Server *obj = data; 2199 Ecore_Con_Server *obj = data;
2200 Eina_Bool want_read, want_write; 2200 Eina_Bool want_read, want_write;
2201 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2201 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2202 2202
2203 if (svr->delete_me) 2203 if (svr->delete_me)
2204 return ECORE_CALLBACK_RENEW; 2204 return ECORE_CALLBACK_RENEW;
@@ -2260,7 +2260,7 @@ _ecore_con_cl_udp_handler(void *data,
2260 int num; 2260 int num;
2261 Ecore_Con_Server *obj = data; 2261 Ecore_Con_Server *obj = data;
2262 Eina_Bool want_read, want_write; 2262 Eina_Bool want_read, want_write;
2263 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2263 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2264 2264
2265 want_read = ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ); 2265 want_read = ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ);
2266 want_write = ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE); 2266 want_write = ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE);
@@ -2302,7 +2302,7 @@ _ecore_con_svr_udp_handler(void *data,
2302 u_long mode = 1; 2302 u_long mode = 1;
2303#endif 2303#endif
2304 2304
2305 Efl_Network_Server_Data *svr = eo_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS); 2305 Efl_Network_Server_Data *svr = efl_data_scope_get(svr_obj, EFL_NETWORK_SERVER_CLASS);
2306 if (svr->delete_me) 2306 if (svr->delete_me)
2307 return ECORE_CALLBACK_RENEW; 2307 return ECORE_CALLBACK_RENEW;
2308 2308
@@ -2334,8 +2334,8 @@ _ecore_con_svr_udp_handler(void *data,
2334 } 2334 }
2335 2335
2336/* Create a new client for use in the client data event */ 2336/* Create a new client for use in the client data event */
2337 obj = eo_add(EFL_NETWORK_CLIENT_CLASS, NULL); 2337 obj = efl_add(EFL_NETWORK_CLIENT_CLASS, NULL);
2338 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 2338 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
2339 EINA_SAFETY_ON_NULL_RETURN_VAL(cl, ECORE_CALLBACK_RENEW); 2339 EINA_SAFETY_ON_NULL_RETURN_VAL(cl, ECORE_CALLBACK_RENEW);
2340 2340
2341 cl->host_server = svr_obj; 2341 cl->host_server = svr_obj;
@@ -2361,7 +2361,7 @@ _ecore_con_svr_udp_handler(void *data,
2361static void 2361static void
2362_ecore_con_svr_cl_read(Ecore_Con_Client *obj) 2362_ecore_con_svr_cl_read(Ecore_Con_Client *obj)
2363{ 2363{
2364 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 2364 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
2365 int num = 0; 2365 int num = 0;
2366 Eina_Bool lost_client = EINA_TRUE; 2366 Eina_Bool lost_client = EINA_TRUE;
2367 unsigned char buf[READBUFSIZ]; 2367 unsigned char buf[READBUFSIZ];
@@ -2379,7 +2379,7 @@ _ecore_con_svr_cl_read(Ecore_Con_Client *obj)
2379 _ecore_con_cl_timer_update(obj); 2379 _ecore_con_cl_timer_update(obj);
2380 } 2380 }
2381 2381
2382 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 2382 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
2383 if (!(host_server->type & ECORE_CON_SSL) && (!cl->upgrade)) 2383 if (!(host_server->type & ECORE_CON_SSL) && (!cl->upgrade))
2384 { 2384 {
2385 num = recv(cl->fd, (char *)buf, sizeof(buf), 0); 2385 num = recv(cl->fd, (char *)buf, sizeof(buf), 0);
@@ -2409,7 +2409,7 @@ _ecore_con_svr_cl_handler(void *data,
2409 Ecore_Fd_Handler *fd_handler) 2409 Ecore_Fd_Handler *fd_handler)
2410{ 2410{
2411 Ecore_Con_Client *obj = data; 2411 Ecore_Con_Client *obj = data;
2412 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 2412 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
2413 2413
2414 if (cl->delete_me) 2414 if (cl->delete_me)
2415 return ECORE_CALLBACK_RENEW; 2415 return ECORE_CALLBACK_RENEW;
@@ -2437,7 +2437,7 @@ _ecore_con_svr_cl_handler(void *data,
2437static void 2437static void
2438_ecore_con_server_flush(Ecore_Con_Server *obj) 2438_ecore_con_server_flush(Ecore_Con_Server *obj)
2439{ 2439{
2440 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2440 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2441 int count; 2441 int count;
2442 size_t num; 2442 size_t num;
2443 size_t buf_len; 2443 size_t buf_len;
@@ -2575,7 +2575,7 @@ _ecore_con_server_flush(Ecore_Con_Server *obj)
2575static void 2575static void
2576_ecore_con_client_flush(Ecore_Con_Client *obj) 2576_ecore_con_client_flush(Ecore_Con_Client *obj)
2577{ 2577{
2578 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 2578 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
2579 int count = 0; 2579 int count = 0;
2580 size_t num = 0; 2580 size_t num = 0;
2581 2581
@@ -2604,7 +2604,7 @@ _ecore_con_client_flush(Ecore_Con_Client *obj)
2604 if (!cl->buf) return; 2604 if (!cl->buf) return;
2605 num = eina_binbuf_length_get(cl->buf) - cl->buf_offset; 2605 num = eina_binbuf_length_get(cl->buf) - cl->buf_offset;
2606 if (num <= 0) return; 2606 if (num <= 0) return;
2607 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 2607 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
2608 if (!(host_server->type & ECORE_CON_SSL) && (!cl->upgrade)) 2608 if (!(host_server->type & ECORE_CON_SSL) && (!cl->upgrade))
2609 count = send(cl->fd, (char *)eina_binbuf_string_get(cl->buf) + cl->buf_offset, num, 0); 2609 count = send(cl->fd, (char *)eina_binbuf_string_get(cl->buf) + cl->buf_offset, num, 0);
2610 else 2610 else
@@ -2630,7 +2630,7 @@ _ecore_con_client_flush(Ecore_Con_Client *obj)
2630 eina_binbuf_free(cl->buf); 2630 eina_binbuf_free(cl->buf);
2631 cl->buf = NULL; 2631 cl->buf = NULL;
2632#ifdef TCP_CORK 2632#ifdef TCP_CORK
2633 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 2633 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
2634 if ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_CORK) 2634 if ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_CORK)
2635 { 2635 {
2636 int state = 0; 2636 int state = 0;
@@ -2650,13 +2650,13 @@ static void
2650_ecore_con_event_client_add_free(Ecore_Con_Server *obj, 2650_ecore_con_event_client_add_free(Ecore_Con_Server *obj,
2651 void *ev) 2651 void *ev)
2652{ 2652{
2653 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2653 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2654 Ecore_Con_Event_Client_Add *e; 2654 Ecore_Con_Event_Client_Add *e;
2655 2655
2656 e = ev; 2656 e = ev;
2657 if (e->client) 2657 if (e->client)
2658 { 2658 {
2659 Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS); 2659 Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
2660 Eina_Bool svrfreed = EINA_FALSE; 2660 Eina_Bool svrfreed = EINA_FALSE;
2661 2661
2662 if ((svr) && (cl)) 2662 if ((svr) && (cl))
@@ -2664,7 +2664,7 @@ _ecore_con_event_client_add_free(Ecore_Con_Server *obj,
2664 cl->event_count = eina_list_remove(cl->event_count, e); 2664 cl->event_count = eina_list_remove(cl->event_count, e);
2665 if (cl->host_server) 2665 if (cl->host_server)
2666 { 2666 {
2667 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 2667 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
2668 if (host_server) 2668 if (host_server)
2669 host_server->event_count = eina_list_remove(host_server->event_count, ev); 2669 host_server->event_count = eina_list_remove(host_server->event_count, ev);
2670 if ((!svr->event_count) && (svr->delete_me)) 2670 if ((!svr->event_count) && (svr->delete_me))
@@ -2691,13 +2691,13 @@ static void
2691_ecore_con_event_client_del_free(Ecore_Con_Server *obj, 2691_ecore_con_event_client_del_free(Ecore_Con_Server *obj,
2692 void *ev) 2692 void *ev)
2693{ 2693{
2694 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2694 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2695 Ecore_Con_Event_Client_Del *e; 2695 Ecore_Con_Event_Client_Del *e;
2696 2696
2697 e = ev; 2697 e = ev;
2698 if (e->client) 2698 if (e->client)
2699 { 2699 {
2700 Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS); 2700 Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
2701 Eina_Bool svrfreed = EINA_FALSE; 2701 Eina_Bool svrfreed = EINA_FALSE;
2702 2702
2703 if ((svr) && (cl)) 2703 if ((svr) && (cl))
@@ -2705,7 +2705,7 @@ _ecore_con_event_client_del_free(Ecore_Con_Server *obj,
2705 cl->event_count = eina_list_remove(cl->event_count, e); 2705 cl->event_count = eina_list_remove(cl->event_count, e);
2706 if (cl->host_server) 2706 if (cl->host_server)
2707 { 2707 {
2708 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 2708 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
2709 if (host_server) 2709 if (host_server)
2710 host_server->event_count = eina_list_remove(host_server->event_count, ev); 2710 host_server->event_count = eina_list_remove(host_server->event_count, ev);
2711 if ((!svr->event_count) && (svr->delete_me)) 2711 if ((!svr->event_count) && (svr->delete_me))
@@ -2731,10 +2731,10 @@ static void
2731_ecore_con_event_client_write_free(Ecore_Con_Server *obj, 2731_ecore_con_event_client_write_free(Ecore_Con_Server *obj,
2732 Ecore_Con_Event_Client_Write *e) 2732 Ecore_Con_Event_Client_Write *e)
2733{ 2733{
2734 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2734 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2735 if (e->client) 2735 if (e->client)
2736 { 2736 {
2737 Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS); 2737 Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
2738 Eina_Bool svrfreed = EINA_FALSE; 2738 Eina_Bool svrfreed = EINA_FALSE;
2739 2739
2740 if ((svr) && (cl)) 2740 if ((svr) && (cl))
@@ -2742,7 +2742,7 @@ _ecore_con_event_client_write_free(Ecore_Con_Server *obj,
2742 cl->event_count = eina_list_remove(cl->event_count, e); 2742 cl->event_count = eina_list_remove(cl->event_count, e);
2743 if (cl->host_server) 2743 if (cl->host_server)
2744 { 2744 {
2745 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 2745 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
2746 if (host_server) 2746 if (host_server)
2747 host_server->event_count = eina_list_remove(host_server->event_count, e); 2747 host_server->event_count = eina_list_remove(host_server->event_count, e);
2748 if ((!svr->event_count) && (svr->delete_me)) 2748 if ((!svr->event_count) && (svr->delete_me))
@@ -2753,7 +2753,7 @@ _ecore_con_event_client_write_free(Ecore_Con_Server *obj,
2753 } 2753 }
2754 if (!svrfreed) 2754 if (!svrfreed)
2755 { 2755 {
2756 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 2756 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
2757 if (((!cl->event_count) && (cl->delete_me)) || 2757 if (((!cl->event_count) && (cl->delete_me)) ||
2758 ((cl->host_server && 2758 ((cl->host_server &&
2759 ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP || 2759 ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP ||
@@ -2772,13 +2772,13 @@ static void
2772_ecore_con_event_client_data_free(Ecore_Con_Server *obj, 2772_ecore_con_event_client_data_free(Ecore_Con_Server *obj,
2773 void *ev) 2773 void *ev)
2774{ 2774{
2775 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2775 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2776 Ecore_Con_Event_Client_Data *e; 2776 Ecore_Con_Event_Client_Data *e;
2777 2777
2778 e = ev; 2778 e = ev;
2779 if (e->client) 2779 if (e->client)
2780 { 2780 {
2781 Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS); 2781 Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
2782 Eina_Bool svrfreed = EINA_FALSE; 2782 Eina_Bool svrfreed = EINA_FALSE;
2783 2783
2784 if ((svr) && (cl)) 2784 if ((svr) && (cl))
@@ -2786,7 +2786,7 @@ _ecore_con_event_client_data_free(Ecore_Con_Server *obj,
2786 cl->event_count = eina_list_remove(cl->event_count, e); 2786 cl->event_count = eina_list_remove(cl->event_count, e);
2787 if (cl->host_server) 2787 if (cl->host_server)
2788 { 2788 {
2789 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 2789 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
2790 if (host_server) 2790 if (host_server)
2791 host_server->event_count = eina_list_remove(host_server->event_count, ev); 2791 host_server->event_count = eina_list_remove(host_server->event_count, ev);
2792 } 2792 }
@@ -2797,7 +2797,7 @@ _ecore_con_event_client_data_free(Ecore_Con_Server *obj,
2797 } 2797 }
2798 if (!svrfreed) 2798 if (!svrfreed)
2799 { 2799 {
2800 Efl_Network_Server_Data *host_server = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 2800 Efl_Network_Server_Data *host_server = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
2801 if (((!cl->event_count) && (cl->delete_me)) || 2801 if (((!cl->event_count) && (cl->delete_me)) ||
2802 ((cl->host_server && 2802 ((cl->host_server &&
2803 ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP || 2803 ((host_server->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_UDP ||
@@ -2822,7 +2822,7 @@ _ecore_con_event_server_add_free(void *data EINA_UNUSED,
2822 e = ev; 2822 e = ev;
2823 if (e->server) 2823 if (e->server)
2824 { 2824 {
2825 Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); 2825 Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
2826 if (svr) 2826 if (svr)
2827 { 2827 {
2828 svr->event_count = eina_list_remove(svr->event_count, ev); 2828 svr->event_count = eina_list_remove(svr->event_count, ev);
@@ -2845,7 +2845,7 @@ _ecore_con_event_server_del_free(void *data EINA_UNUSED,
2845 e = ev; 2845 e = ev;
2846 if (e->server) 2846 if (e->server)
2847 { 2847 {
2848 Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); 2848 Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
2849 if (svr) 2849 if (svr)
2850 { 2850 {
2851 svr->event_count = eina_list_remove(svr->event_count, ev); 2851 svr->event_count = eina_list_remove(svr->event_count, ev);
@@ -2865,7 +2865,7 @@ _ecore_con_event_server_write_free(void *data EINA_UNUSED,
2865{ 2865{
2866 if (e->server) 2866 if (e->server)
2867 { 2867 {
2868 Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); 2868 Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
2869 if (svr) 2869 if (svr)
2870 { 2870 {
2871 svr->event_count = eina_list_remove(svr->event_count, e); 2871 svr->event_count = eina_list_remove(svr->event_count, e);
@@ -2888,7 +2888,7 @@ _ecore_con_event_server_data_free(void *data EINA_UNUSED,
2888 e = ev; 2888 e = ev;
2889 if (e->server) 2889 if (e->server)
2890 { 2890 {
2891 Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); 2891 Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
2892 if (svr) 2892 if (svr)
2893 { 2893 {
2894 svr->event_count = eina_list_remove(svr->event_count, ev); 2894 svr->event_count = eina_list_remove(svr->event_count, ev);
@@ -2909,7 +2909,7 @@ _ecore_con_event_server_error_free(void *data EINA_UNUSED, Ecore_Con_Event_Serve
2909{ 2909{
2910 if (e->server) 2910 if (e->server)
2911 { 2911 {
2912 Efl_Network_Server_Data *svr = eo_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS); 2912 Efl_Network_Server_Data *svr = efl_data_scope_get(e->server, EFL_NETWORK_SERVER_CLASS);
2913 if (svr) 2913 if (svr)
2914 { 2914 {
2915 svr->event_count = eina_list_remove(svr->event_count, e); 2915 svr->event_count = eina_list_remove(svr->event_count, e);
@@ -2927,10 +2927,10 @@ _ecore_con_event_server_error_free(void *data EINA_UNUSED, Ecore_Con_Event_Serve
2927static void 2927static void
2928_ecore_con_event_client_error_free(Ecore_Con_Server *obj, Ecore_Con_Event_Client_Error *e) 2928_ecore_con_event_client_error_free(Ecore_Con_Server *obj, Ecore_Con_Event_Client_Error *e)
2929{ 2929{
2930 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2930 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2931 if (e->client) 2931 if (e->client)
2932 { 2932 {
2933 Efl_Network_Client_Data *cl = eo_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS); 2933 Efl_Network_Client_Data *cl = efl_data_scope_get(e->client, EFL_NETWORK_CLIENT_CLASS);
2934 Eina_Bool svrfreed = EINA_FALSE; 2934 Eina_Bool svrfreed = EINA_FALSE;
2935 2935
2936 if ((svr) && (cl)) 2936 if ((svr) && (cl))
@@ -2966,7 +2966,7 @@ _ecore_con_lookup_done(void *data,
2966 Ecore_Con_Server *obj = data; 2966 Ecore_Con_Server *obj = data;
2967 Ecore_Con_Lookup *lk; 2967 Ecore_Con_Lookup *lk;
2968 2968
2969 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 2969 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
2970 if (!svr) return; 2970 if (!svr) return;
2971 lk = svr->data; 2971 lk = svr->data;
2972 2972
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index e1fec9b..4bf3a48 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -178,7 +178,7 @@ _ecore_con_eet_read_cb(const void *eet_data, size_t size, void *user_data)
178 Ecore_Con_Reply *n = user_data; 178 Ecore_Con_Reply *n = user_data;
179 Ecore_Con_Eet_Protocol *protocol; 179 Ecore_Con_Eet_Protocol *protocol;
180 Ecore_Con_Eet_Data *cb; 180 Ecore_Con_Eet_Data *cb;
181 Ecore_Con_Eet_Base_Data *ece_data = eo_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS); 181 Ecore_Con_Eet_Base_Data *ece_data = efl_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS);
182 182
183 protocol = eet_data_descriptor_decode(ece_data->edd, eet_data, size); 183 protocol = eet_data_descriptor_decode(ece_data->edd, eet_data, size);
184 if (!protocol) return EINA_TRUE; 184 if (!protocol) return EINA_TRUE;
@@ -208,7 +208,7 @@ static Eina_Bool
208_ecore_con_eet_client_write_cb(const void *data, size_t size, void *user_data) 208_ecore_con_eet_client_write_cb(const void *data, size_t size, void *user_data)
209{ 209{
210 Ecore_Con_Reply *n = user_data; 210 Ecore_Con_Reply *n = user_data;
211 Ecore_Con_Eet_Base_Data *ece_data = eo_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS); 211 Ecore_Con_Eet_Base_Data *ece_data = efl_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS);
212 212
213 if (ecore_con_server_send(ece_data->server, data, size) != (int)size) 213 if (ecore_con_server_send(ece_data->server, data, size) != (int)size)
214 return EINA_FALSE; 214 return EINA_FALSE;
@@ -223,8 +223,8 @@ _ecore_con_eet_server_connected(void *data, int type EINA_UNUSED, Ecore_Con_Even
223 Eina_List *ll; 223 Eina_List *ll;
224 Ecore_Con_Reply *n; 224 Ecore_Con_Reply *n;
225 Ecore_Con_Eet *ece_obj = data; 225 Ecore_Con_Eet *ece_obj = data;
226 Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS); 226 Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
227 Ecore_Con_Eet_Server_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS); 227 Ecore_Con_Eet_Server_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS);
228 228
229 if (ecore_con_client_server_get(ev->client) != base_data->server) 229 if (ecore_con_client_server_get(ev->client) != base_data->server)
230 return EINA_TRUE; 230 return EINA_TRUE;
@@ -254,8 +254,8 @@ static Eina_Bool
254_ecore_con_eet_server_disconnected(void *data, int type EINA_UNUSED, Ecore_Con_Event_Client_Del *ev) 254_ecore_con_eet_server_disconnected(void *data, int type EINA_UNUSED, Ecore_Con_Event_Client_Del *ev)
255{ 255{
256 Ecore_Con_Eet *ece_obj = data; 256 Ecore_Con_Eet *ece_obj = data;
257 Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS); 257 Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
258 Ecore_Con_Eet_Server_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS); 258 Ecore_Con_Eet_Server_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS);
259 Ecore_Con_Reply *n; 259 Ecore_Con_Reply *n;
260 Eina_List *l; 260 Eina_List *l;
261 261
@@ -326,7 +326,7 @@ _ecore_con_eet_data(Ecore_Con_Reply *n, void *data, unsigned int size)
326 char *buffer = (char *)&tmp[4]; 326 char *buffer = (char *)&tmp[4];
327 char *protocol; 327 char *protocol;
328 char *section; 328 char *section;
329 Ecore_Con_Eet_Base_Data *eceb_data = eo_data_scope_get(n->ece,ECORE_CON_EET_BASE_CLASS); 329 Ecore_Con_Eet_Base_Data *eceb_data = efl_data_scope_get(n->ece,ECORE_CON_EET_BASE_CLASS);
330 330
331 protocol = buffer; 331 protocol = buffer;
332 section = buffer + protocol_length; 332 section = buffer + protocol_length;
@@ -367,7 +367,7 @@ static Eina_Bool
367_ecore_con_eet_server_data(void *data, int type EINA_UNUSED, Ecore_Con_Event_Client_Data *ev) 367_ecore_con_eet_server_data(void *data, int type EINA_UNUSED, Ecore_Con_Event_Client_Data *ev)
368{ 368{
369 Ecore_Con_Eet *ece_obj = data; 369 Ecore_Con_Eet *ece_obj = data;
370 Ecore_Con_Eet_Base_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS); 370 Ecore_Con_Eet_Base_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
371 Ecore_Con_Reply *n; 371 Ecore_Con_Reply *n;
372 372
373 if (ecore_con_client_server_get(ev->client) != r->server) 373 if (ecore_con_client_server_get(ev->client) != r->server)
@@ -375,9 +375,9 @@ _ecore_con_eet_server_data(void *data, int type EINA_UNUSED, Ecore_Con_Event_Cli
375 375
376 n = ecore_con_client_data_get(ev->client); 376 n = ecore_con_client_data_get(ev->client);
377 377
378 eo_ref(ece_obj); 378 efl_ref(ece_obj);
379 _ecore_con_eet_data(n, ev->data, ev->size); 379 _ecore_con_eet_data(n, ev->data, ev->size);
380 eo_unref(ece_obj); 380 efl_unref(ece_obj);
381 381
382 return EINA_TRUE; 382 return EINA_TRUE;
383} 383}
@@ -389,8 +389,8 @@ _ecore_con_eet_client_connected(void *data, int type EINA_UNUSED, Ecore_Con_Even
389{ 389{
390 Ecore_Con_Eet_Server *eces; 390 Ecore_Con_Eet_Server *eces;
391 Ecore_Con_Eet *ece_obj = data; 391 Ecore_Con_Eet *ece_obj = data;
392 Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS); 392 Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
393 Ecore_Con_Eet_Client_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS); 393 Ecore_Con_Eet_Client_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
394 Ecore_Con_Reply *n; 394 Ecore_Con_Reply *n;
395 Eina_List *ll; 395 Eina_List *ll;
396 396
@@ -407,7 +407,7 @@ _ecore_con_eet_client_connected(void *data, int type EINA_UNUSED, Ecore_Con_Even
407 407
408 EINA_LIST_FOREACH(r->server_connect_callbacks, ll, eces) 408 EINA_LIST_FOREACH(r->server_connect_callbacks, ll, eces)
409 { 409 {
410 Ecore_Con_Eet_Base_Data *temp = eo_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS); 410 Ecore_Con_Eet_Base_Data *temp = efl_data_scope_get(n->ece, ECORE_CON_EET_BASE_CLASS);
411 if (!eces->func((void *)eces->data, n, temp->server)) 411 if (!eces->func((void *)eces->data, n, temp->server))
412 { 412 {
413 eet_connection_close(n->econn, NULL); 413 eet_connection_close(n->econn, NULL);
@@ -425,8 +425,8 @@ static Eina_Bool
425_ecore_con_eet_client_disconnected(void *data, int type EINA_UNUSED, Ecore_Con_Event_Server_Del *ev) 425_ecore_con_eet_client_disconnected(void *data, int type EINA_UNUSED, Ecore_Con_Event_Server_Del *ev)
426{ 426{
427 Ecore_Con_Eet *ece_obj = data; 427 Ecore_Con_Eet *ece_obj = data;
428 Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS); 428 Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
429 Ecore_Con_Eet_Client_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS); 429 Ecore_Con_Eet_Client_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
430 Ecore_Con_Eet_Server *eces; 430 Ecore_Con_Eet_Server *eces;
431 Eina_List *ll; 431 Eina_List *ll;
432 432
@@ -448,16 +448,16 @@ static Eina_Bool
448_ecore_con_eet_client_data(void *data, int type EINA_UNUSED, Ecore_Con_Event_Server_Data *ev) 448_ecore_con_eet_client_data(void *data, int type EINA_UNUSED, Ecore_Con_Event_Server_Data *ev)
449{ 449{
450 Ecore_Con_Eet *ece_obj = data; 450 Ecore_Con_Eet *ece_obj = data;
451 Ecore_Con_Eet_Base_Data *base_data = eo_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS); 451 Ecore_Con_Eet_Base_Data *base_data = efl_data_scope_get(ece_obj, ECORE_CON_EET_BASE_CLASS);
452 Ecore_Con_Eet_Client_Obj_Data *r = eo_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS); 452 Ecore_Con_Eet_Client_Obj_Data *r = efl_data_scope_get(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
453 453
454 if (base_data->server != ev->server) return EINA_TRUE; 454 if (base_data->server != ev->server) return EINA_TRUE;
455 if (!r->r) return EINA_TRUE; 455 if (!r->r) return EINA_TRUE;
456 456
457 /* Got some data */ 457 /* Got some data */
458 eo_ref(ece_obj); 458 efl_ref(ece_obj);
459 _ecore_con_eet_data(r->r, ev->data, ev->size); 459 _ecore_con_eet_data(r->r, ev->data, ev->size);
460 eo_unref(ece_obj); 460 efl_unref(ece_obj);
461 461
462 return EINA_TRUE; 462 return EINA_TRUE;
463} 463}
@@ -505,9 +505,9 @@ _ecore_con_eet_base_data_callback_del(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Da
505EOLIAN static void 505EOLIAN static void
506_ecore_con_eet_base_raw_data_callback_del(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name) 506_ecore_con_eet_base_raw_data_callback_del(Eo *obj, Ecore_Con_Eet_Base_Data *pd, const char *name)
507{ 507{
508 Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS); 508 Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS);
509 509
510 if (eo_isa(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS) && 510 if (efl_isa(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS) &&
511 eced->r->buffer_handler && 511 eced->r->buffer_handler &&
512 !strcmp(eced->r->buffer_handler->name, name)) 512 !strcmp(eced->r->buffer_handler->name, name))
513 { 513 {
@@ -580,7 +580,7 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c
580EOLIAN static Efl_Object * 580EOLIAN static Efl_Object *
581_ecore_con_eet_server_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED) 581_ecore_con_eet_server_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
582{ 582{
583 obj = efl_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS)); 583 obj = efl_constructor(efl_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
584 584
585 if (!obj) return NULL; 585 if (!obj) return NULL;
586 586
@@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Server_Ob
615 ecore_event_handler_del(pd->handler_del); 615 ecore_event_handler_del(pd->handler_del);
616 ecore_event_handler_del(pd->handler_data); 616 ecore_event_handler_del(pd->handler_data);
617 617
618 efl_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS)); 618 efl_destructor(efl_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
619} 619}
620 620
621EOLIAN static Efl_Object * 621EOLIAN static Efl_Object *
622_ecore_con_eet_client_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED) 622_ecore_con_eet_client_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
623{ 623{
624 obj = efl_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS)); 624 obj = efl_constructor(efl_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
625 625
626 if (!obj) return NULL; 626 if (!obj) return NULL;
627 627
@@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Client_Ob
654 ecore_event_handler_del(pd->handler_del); 654 ecore_event_handler_del(pd->handler_del);
655 ecore_event_handler_del(pd->handler_data); 655 ecore_event_handler_del(pd->handler_data);
656 656
657 efl_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS)); 657 efl_destructor(efl_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
658} 658}
659 659
660EOLIAN static Efl_Object * 660EOLIAN static Efl_Object *
661_ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd) 661_ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
662{ 662{
663 obj = efl_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS)); 663 obj = efl_constructor(efl_super(obj, ECORE_CON_EET_BASE_CLASS));
664 664
665 if (!obj) return NULL; 665 if (!obj) return NULL;
666 666
@@ -675,7 +675,7 @@ _ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
675EOLIAN static void 675EOLIAN static void
676_ecore_con_eet_base_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd) 676_ecore_con_eet_base_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
677{ 677{
678 efl_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS)); 678 efl_destructor(efl_super(obj, ECORE_CON_EET_BASE_CLASS));
679 679
680 eet_data_descriptor_free(pd->edd); 680 eet_data_descriptor_free(pd->edd);
681 eet_data_descriptor_free(pd->matching); 681 eet_data_descriptor_free(pd->matching);
@@ -699,7 +699,7 @@ _ecore_con_eet_base_efl_object_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
699EOLIAN static void 699EOLIAN static void
700_ecore_con_eet_base_server_set(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Server *data) 700_ecore_con_eet_base_server_set(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, Ecore_Con_Server *data)
701{ 701{
702 if (!eo_isa(data, EFL_NETWORK_SERVER_CLASS)) 702 if (!efl_isa(data, EFL_NETWORK_SERVER_CLASS))
703 return; 703 return;
704 704
705 pd->server = data; 705 pd->server = data;
@@ -722,7 +722,7 @@ ecore_con_eet_server_new(Ecore_Con_Server *server)
722 722
723 if (!server) return NULL; 723 if (!server) return NULL;
724 724
725 ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eo_self, server)); 725 ece_obj = efl_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_self, server));
726 726
727 return ece_obj; 727 return ece_obj;
728} 728}
@@ -734,7 +734,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
734 734
735 if (!server) return NULL; 735 if (!server) return NULL;
736 736
737 ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eo_self, server)); 737 ece_obj = efl_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_self, server));
738 738
739 return ece_obj; 739 return ece_obj;
740} 740}
@@ -778,7 +778,7 @@ ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name)
778EAPI void 778EAPI void
779ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) 779ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data)
780{ 780{
781 Ecore_Con_Eet_Server_Obj_Data *eces = eo_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS); 781 Ecore_Con_Eet_Server_Obj_Data *eces = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
782 Ecore_Con_Eet_Client *c; 782 Ecore_Con_Eet_Client *c;
783 783
784 if (!eces || !func) return; 784 if (!eces || !func) return;
@@ -795,7 +795,7 @@ ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie
795EAPI void 795EAPI void
796ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) 796ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data)
797{ 797{
798 Ecore_Con_Eet_Server_Obj_Data *eces = eo_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS); 798 Ecore_Con_Eet_Server_Obj_Data *eces = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
799 Ecore_Con_Eet_Client *c; 799 Ecore_Con_Eet_Client *c;
800 Eina_List *l; 800 Eina_List *l;
801 801
@@ -813,7 +813,7 @@ ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie
813EAPI void 813EAPI void
814ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) 814ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data)
815{ 815{
816 Ecore_Con_Eet_Server_Obj_Data *eces = eo_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS); 816 Ecore_Con_Eet_Server_Obj_Data *eces = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
817 Ecore_Con_Eet_Client *c; 817 Ecore_Con_Eet_Client *c;
818 818
819 if (!eces || !func) return; 819 if (!eces || !func) return;
@@ -830,7 +830,7 @@ ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
830EAPI void 830EAPI void
831ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) 831ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data)
832{ 832{
833 Ecore_Con_Eet_Server_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS); 833 Ecore_Con_Eet_Server_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_SERVER_OBJ_CLASS);
834 Ecore_Con_Eet_Client *c; 834 Ecore_Con_Eet_Client *c;
835 Eina_List *l; 835 Eina_List *l;
836 836
@@ -848,7 +848,7 @@ ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
848EAPI void 848EAPI void
849ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) 849ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data)
850{ 850{
851 Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS); 851 Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
852 Ecore_Con_Eet_Server *s; 852 Ecore_Con_Eet_Server *s;
853 853
854 if (!eced || !func) return; 854 if (!eced || !func) return;
@@ -865,7 +865,7 @@ ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv
865EAPI void 865EAPI void
866ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) 866ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data)
867{ 867{
868 Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS); 868 Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
869 Ecore_Con_Eet_Server *s; 869 Ecore_Con_Eet_Server *s;
870 Eina_List *l; 870 Eina_List *l;
871 871
@@ -883,7 +883,7 @@ ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv
883EAPI void 883EAPI void
884ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) 884ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data)
885{ 885{
886 Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS); 886 Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
887 Ecore_Con_Eet_Server *s; 887 Ecore_Con_Eet_Server *s;
888 888
889 if (!eced || !func) return; 889 if (!eced || !func) return;
@@ -900,7 +900,7 @@ ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
900EAPI void 900EAPI void
901ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) 901ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data)
902{ 902{
903 Ecore_Con_Eet_Client_Obj_Data *eced = eo_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS); 903 Ecore_Con_Eet_Client_Obj_Data *eced = efl_data_scope_get(ece, ECORE_CON_EET_CLIENT_OBJ_CLASS);
904 Ecore_Con_Eet_Server *s; 904 Ecore_Con_Eet_Server *s;
905 Eina_List *l; 905 Eina_List *l;
906 906
diff --git a/src/lib/ecore_con/ecore_con_info.c b/src/lib/ecore_con/ecore_con_info.c
index 093ab02..5038817 100644
--- a/src/lib/ecore_con/ecore_con_info.c
+++ b/src/lib/ecore_con/ecore_con_info.c
@@ -164,7 +164,7 @@ ecore_con_info_get(Ecore_Con_Server *obj,
164 void *data, 164 void *data,
165 struct addrinfo *hints) 165 struct addrinfo *hints)
166{ 166{
167 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 167 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
168 CB_Data *cbdata; 168 CB_Data *cbdata;
169 169
170 if (!svr) return 0; 170 if (!svr) return 0;
diff --git a/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c
index 6d3e2a5..243584b 100644
--- a/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
@@ -72,7 +72,7 @@ ecore_con_local_connect(Ecore_Con_Server *obj,
72#ifndef HAVE_LOCAL_SOCKETS 72#ifndef HAVE_LOCAL_SOCKETS
73 return 0; 73 return 0;
74#else 74#else
75 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 75 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
76 char buf[4096]; 76 char buf[4096];
77 struct sockaddr_un socket_unix; 77 struct sockaddr_un socket_unix;
78 int curstate = 0; 78 int curstate = 0;
@@ -213,7 +213,7 @@ ecore_con_local_listen(
213 EINA_UNUSED) 213 EINA_UNUSED)
214{ 214{
215#ifdef HAVE_LOCAL_SOCKETS 215#ifdef HAVE_LOCAL_SOCKETS
216 Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS); 216 Efl_Network_Server_Data *svr = efl_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
217 char buf[4096]; 217 char buf[4096];
218 struct sockaddr_un socket_unix; 218 struct sockaddr_un socket_unix;
219 struct linger lin; 219 struct linger lin;
diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 4a5dbad..09aa566 100644
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -36,11 +36,11 @@ static Eina_Bool
36_ecore_con_local_win32_server_read_client_handler(void *data, Ecore_Win32_Handler *wh) 36_ecore_con_local_win32_server_read_client_handler(void *data, Ecore_Win32_Handler *wh)
37{ 37{
38 Ecore_Con_Client *obj = data; 38 Ecore_Con_Client *obj = data;
39 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 39 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
40 void *buf; 40 void *buf;
41 DWORD n; 41 DWORD n;
42 Eina_Bool broken_pipe = EINA_FALSE; 42 Eina_Bool broken_pipe = EINA_FALSE;
43 Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 43 Efl_Network_Server_Data *host_svr = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
44 44
45 if (!ResetEvent(host_svr->event_read)) 45 if (!ResetEvent(host_svr->event_read))
46 return ECORE_CALLBACK_RENEW; 46 return ECORE_CALLBACK_RENEW;
@@ -89,8 +89,8 @@ static Eina_Bool
89_ecore_con_local_win32_server_peek_client_handler(void *data, Ecore_Win32_Handler *wh) 89_ecore_con_local_win32_server_peek_client_handler(void *data, Ecore_Win32_Handler *wh)
90{ 90{
91 Ecore_Con_Client *obj = data; 91 Ecore_Con_Client *obj = data;
92 Efl_Network_Client_Data *cl = eo_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS); 92 Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
93 Efl_Network_Server_Data *host_svr = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS); 93 Efl_Network_Server_Data *host_svr = efl_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
94#if 0 94#if 0
95 char *msg; 95 char *msg;
96#endif 96#endif
@@ -118,7 +118,7 @@ static Eina_Bool
118_ecore_con_local_win32_client_peek_server_handler(void *data, Ecore_Win32_Handler *wh) 118_ecore_con_local_win32_client_peek_server_handler(void *data, Ecore_Win32_Handler *wh)