summaryrefslogtreecommitdiff
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
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.
-rw-r--r--src/benchmarks/eo/class_simple.c14
-rw-r--r--src/benchmarks/eo/eo_bench.c6
-rw-r--r--src/benchmarks/eo/eo_bench.h2
-rw-r--r--src/benchmarks/eo/eo_bench_callbacks.c8
-rw-r--r--src/benchmarks/eo/eo_bench_eo_add.c26
-rw-r--r--src/benchmarks/eo/eo_bench_eo_do.c34
-rw-r--r--src/bin/elementary/test_application_server.c6
-rw-r--r--src/bin/elementary/test_code.c8
-rw-r--r--src/bin/elementary/test_entry.c2
-rw-r--r--src/bin/elementary/test_events.c8
-rw-r--r--src/bin/elementary/test_glview.c8
-rw-r--r--src/bin/elementary/test_grid_static.c30
-rw-r--r--src/bin/elementary/test_nstate.c2
-rw-r--r--src/bin/elementary/test_systray.c2
-rw-r--r--src/bin/elementary/test_task_switcher.c2
-rw-r--r--src/bin/elementary/test_ui_box.c36
-rw-r--r--src/bin/elementary/test_ui_grid.c52
-rw-r--r--src/bin/elementary/test_video.c2
-rw-r--r--src/bin/elementary/test_win_inline.c2
-rw-r--r--src/bin/eolian/eo_generator.c40
-rw-r--r--src/bin/eolian/impl_generator.c2
-rw-r--r--src/examples/ecore/ecore_audio_custom.c4
-rw-r--r--src/examples/ecore/ecore_audio_playback.c6
-rw-r--r--src/examples/ecore/ecore_audio_to_ogg.c4
-rw-r--r--src/examples/ecore/ecore_idler_example.c2
-rw-r--r--src/examples/ecore/ecore_poller_example.c12
-rw-r--r--src/examples/eio/efl_io_manager_ls.c6
-rw-r--r--src/examples/eio/efl_io_manager_open.c4
-rw-r--r--src/examples/eio/efl_io_manager_open_multi.c6
-rw-r--r--src/examples/eio/eio_sentry.c2
-rw-r--r--src/examples/eldbus/dbusmodel.c4
-rw-r--r--src/examples/elementary/evas3d_map_example.c34
-rw-r--r--src/examples/elementary/evas3d_object_on_button_example.c22
-rw-r--r--src/examples/elementary/evas3d_scene_on_button_example.c20
-rw-r--r--src/examples/elementary/filemvc.c18
-rw-r--r--src/examples/elementary/fileviewlist.c8
-rw-r--r--src/examples/elementary/performance/graphical.c30
-rw-r--r--src/examples/elementary/performance/performance.c2
-rw-r--r--src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c32
-rw-r--r--src/examples/emotion/emotion_border_example.c2
-rw-r--r--src/examples/emotion/emotion_generic_example.c2
-rw-r--r--src/examples/emotion/emotion_signals_example.c2
-rw-r--r--src/examples/eolian_cxx/colourable.c4
-rw-r--r--src/examples/evas/evas-3d-aabb.c32
-rw-r--r--src/examples/evas/evas-3d-blending.c28
-rw-r--r--src/examples/evas/evas-3d-colorpick.c24
-rw-r--r--src/examples/evas/evas-3d-cube-rotate.c22
-rw-r--r--src/examples/evas/evas-3d-cube.c22
-rw-r--r--src/examples/evas/evas-3d-cube2.c32
-rw-r--r--src/examples/evas/evas-3d-eet.c26
-rw-r--r--src/examples/evas/evas-3d-fog.c30
-rw-r--r--src/examples/evas/evas-3d-frustum.c34
-rw-r--r--src/examples/evas/evas-3d-hull.c36
-rw-r--r--src/examples/evas/evas-3d-md2.c24
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c22
-rw-r--r--src/examples/evas/evas-3d-obj.c24
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c34
-rw-r--r--src/examples/evas/evas-3d-pick.c22
-rw-r--r--src/examples/evas/evas-3d-ply.c24
-rw-r--r--src/examples/evas/evas-3d-proxy.c28
-rw-r--r--src/examples/evas/evas-3d-shadows.c78
-rw-r--r--src/examples/evas/evas-3d-static-lod.c40
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c10
-rw-r--r--src/examples/evas/evas-vg-simple.c26
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-header.c10
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-macros.h12
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter.c24
-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
-rw-r--r--src/modules/elementary/web/none/elm_web_none.c2
-rw-r--r--src/modules/emotion/generic/emotion_generic.c4
-rw-r--r--src/modules/emotion/gstreamer/emotion_gstreamer.c4
-rw-r--r--src/modules/emotion/gstreamer1/emotion_gstreamer.c4
-rw-r--r--src/modules/emotion/libvlc/emotion_libvlc.c4
-rw-r--r--src/modules/emotion/xine/emotion_xine.c4
-rw-r--r--src/modules/evas/engines/buffer/evas_engine.c2
-rw-r--r--src/modules/evas/engines/drm/evas_engine.c2
-rw-r--r--src/modules/evas/engines/eglfs/evas_engine.c2
-rw-r--r--src/modules/evas/engines/fb/evas_engine.c2
-rw-r--r--src/modules/evas/engines/gl_cocoa/evas_engine.c2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_3d.c54
-rw-r--r--src/modules/evas/engines/gl_drm/evas_engine.c2
-rw-r--r--src/modules/evas/engines/gl_drm/evas_outbuf.c2
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c26
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c18
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c14
-rw-r--r--src/modules/evas/engines/gl_sdl/evas_engine.c2
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c2
-rw-r--r--src/modules/evas/engines/psl1ght/evas_engine.c2
-rw-r--r--src/modules/evas/engines/software_ddraw/evas_engine.c2
-rw-r--r--src/modules/evas/engines/software_gdi/evas_engine.c2
-rw-r--r--src/modules/evas/engines/software_generic/evas_ector_software_buffer.c16
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c8
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.c2
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c2
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_dmabuf.c2
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c2
-rw-r--r--src/modules/evas/model_loaders/eet/evas_model_load_eet.c4
-rw-r--r--src/modules/evas/model_loaders/md2/evas_model_load_md2.c2
-rw-r--r--src/modules/evas/model_loaders/obj/evas_model_load_obj.c2
-rw-r--r--src/modules/evas/model_savers/eet/evas_model_save_eet.c4
-rw-r--r--src/modules/evas/model_savers/obj/evas_model_save_obj.c4
-rw-r--r--src/modules/evas/model_savers/ply/evas_model_save_ply.c2
-rw-r--r--src/tests/ecore/ecore_test_ecore.c28
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c32
-rw-r--r--src/tests/ecore/ecore_test_timer.c14
-rw-r--r--src/tests/edje/edje_test_edje.c18
-rw-r--r--src/tests/eina_cxx/simple.c2
-rw-r--r--src/tests/eio/eio_model_test_file.c6
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c6
-rw-r--r--src/tests/eio/eio_test_manager.c14
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c4
-rw-r--r--src/tests/eio/eio_test_sentry.c80
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c12
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_connection.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_method.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_object.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_proxy.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_signal.c4
-rw-r--r--src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c4
-rw-r--r--src/tests/elementary/elm_code_test_widget.c2
-rw-r--r--src/tests/elementary/elm_test_atspi.c28
-rw-r--r--src/tests/elementary/elm_test_button.c6
-rw-r--r--src/tests/elementary/elm_test_config.c2
-rw-r--r--src/tests/elementary/elm_test_layout.c6
-rw-r--r--src/tests/elementary/elm_test_video.c2
-rw-r--r--src/tests/elementary/elm_test_win.c4
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c6
-rw-r--r--src/tests/eo/access/access_inherit.c12
-rw-r--r--src/tests/eo/access/access_main.c10
-rw-r--r--src/tests/eo/access/access_simple.c10
-rw-r--r--src/tests/eo/children/children_main.c14
-rw-r--r--src/tests/eo/children/children_simple.c6
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c16
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c16
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c272
-rw-r--r--src/tests/eo/constructors/constructors_main.c34
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c18
-rw-r--r--src/tests/eo/constructors/constructors_simple.c32
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c10
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c8
-rw-r--r--src/tests/eo/constructors/constructors_simple4.c6
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c8
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c10
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c10
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.c6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c32
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c12
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c28
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c34
-rw-r--r--src/tests/eo/interface/interface_interface.c10
-rw-r--r--src/tests/eo/interface/interface_interface2.c10
-rw-r--r--src/tests/eo/interface/interface_main.c8
-rw-r--r--src/tests/eo/interface/interface_simple.c26
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c10
-rw-r--r--src/tests/eo/mixin/mixin_main.c16
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c20
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c20
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c20
-rw-r--r--src/tests/eo/mixin/mixin_mixin4.c6
-rw-r--r--src/tests/eo/mixin/mixin_simple.c18
-rw-r--r--src/tests/eo/signals/signals_main.c32
-rw-r--r--src/tests/eo/signals/signals_simple.c18
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c32
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c38
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c132
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c72
-rw-r--r--src/tests/eo/suite/eo_test_class_singleton.c12
-rw-r--r--src/tests/eo/suite/eo_test_general.c702
-rw-r--r--src/tests/eo/suite/eo_test_init.c24
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c26
-rw-r--r--src/tests/eo/suite/eo_test_value.c14
-rw-r--r--src/tests/eolian/data/class_simple_ref.c22
-rw-r--r--src/tests/eolian/data/object_impl_add_ref.c2
-rw-r--r--src/tests/eolian/data/object_impl_ref.c2
-rw-r--r--src/tests/eolian/data/override_ref.c44
-rw-r--r--src/tests/eolian_cxx/a.c2
-rw-r--r--src/tests/eolian_cxx/b.c2
-rw-r--r--src/tests/eolian_cxx/c.c2
-rw-r--r--src/tests/eolian_cxx/d.c2
-rw-r--r--src/tests/eolian_cxx/generic.c2
-rw-r--r--src/tests/eolian_cxx/simple.c2
-rw-r--r--src/tests/eolian_js/eolian_js_test_constructor_method_impl.c8
-rw-r--r--src/tests/eolian_js/eolian_js_test_test_object_impl.c6
-rw-r--r--src/tests/evas/evas_test_image.c6
-rw-r--r--src/tests/evas/evas_test_mesh.c8
-rw-r--r--src/tests/evas/evas_test_object.c4
519 files changed, 5824 insertions, 5824 deletions
<
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index e825291..b8fd274 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -19,7 +19,7 @@ _other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int ti
19 } 19 }
20} 20}
21 21
22EAPI EO_VOID_FUNC_BODYV(simple_other_call, EO_FUNC_CALL(other, times), Eo *other, int times); 22EAPI EFL_VOID_FUNC_BODYV(simple_other_call, EFL_FUNC_CALL(other, times), Eo *other, int times);
23 23
24static void 24static void
25_a_set(Eo *obj EINA_UNUSED, void *class_data, int a) 25_a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
@@ -28,23 +28,23 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
28 pd->a = a; 28 pd->a = a;
29} 29}
30 30
31EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); 31EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
32 32
33static Efl_Op_Description op_desc[] = { 33static Efl_Op_Description op_desc[] = {
34 EO_OP_FUNC(simple_a_set, _a_set), 34 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
35 EO_OP_FUNC(simple_other_call, _other_call), 35 EFL_OBJECT_OP_FUNC(simple_other_call, _other_call),
36}; 36};
37 37
38static const Efl_Class_Description class_desc = { 38static const Efl_Class_Description class_desc = {
39 EO_VERSION, 39 EO_VERSION,
40 "Simple", 40 "Simple",
41 EO_CLASS_TYPE_REGULAR, 41 EFL_CLASS_TYPE_REGULAR,
42 EO_CLASS_DESCRIPTION_OPS(op_desc), 42 EFL_CLASS_DESCRIPTION_OPS(op_desc),
43 NULL, 43 NULL,
44 sizeof(Simple_Public_Data), 44 sizeof(Simple_Public_Data),
45 NULL, 45 NULL,
46 NULL 46 NULL
47}; 47};
48 48
49EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL) 49EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
50 50
diff --git a/src/benchmarks/eo/eo_bench.c b/src/benchmarks/eo/eo_bench.c
index 3b6584e..455fd9a 100644
--- a/src/benchmarks/eo/eo_bench.c
+++ b/src/benchmarks/eo/eo_bench.c
@@ -20,7 +20,7 @@ struct _Eina_Benchmark_Case
20 20
21static const Eina_Benchmark_Case etc[] = { 21static const Eina_Benchmark_Case etc[] = {
22 { "eo_do", eo_bench_eo_do }, 22 { "eo_do", eo_bench_eo_do },
23 { "eo_add", eo_bench_eo_add }, 23 { "efl_add", eo_bench_efl_add },
24 { "eo_callbacks", eo_bench_callbacks }, 24 { "eo_callbacks", eo_bench_callbacks },
25 { NULL, NULL } 25 { NULL, NULL }
26}; 26};
@@ -35,7 +35,7 @@ main(int argc, char **argv)
35 return -1; 35 return -1;
36 36
37 eina_init(); 37 eina_init();
38 eo_init(); 38 efl_object_init();
39 39
40 for (i = 0; etc[i].bench_case; ++i) 40 for (i = 0; etc[i].bench_case; ++i)
41 { 41 {
@@ -50,7 +50,7 @@ main(int argc, char **argv)
50 eina_benchmark_free(test); 50 eina_benchmark_free(test);
51 } 51 }
52 52
53 eo_shutdown(); 53 efl_object_shutdown();
54 eina_shutdown(); 54 eina_shutdown();
55 55
56 return 0; 56 return 0;
diff --git a/src/benchmarks/eo/eo_bench.h b/src/benchmarks/eo/eo_bench.h
index 88ee999..5fc14be 100644
--- a/src/benchmarks/eo/eo_bench.h
+++ b/src/benchmarks/eo/eo_bench.h
@@ -2,7 +2,7 @@
2#define EINA_BENCH_H_ 2#define EINA_BENCH_H_
3 3
4void eo_bench_eo_do(Eina_Benchmark *bench); 4void eo_bench_eo_do(Eina_Benchmark *bench);
5void eo_bench_eo_add(Eina_Benchmark *bench); 5void eo_bench_efl_add(Eina_Benchmark *bench);
6void eo_bench_callbacks(Eina_Benchmark *bench); 6void eo_bench_callbacks(Eina_Benchmark *bench);
7 7
8#define _EO_BENCH_TIMES(Start, Repeat, Jump) (Start), ((Start) + ((Jump) * (Repeat))), (Jump) 8#define _EO_BENCH_TIMES(Start, Repeat, Jump) (Start), ((Start) + ((Jump) * (Repeat))), (Jump)
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c
index ed76228..4c8a9f3 100644
--- a/src/benchmarks/eo/eo_bench_callbacks.c
+++ b/src/benchmarks/eo/eo_bench_callbacks.c
@@ -16,14 +16,14 @@ static void
16bench_eo_callbacks_add(int request) 16bench_eo_callbacks_add(int request)
17{ 17{
18 int i; 18 int i;
19 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 19 Eo *obj = efl_add(SIMPLE_CLASS, NULL);
20 20
21 for (i = 0 ; i < request ; i++) 21 for (i = 0 ; i < request ; i++)
22 { 22 {
23 efl_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL); 23 efl_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL);
24 } 24 }
25 25
26 eo_unref(obj); 26 efl_unref(obj);
27} 27}
28 28
29static void 29static void
@@ -52,7 +52,7 @@ bench_eo_callbacks_call(int request)
52 Eo *obj[len]; 52 Eo *obj[len];
53 for (i = 0 ; i < len ; i++) 53 for (i = 0 ; i < len ; i++)
54 { 54 {
55 obj[i] = eo_add(SIMPLE_CLASS, NULL); 55 obj[i] = efl_add(SIMPLE_CLASS, NULL);
56 56
57 for (j = 0 ; j < i ; j++) 57 for (j = 0 ; j < i ; j++)
58 { 58 {
@@ -71,7 +71,7 @@ bench_eo_callbacks_call(int request)
71 71
72 for (i = 0 ; i < len ; i++) 72 for (i = 0 ; i < len ; i++)
73 { 73 {
74 eo_unref(obj[i]); 74 efl_unref(obj[i]);
75 } 75 }
76} 76}
77 77
diff --git a/src/benchmarks/eo/eo_bench_eo_add.c b/src/benchmarks/eo/eo_bench_eo_add.c
index 462f3b9..7bd10d8 100644
--- a/src/benchmarks/eo/eo_bench_eo_add.c
+++ b/src/benchmarks/eo/eo_bench_eo_add.c
@@ -7,41 +7,41 @@
7#include "class_simple.h" 7#include "class_simple.h"
8 8
9static void 9static void
10bench_eo_add_linear(int request) 10bench_efl_add_linear(int request)
11{ 11{
12 int i; 12 int i;
13 Eo **objs = calloc(request, sizeof(Eo *)); 13 Eo **objs = calloc(request, sizeof(Eo *));
14 for (i = 0 ; i < request ; i++) 14 for (i = 0 ; i < request ; i++)
15 objs[i] = eo_add(SIMPLE_CLASS, NULL); 15 objs[i] = efl_add(SIMPLE_CLASS, NULL);
16 16
17 for (i = 0 ; i < request ; i++) 17 for (i = 0 ; i < request ; i++)
18 eo_unref(objs[i]); 18 efl_unref(objs[i]);
19 free(objs); 19 free(objs);
20} 20}
21 21
22static void 22static void
23bench_eo_add_jump_by_2(int request) 23bench_efl_add_jump_by_2(int request)
24{ 24{
25 int i; 25 int i;
26 Eo **objs = calloc(request, sizeof(Eo *)); 26 Eo **objs = calloc(request, sizeof(Eo *));
27 for (i = 0 ; i < request ; i++) 27 for (i = 0 ; i < request ; i++)
28 objs[i] = eo_add(SIMPLE_CLASS, NULL); 28 objs[i] = efl_add(SIMPLE_CLASS, NULL);
29 29
30 for (i = 0 ; i < request ; i += 2) 30 for (i = 0 ; i < request ; i += 2)
31 eo_unref(objs[i]); 31 efl_unref(objs[i]);
32 32
33 for (i = 0 ; i < request ; i += 2) 33 for (i = 0 ; i < request ; i += 2)
34 objs[i] = eo_add(SIMPLE_CLASS, NULL); 34 objs[i] = efl_add(SIMPLE_CLASS, NULL);
35 35
36 for (i = 0 ; i < request ; i++) 36 for (i = 0 ; i < request ; i++)
37 eo_unref(objs[i]); 37 efl_unref(objs[i]);
38 free(objs); 38 free(objs);
39} 39}
40 40
41void eo_bench_eo_add(Eina_Benchmark *bench) 41void eo_bench_efl_add(Eina_Benchmark *bench)
42{ 42{
43 eina_benchmark_register(bench, "eo_add_linear", 43 eina_benchmark_register(bench, "efl_add_linear",
44 EINA_BENCHMARK(bench_eo_add_linear), _EO_BENCH_TIMES(1000, 10, 50000)); 44 EINA_BENCHMARK(bench_efl_add_linear), _EO_BENCH_TIMES(1000, 10, 50000));
45 eina_benchmark_register(bench, "eo_add_jump_by_2", 45 eina_benchmark_register(bench, "efl_add_jump_by_2",
46 EINA_BENCHMARK(bench_eo_add_jump_by_2), _EO_BENCH_TIMES(1000, 10, 50000)); 46 EINA_BENCHMARK(bench_efl_add_jump_by_2), _EO_BENCH_TIMES(1000, 10, 50000));
47} 47}
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index 485f297..d927990 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -10,44 +10,44 @@ static void
10bench_eo_do_simple(int request) 10bench_eo_do_simple(int request)
11{ 11{
12 int i; 12 int i;
13 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 13 Eo *obj = efl_add(SIMPLE_CLASS, NULL);
14 for (i = 0 ; i < request ; i++) 14 for (i = 0 ; i < request ; i++)
15 { 15 {
16 simple_a_set(obj, i); 16 simple_a_set(obj, i);
17 } 17 }
18 18
19 eo_unref(obj); 19 efl_unref(obj);
20} 20}
21 21
22static void 22static void
23bench_eo_do_two_objs(int request) 23bench_eo_do_two_objs(int request)
24{ 24{
25 int i; 25 int i;
26 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 26 Eo *obj = efl_add(SIMPLE_CLASS, NULL);
27 Eo *obj2 = eo_add(SIMPLE_CLASS, NULL); 27 Eo *obj2 = efl_add(SIMPLE_CLASS, NULL);
28 for (i = 0 ; i < request ; i++) 28 for (i = 0 ; i < request ; i++)
29 { 29 {
30 simple_a_set(obj, i); 30 simple_a_set(obj, i);
31 simple_a_set(obj2, i); 31 simple_a_set(obj2, i);
32 } 32 }
33 33
34 eo_unref(obj); 34 efl_unref(obj);
35 eo_unref(obj2); 35 efl_unref(obj2);
36} 36}
37 37
38static void 38static void
39bench_eo_do_two_objs_growing_stack(int request) 39bench_eo_do_two_objs_growing_stack(int request)
40{ 40{
41 int i; 41 int i;
42 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 42 Eo *obj = efl_add(SIMPLE_CLASS, NULL);
43 Eo *obj2 = eo_add(SIMPLE_CLASS, NULL); 43 Eo *obj2 = efl_add(SIMPLE_CLASS, NULL);
44 for (i = 0 ; i < request ; i++) 44 for (i = 0 ; i < request ; i++)
45 { 45 {
46 simple_other_call(obj, obj2, 20); 46 simple_other_call(obj, obj2, 20);
47 } 47 }
48 48
49 eo_unref(obj); 49 efl_unref(obj);
50 eo_unref(obj2); 50 efl_unref(obj2);
51} 51}
52 52
53static const Efl_Class *cur_klass; 53static const Efl_Class *cur_klass;
@@ -55,11 +55,11 @@ static const Efl_Class *cur_klass;
55static void 55static void
56_a_set(Eo *obj, void *class_data EINA_UNUSED, int a) 56_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
57{ 57{
58 simple_a_set(eo_super(obj, cur_klass), a); 58 simple_a_set(efl_super(obj, cur_klass), a);
59} 59}
60 60
61static Efl_Op_Description op_desc[] = { 61static Efl_Op_Description op_desc[] = {
62 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 62 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
63}; 63};
64 64
65static void 65static void
@@ -68,23 +68,23 @@ bench_eo_do_super(int request)
68 static Efl_Class_Description class_desc = { 68 static Efl_Class_Description class_desc = {
69 EO_VERSION, 69 EO_VERSION,
70 "Simple2", 70 "Simple2",
71 EO_CLASS_TYPE_REGULAR, 71 EFL_CLASS_TYPE_REGULAR,
72 EO_CLASS_DESCRIPTION_OPS(op_desc), 72 EFL_CLASS_DESCRIPTION_OPS(op_desc),
73 NULL, 73 NULL,
74 0, 74 0,
75 NULL, 75 NULL,
76 NULL 76 NULL
77 }; 77 };
78 cur_klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); 78 cur_klass = efl_class_new(&class_desc, SIMPLE_CLASS, NULL);
79 79
80 int i; 80 int i;
81 Eo *obj = eo_add(cur_klass, NULL); 81 Eo *obj = efl_add(cur_klass, NULL);
82 for (i = 0 ; i < request ; i++) 82 for (i = 0 ; i < request ; i++)
83 { 83 {
84 simple_a_set(obj, i); 84 simple_a_set(obj, i);
85 } 85 }
86 86
87 eo_unref(obj); 87 efl_unref(obj);
88} 88}
89 89
90void eo_bench_eo_do(Eina_Benchmark *bench) 90void eo_bench_eo_do(Eina_Benchmark *bench)
diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c
index 822a0c1..941e5d9 100644
--- a/src/bin/elementary/test_application_server.c
+++ b/src/bin/elementary/test_application_server.c
@@ -96,7 +96,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
96 return NULL; 96 return NULL;
97 } 97 }
98 98
99 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(eo_self, NULL)); 99 view = efl_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(efl_self, NULL));
100 100
101 id = elm_app_server_view_id_get(view); 101 id = elm_app_server_view_id_get(view);
102 pkg = elm_app_server_package_get(app_server); 102 pkg = elm_app_server_package_get(app_server);
@@ -126,7 +126,7 @@ _terminate_cb(void *data EINA_UNUSED, const Eo_Event *event)
126 title = elm_app_server_title_get(event->object); 126 title = elm_app_server_title_get(event->object);
127 127
128 printf("Closing: %s\n", title); 128 printf("Closing: %s\n", title);
129 eo_unref(event->object); 129 efl_unref(event->object);
130} 130}
131 131
132Elm_App_Server * 132Elm_App_Server *
@@ -136,7 +136,7 @@ test_application_server_common(const char *pkg)
136 Elm_App_Server_View *view; 136 Elm_App_Server_View *view;
137 Elm_App_Server *server; 137 Elm_App_Server *server;
138 138
139 server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(eo_self, pkg, _create_view_cb)); 139 server = efl_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(efl_self, pkg, _create_view_cb));
140 elm_app_server_title_set(server, pkg); 140 elm_app_server_title_set(server, pkg);
141 views_iter = elm_app_server_views_get(server); 141 views_iter = elm_app_server_views_get(server);
142 efl_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL); 142 efl_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL);
diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c
index 51ce46a..a8d24bb 100644
--- a/src/bin/elementary/test_code.c
+++ b/src/bin/elementary/test_code.c
@@ -55,7 +55,7 @@ _elm_code_test_welcome_setup(Evas_Object *parent)
55 Elm_Code_Widget *widget; 55 Elm_Code_Widget *widget;
56 56
57 code = elm_code_create(); 57 code = elm_code_create();
58 widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); 58 widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code));
59 elm_obj_code_widget_font_set(widget, NULL, 12); 59 elm_obj_code_widget_font_set(widget, NULL, 12);
60 efl_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL); 60 efl_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL);
61 efl_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code); 61 efl_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code);
@@ -83,7 +83,7 @@ _elm_code_test_editor_setup(Evas_Object *parent, Eina_Bool log)
83 Elm_Code_Widget *widget; 83 Elm_Code_Widget *widget;
84 84
85 code = elm_code_create(); 85 code = elm_code_create();
86 widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); 86 widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code));
87 elm_obj_code_widget_font_set(widget, NULL, 14); 87 elm_obj_code_widget_font_set(widget, NULL, 14);
88 elm_obj_code_widget_editable_set(widget, EINA_TRUE); 88 elm_obj_code_widget_editable_set(widget, EINA_TRUE);
89 elm_obj_code_widget_show_whitespace_set(widget, EINA_TRUE); 89 elm_obj_code_widget_show_whitespace_set(widget, EINA_TRUE);
@@ -113,7 +113,7 @@ _elm_code_test_mirror_setup(Elm_Code *code, char *font_name, Evas_Object *parent
113{ 113{
114 Elm_Code_Widget *widget; 114 Elm_Code_Widget *widget;
115 115
116 widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); 116 widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code));
117 elm_obj_code_widget_font_set(widget, font_name, 11); 117 elm_obj_code_widget_font_set(widget, font_name, 11);
118 elm_obj_code_widget_line_numbers_set(widget, EINA_TRUE); 118 elm_obj_code_widget_line_numbers_set(widget, EINA_TRUE);
119 119
@@ -131,7 +131,7 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent)
131 Elm_Code *code; 131 Elm_Code *code;
132 132
133 code = elm_code_create(); 133 code = elm_code_create();
134 diff = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); 134 diff = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code));
135 135
136 evas_object_size_hint_weight_set(diff, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 136 evas_object_size_hint_weight_set(diff, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
137 evas_object_size_hint_align_set(diff, EVAS_HINT_FILL, EVAS_HINT_FILL); 137 evas_object_size_hint_align_set(diff, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c
index 5f58b37..f3983f5 100644
--- a/src/bin/elementary/test_entry.c
+++ b/src/bin/elementary/test_entry.c
@@ -2991,7 +2991,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
2991 elm_win_resize_object_add(win, bx); 2991 elm_win_resize_object_add(win, bx);
2992 evas_object_show(bx); 2992 evas_object_show(bx);
2993 2993
2994 en = eo_add(EFL_UI_TEXT_CLASS, win); 2994 en = efl_add(EFL_UI_TEXT_CLASS, win);
2995 printf("Added Efl.Ui.Text object\n"); 2995 printf("Added Efl.Ui.Text object\n");
2996 efl_text_set(en, "Hello world! Goodbye world! This is a test text for the" 2996 efl_text_set(en, "Hello world! Goodbye world! This is a test text for the"
2997 " new UI Text widget.\xE2\x80\xA9This is the next paragraph.\nThis" 2997 " new UI Text widget.\xE2\x80\xA9This is the next paragraph.\nThis"
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 094ca19..3d7c9de 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -166,12 +166,12 @@ _win_del(void *data, const Eo_Event *ev EINA_UNUSED)
166 free(td); 166 free(td);
167} 167}
168 168
169EO_CALLBACKS_ARRAY_DEFINE(rect_pointer_callbacks, 169EFL_CALLBACKS_ARRAY_DEFINE(rect_pointer_callbacks,
170{ EFL_EVENT_POINTER_DOWN, _pointer_down }, 170{ EFL_EVENT_POINTER_DOWN, _pointer_down },
171{ EFL_EVENT_POINTER_MOVE, _pointer_move }, 171{ EFL_EVENT_POINTER_MOVE, _pointer_move },
172{ EFL_EVENT_POINTER_UP, _pointer_up }) 172{ EFL_EVENT_POINTER_UP, _pointer_up })
173 173
174EO_CALLBACKS_ARRAY_DEFINE(win_key_callbacks, 174EFL_CALLBACKS_ARRAY_DEFINE(win_key_callbacks,
175{ EFL_EVENT_KEY_DOWN, _key_down }, 175{ EFL_EVENT_KEY_DOWN, _key_down },
176{ EFL_EVENT_KEY_UP, _key_up }) 176{ EFL_EVENT_KEY_UP, _key_up })
177 177
@@ -186,7 +186,7 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
186 win = elm_win_util_standard_add("buttons", "Buttons"); 186 win = elm_win_util_standard_add("buttons", "Buttons");
187 elm_win_autodel_set(win, EINA_TRUE); 187 elm_win_autodel_set(win, EINA_TRUE);
188 188
189 bx = eo_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(eo_self, EFL_ORIENT_VERTICAL)); 189 bx = efl_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(efl_self, EFL_ORIENT_VERTICAL));
190 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 190 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
191 evas_object_size_hint_align_set(bx, -1, -1); 191 evas_object_size_hint_align_set(bx, -1, -1);
192 efl_pack(win, bx); 192 efl_pack(win, bx);
@@ -216,7 +216,7 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
216 efl_pack(bx, bt); 216 efl_pack(bx, bt);
217 evas_object_show(bt); 217 evas_object_show(bt);
218 218
219 o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win); 219 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
220 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 220 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
221 evas_object_size_hint_align_set(o, -1, -1); 221 evas_object_size_hint_align_set(o, -1, -1);
222 efl_pack(bx, o); 222 efl_pack(bx, o);
diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c
index 2cf4d11..12e20bf 100644
--- a/src/bin/elementary/test_glview.c
+++ b/src/bin/elementary/test_glview.c
@@ -636,10 +636,10 @@ test_glview(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
636 elm_config_accel_preference_set(accel); 636 elm_config_accel_preference_set(accel);
637 eina_stringshare_del(accel); 637 eina_stringshare_del(accel);
638#else 638#else
639 win = eo_add(EFL_UI_WIN_STANDARD_CLASS, NULL, 639 win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
640 efl_ui_win_name_set(eo_self, "glview"), 640 efl_ui_win_name_set(efl_self, "glview"),
641 efl_text_set(eo_self, "GLView"), 641 efl_text_set(efl_self, "GLView"),
642 efl_ui_win_accel_preference_set(eo_self, "gl:depth")); 642 efl_ui_win_accel_preference_set(efl_self, "gl:depth"));
643 elm_win_autodel_set(win, EINA_TRUE); 643 elm_win_autodel_set(win, EINA_TRUE);
644#endif 644#endif
645 645
diff --git a/src/bin/elementary/test_grid_static.c b/src/bin/elementary/test_grid_static.c
index 59d7062..bd620c8 100644
--- a/src/bin/elementary/test_grid_static.c
+++ b/src/bin/elementary/test_grid_static.c
@@ -104,23 +104,23 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
104 Eo *win, *gd, *bt, *rc, *en; 104 Eo *win, *gd, *bt, *rc, *en;
105 api_data *api = calloc(1, sizeof(*api)); 105 api_data *api = calloc(1, sizeof(*api));
106 106
107 win = eo_add(EFL_UI_WIN_STANDARD_CLASS, NULL, 107 win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
108 efl_ui_win_name_set(eo_self, "grid"), 108 efl_ui_win_name_set(efl_self, "grid"),
109 efl_text_set(eo_self, "Grid"), 109 efl_text_set(efl_self, "Grid"),
110 efl_ui_win_autodel_set(eo_self, EINA_TRUE), 110 efl_ui_win_autodel_set(efl_self, EINA_TRUE),
111 efl_event_callback_add(eo_self, EFL_EVENT_DEL, _win_del, api)); 111 efl_event_callback_add(efl_self, EFL_EVENT_DEL, _win_del, api));
112 112
113 static int run_count = 0; 113 static int run_count = 0;
114 if (((run_count++) % 2) == 0) 114 if (((run_count++) % 2) == 0)
115 { 115 {
116 gd = eo_add(EFL_UI_GRID_STATIC_CLASS, win, 116 gd = efl_add(EFL_UI_GRID_STATIC_CLASS, win,
117 efl_gfx_size_hint_weight_set(eo_self, 1, 1)); 117 efl_gfx_size_hint_weight_set(efl_self, 1, 1));
118 } 118 }
119 else 119 else
120 { 120 {
121 gd = eo_add(EFL_UI_GRID_CLASS, win, 121 gd = efl_add(EFL_UI_GRID_CLASS, win,
122 efl_gfx_size_hint_weight_set(eo_self, 1, 1), 122 efl_gfx_size_hint_weight_set(efl_self, 1, 1),
123 efl_pack_layout_engine_set(eo_self, EFL_UI_GRID_STATIC_CLASS, NULL)); 123 efl_pack_layout_engine_set(efl_self, EFL_UI_GRID_STATIC_CLASS, NULL));
124 } 124 }
125 efl_pack(win, gd); 125 efl_pack(win, gd);
126 api->data.grid = gd; 126 api->data.grid = gd;
@@ -176,27 +176,27 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
176 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_grid, gd); 176 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_grid, gd);
177 efl_gfx_visible_set(bt, 1); 177 efl_gfx_visible_set(bt, 1);
178 178
179 rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win); 179 rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
180 efl_gfx_color_set(rc, 128, 0, 0, 128); 180 efl_gfx_color_set(rc, 128, 0, 0, 128);
181 efl_pack_grid(gd, rc, 40, 70, 20, 10); 181 efl_pack_grid(gd, rc, 40, 70, 20, 10);
182 efl_gfx_visible_set(rc, 1); 182 efl_gfx_visible_set(rc, 1);
183 183
184 rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win); 184 rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
185 efl_gfx_color_set(rc, 0, 128, 0, 128); 185 efl_gfx_color_set(rc, 0, 128, 0, 128);
186 efl_pack_grid(gd, rc, 60, 70, 10, 10); 186 efl_pack_grid(gd, rc, 60, 70, 10, 10);
187 efl_gfx_visible_set(rc, 1); 187 efl_gfx_visible_set(rc, 1);
188 188
189 rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win); 189 rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
190 efl_gfx_color_set(rc, 0, 0, 128, 128); 190 efl_gfx_color_set(rc, 0, 0, 128, 128);
191 efl_pack_grid(gd, rc, 40, 80, 10, 10); 191 efl_pack_grid(gd, rc, 40, 80, 10, 10);
192 efl_gfx_visible_set(rc, 1); 192 efl_gfx_visible_set(rc, 1);
193 193
194 rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win); 194 rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
195 efl_gfx_color_set(rc, 128, 0, 128, 128); 195 efl_gfx_color_set(rc, 128, 0, 128, 128);
196 efl_pack_grid(gd, rc, 50, 80, 10, 10); 196 efl_pack_grid(gd, rc, 50, 80, 10, 10);
197 efl_gfx_visible_set(rc, 1); 197 efl_gfx_visible_set(rc, 1);
198 198
199 rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win); 199 rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
200 efl_gfx_color_set(rc, 128, 64, 0, 128); 200 efl_gfx_color_set(rc, 128, 64, 0, 128);
201 efl_pack_grid(gd, rc, 60, 80, 10, 10); 201 efl_pack_grid(gd, rc, 60, 80, 10, 10);
202 efl_gfx_visible_set(rc, 1); 202 efl_gfx_visible_set(rc, 1);
diff --git a/src/bin/elementary/test_nstate.c b/src/bin/elementary/test_nstate.c
index 9444fb1..cac6a69 100644
--- a/src/bin/elementary/test_nstate.c
+++ b/src/bin/elementary/test_nstate.c
@@ -29,7 +29,7 @@ test_nstate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
29 elm_win_resize_object_add(win, bx); 29 elm_win_resize_object_add(win, bx);
30 evas_object_show(bx); 30 evas_object_show(bx);
31 31
32 nstate = eo_add(EFL_UI_NSTATE_CLASS, win); 32 nstate = efl_add(EFL_UI_NSTATE_CLASS, win);
33 efl_ui_nstate_count_set(nstate, 5); 33 efl_ui_nstate_count_set(nstate, 5);
34 elm_object_text_set(nstate, "nstate = 0"); 34 elm_object_text_set(nstate, "nstate = 0");
35 elm_box_pack_end(bx, nstate); 35 elm_box_pack_end(bx, nstate);
diff --git a/src/bin/elementary/test_systray.c b/src/bin/elementary/test_systray.c
index 1271242..a1ddeb3 100644
--- a/src/bin/elementary/test_systray.c
+++ b/src/bin/elementary/test_systray.c
@@ -82,7 +82,7 @@ test_systray(void *data EINA_UNUSED,
82 elm_menu_item_add(it, it2, NULL, "item 2", _menu_clicked, "item 2"); 82 elm_menu_item_add(it, it2, NULL, "item 2", _menu_clicked, "item 2");
83 83
84 // Status Notifier Item Handler 84 // Status Notifier Item Handler
85 item = eo_add(ELM_SYSTRAY_CLASS, win); 85 item = efl_add(ELM_SYSTRAY_CLASS, win);
86 elm_obj_systray_icon_name_set(item, "elementary"); 86 elm_obj_systray_icon_name_set(item, "elementary");
87 elm_obj_systray_att_icon_name_set(item, "elementary"); 87 elm_obj_systray_att_icon_name_set(item, "elementary");
88 elm_obj_systray_menu_set(item, it); 88 elm_obj_systray_menu_set(item, it);
diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c
index df0ab2d..8e57a58 100644
--- a/src/bin/elementary/test_task_switcher.c
+++ b/src/bin/elementary/test_task_switcher.c
@@ -300,7 +300,7 @@ _app_open(const char *package)
300 return; 300 return;
301 } 301 }
302 302
303 app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(eo_self, package)); 303 app = efl_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(efl_self, package));
304 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table); 304 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table);
305 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table); 305 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table);
306 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table); 306 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table);
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index bf14767f..4ce6950 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -177,14 +177,14 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
177static void 177static void
178custom_check_cb(void *data, const Eo_Event *event) 178custom_check_cb(void *data, const Eo_Event *event)
179{ 179{
180 EO_OVERRIDE_OPS_DEFINE(custom_layout_ops, 180 EFL_OBJECT_OVERRIDE_OPS_DEFINE(custom_layout_ops,
181 EO_OP_FUNC_OVERRIDE(efl_pack_layout_update, _custom_layout_update)); 181 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_pack_layout_update, _custom_layout_update));
182 182
183 Eina_Bool chk = elm_check_selected_get(event->object); 183 Eina_Bool chk = elm_check_selected_get(event->object);
184 Eo *obj = data; 184 Eo *obj = data;
185 185
186 // Overriding just the one function we need 186 // Overriding just the one function we need
187 eo_override(obj, chk ? &custom_layout_ops : NULL); 187 efl_object_override(obj, chk ? &custom_layout_ops : NULL);
188 188
189 // Layout request is required as the pack object doesn't know the layout 189 // Layout request is required as the pack object doesn't know the layout
190 // function was just overridden. 190 // function was just overridden.
@@ -204,7 +204,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
204 elm_win_autodel_set(win, EINA_TRUE); 204 elm_win_autodel_set(win, EINA_TRUE);
205 efl_gfx_size_set(win, 600, 400); 205 efl_gfx_size_set(win, 600, 400);
206 206
207 vbox = eo_add(EFL_UI_BOX_CLASS, win); 207 vbox = efl_add(EFL_UI_BOX_CLASS, win);
208 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); 208 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
209 efl_orientation_set(vbox, EFL_ORIENT_DOWN); 209 efl_orientation_set(vbox, EFL_ORIENT_DOWN);
210 efl_gfx_size_hint_weight_set(vbox, 1, 1); 210 efl_gfx_size_hint_weight_set(vbox, 1, 1);
@@ -214,7 +214,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
214 214
215 215
216 // create here to pass in cb 216 // create here to pass in cb
217 bottombox = eo_add(EFL_UI_BOX_CLASS, win); 217 bottombox = efl_add(EFL_UI_BOX_CLASS, win);
218 218
219 219
220 /* controls */ 220 /* controls */
@@ -225,15 +225,15 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
225 efl_pack(vbox, f); 225 efl_pack(vbox, f);
226 efl_gfx_visible_set(f, 1); 226 efl_gfx_visible_set(f, 1);
227 227
228 hbox = eo_add(EFL_UI_BOX_CLASS, win); 228 hbox = efl_add(EFL_UI_BOX_CLASS, win);
229 elm_object_content_set(f, hbox); 229 elm_object_content_set(f, hbox);
230 efl_pack_padding_set(hbox, 10, 0, EINA_TRUE); 230 efl_pack_padding_set(hbox, 10, 0, EINA_TRUE);
231 efl_gfx_visible_set(hbox, 1); 231 efl_gfx_visible_set(hbox, 1);
232 232
233 233
234 /* weights radio group */ 234 /* weights radio group */
235 bx = eo_add(EFL_UI_BOX_CLASS, win, 235 bx = efl_add(EFL_UI_BOX_CLASS, win,
236 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 236 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
237 efl_gfx_size_hint_align_set(bx, 0, -1); 237 efl_gfx_size_hint_align_set(bx, 0, -1);
238 efl_pack(hbox, bx); 238 efl_pack(hbox, bx);
239 efl_gfx_visible_set(bx, 1); 239 efl_gfx_visible_set(bx, 1);
@@ -286,8 +286,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
286 286
287 287
288 /* misc */ 288 /* misc */
289 bx = eo_add(EFL_UI_BOX_CLASS, win, 289 bx = efl_add(EFL_UI_BOX_CLASS, win,
290 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 290 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
291 efl_gfx_size_hint_align_set(bx, 0, -1); 291 efl_gfx_size_hint_align_set(bx, 0, -1);
292 efl_gfx_size_hint_weight_set(bx, 0, 1); 292 efl_gfx_size_hint_weight_set(bx, 0, 1);
293 efl_pack(hbox, bx); 293 efl_pack(hbox, bx);
@@ -349,8 +349,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
349 349
350 350
351 /* user min size setter */ 351 /* user min size setter */
352 bx = eo_add(EFL_UI_BOX_CLASS, win, 352 bx = efl_add(EFL_UI_BOX_CLASS, win,
353 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 353 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
354 efl_gfx_size_hint_align_set(bx, 0, -1); 354 efl_gfx_size_hint_align_set(bx, 0, -1);
355 efl_gfx_size_hint_weight_set(bx, 0, 1); 355 efl_gfx_size_hint_weight_set(bx, 0, 1);
356 efl_pack(hbox, bx); 356 efl_pack(hbox, bx);
@@ -376,8 +376,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
376 376
377 377
378 /* inner box padding */ 378 /* inner box padding */
379 bx = eo_add(EFL_UI_BOX_CLASS, win, 379 bx = efl_add(EFL_UI_BOX_CLASS, win,
380 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 380 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
381 efl_gfx_size_hint_align_set(bx, 0, -1); 381 efl_gfx_size_hint_align_set(bx, 0, -1);
382 efl_gfx_size_hint_weight_set(bx, 0, 1); 382 efl_gfx_size_hint_weight_set(bx, 0, 1);
383 efl_pack(hbox, bx); 383 efl_pack(hbox, bx);
@@ -403,8 +403,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
403 403
404 404
405 /* outer margin */ 405 /* outer margin */
406 bx = eo_add(EFL_UI_BOX_CLASS, win, 406 bx = efl_add(EFL_UI_BOX_CLASS, win,
407 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 407 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
408 efl_gfx_size_hint_align_set(bx, 0, -1); 408 efl_gfx_size_hint_align_set(bx, 0, -1);
409 efl_gfx_size_hint_weight_set(bx, 0, 1); 409 efl_gfx_size_hint_weight_set(bx, 0, 1);
410 efl_pack(hbox, bx); 410 efl_pack(hbox, bx);
@@ -430,8 +430,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
430 430
431 431
432 /* Box align */ 432 /* Box align */
433 bx = eo_add(EFL_UI_BOX_CLASS, win, 433 bx = efl_add(EFL_UI_BOX_CLASS, win,
434 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 434 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
435 efl_gfx_size_hint_align_set(bx, 0, -1); 435 efl_gfx_size_hint_align_set(bx, 0, -1);
436 efl_gfx_size_hint_weight_set(bx, 1, 1); 436 efl_gfx_size_hint_weight_set(bx, 1, 1);
437 efl_pack(hbox, bx); 437 efl_pack(hbox, bx);
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 0617bd9..bc5fb95 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -20,15 +20,15 @@ static void _custom_engine_layout_do(Eo *obj, void *pd, Efl_Pack *pack, const vo
20 20
21/* Common Efl Class boilerplate. */ 21/* Common Efl Class boilerplate. */
22static const Efl_Op_Description custom_engine_op_desc[] = { 22static const Efl_Op_Description custom_engine_op_desc[] = {
23 EO_OP_CLASS_FUNC_OVERRIDE(efl_pack_layout_do, _custom_engine_layout_do), 23 EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(efl_pack_layout_do, _custom_engine_layout_do),
24}; 24};
25 25
26static const Efl_Class_Description custom_engine_class_desc = { 26static const Efl_Class_Description custom_engine_class_desc = {
27 EO_VERSION, "Custom Layout Engine", EO_CLASS_TYPE_INTERFACE, 27 EO_VERSION, "Custom Layout Engine", EFL_CLASS_TYPE_INTERFACE,
28 EO_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), NULL, 0, NULL, NULL 28 EFL_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), NULL, 0, NULL, NULL
29}; 29};
30 30
31EO_DEFINE_CLASS(_test_ui_grid_custom_engine_class_get, &custom_engine_class_desc, EFL_PACK_LAYOUT_INTERFACE, NULL) 31EFL_DEFINE_CLASS(_test_ui_grid_custom_engine_class_get, &custom_engine_class_desc, EFL_PACK_LAYOUT_INTERFACE, NULL)
32 32
33#define CUSTOM_ENGINE_CLASS _test_ui_grid_custom_engine_class_get() 33#define CUSTOM_ENGINE_CLASS _test_ui_grid_custom_engine_class_get()
34 34
@@ -73,7 +73,7 @@ weights_cb(void *data, const Eo_Event *event)
73 break; 73 break;
74 case CUSTOM: 74 case CUSTOM:
75 // See also test_ui_box.c for another solution for custom layouts 75 // See also test_ui_box.c for another solution for custom layouts
76 // using eo_override. 76 // using efl_object_override.
77 efl_pack_layout_engine_set(grid, CUSTOM_ENGINE_CLASS, NULL); 77 efl_pack_layout_engine_set(grid, CUSTOM_ENGINE_CLASS, NULL);
78 break; 78 break;
79 } 79 }
@@ -191,7 +191,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
191 elm_win_autodel_set(win, EINA_TRUE); 191 elm_win_autodel_set(win, EINA_TRUE);
192 efl_gfx_size_set(win, 600, 400); 192 efl_gfx_size_set(win, 600, 400);
193 193
194 vbox = eo_add(EFL_UI_BOX_CLASS, win); 194 vbox = efl_add(EFL_UI_BOX_CLASS, win);
195 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); 195 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
196 efl_orientation_set(vbox, EFL_ORIENT_DOWN); 196 efl_orientation_set(vbox, EFL_ORIENT_DOWN);
197 efl_gfx_size_hint_weight_set(vbox, 1, 1); 197 efl_gfx_size_hint_weight_set(vbox, 1, 1);
@@ -201,7 +201,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
201 201
202 202
203 // create here to pass in cb 203 // create here to pass in cb
204 grid = eo_add(EFL_UI_GRID_CLASS, win); 204 grid = efl_add(EFL_UI_GRID_CLASS, win);
205 205
206 206
207 /* controls */ 207 /* controls */
@@ -212,15 +212,15 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
212 efl_pack(vbox, f); 212 efl_pack(vbox, f);
213 efl_gfx_visible_set(f, 1); 213 efl_gfx_visible_set(f, 1);
214 214
215 hbox = eo_add(EFL_UI_BOX_CLASS, win); 215 hbox = efl_add(EFL_UI_BOX_CLASS, win);
216 elm_object_content_set(f, hbox); 216 elm_object_content_set(f, hbox);
217 efl_pack_padding_set(hbox, 10, 0, EINA_TRUE); 217 efl_pack_padding_set(hbox, 10, 0, EINA_TRUE);
218 efl_gfx_visible_set(hbox, 1); 218 efl_gfx_visible_set(hbox, 1);
219 219
220 220
221 /* weights radio group */ 221 /* weights radio group */
222 bx = eo_add(EFL_UI_BOX_CLASS, win, 222 bx = efl_add(EFL_UI_BOX_CLASS, win,
223 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 223 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
224 efl_gfx_size_hint_align_set(bx, 0, -1); 224 efl_gfx_size_hint_align_set(bx, 0, -1);
225 efl_pack(hbox, bx); 225 efl_pack(hbox, bx);
226 efl_gfx_visible_set(bx, 1); 226 efl_gfx_visible_set(bx, 1);
@@ -282,8 +282,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
282 282
283 283
284 /* min size setter */ 284 /* min size setter */
285 bx = eo_add(EFL_UI_BOX_CLASS, win, 285 bx = efl_add(EFL_UI_BOX_CLASS, win,
286 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 286 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
287 efl_gfx_size_hint_align_set(bx, 0.5, -1); 287 efl_gfx_size_hint_align_set(bx, 0.5, -1);
288 efl_gfx_size_hint_weight_set(bx, 0, 1); 288 efl_gfx_size_hint_weight_set(bx, 0, 1);
289 efl_pack(hbox, bx); 289 efl_pack(hbox, bx);
@@ -309,8 +309,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
309 309
310 310
311 /* inner box padding */ 311 /* inner box padding */
312 bx = eo_add(EFL_UI_BOX_CLASS, win, 312 bx = efl_add(EFL_UI_BOX_CLASS, win,
313 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 313 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
314 efl_gfx_size_hint_align_set(bx, 0, -1); 314 efl_gfx_size_hint_align_set(bx, 0, -1);
315 efl_gfx_size_hint_weight_set(bx, 0, 1); 315 efl_gfx_size_hint_weight_set(bx, 0, 1);
316 efl_pack(hbox, bx); 316 efl_pack(hbox, bx);
@@ -336,8 +336,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
336 336
337 337
338 /* outer margin */ 338 /* outer margin */
339 bx = eo_add(EFL_UI_BOX_CLASS, win, 339 bx = efl_add(EFL_UI_BOX_CLASS, win,
340 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 340 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
341 efl_gfx_size_hint_align_set(bx, 0, -1); 341 efl_gfx_size_hint_align_set(bx, 0, -1);
342 efl_gfx_size_hint_weight_set(bx, 0, 1); 342 efl_gfx_size_hint_weight_set(bx, 0, 1);
343 efl_pack(hbox, bx); 343 efl_pack(hbox, bx);
@@ -363,8 +363,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
363 363
364 364
365 /* button margins */ 365 /* button margins */
366 bx = eo_add(EFL_UI_BOX_CLASS, win, 366 bx = efl_add(EFL_UI_BOX_CLASS, win,
367 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 367 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
368 efl_gfx_size_hint_align_set(bx, 0, -1); 368 efl_gfx_size_hint_align_set(bx, 0, -1);
369 efl_gfx_size_hint_weight_set(bx, 1, 1); 369 efl_gfx_size_hint_weight_set(bx, 1, 1);
370 efl_pack(hbox, bx); 370 efl_pack(hbox, bx);
@@ -390,8 +390,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
390 390
391 391
392 /* ro info */ 392 /* ro info */
393 bx = eo_add(EFL_UI_BOX_CLASS, win, 393 bx = efl_add(EFL_UI_BOX_CLASS, win,
394 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 394 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
395 efl_gfx_size_hint_align_set(bx, 0, -1); 395 efl_gfx_size_hint_align_set(bx, 0, -1);
396 efl_gfx_size_hint_weight_set(bx, 1, 1); 396 efl_gfx_size_hint_weight_set(bx, 1, 1);
397 efl_pack(hbox, bx); 397 efl_pack(hbox, bx);
@@ -428,7 +428,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
428 elm_object_content_set(f, grid); 428 elm_object_content_set(f, grid);
429 efl_gfx_visible_set(grid, 1); 429 efl_gfx_visible_set(grid, 1);
430 430
431 objects[i++] = o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win); 431 objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
432 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 432 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
433 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 433 efl_gfx_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
434 efl_gfx_size_hint_min_set(o, 10, 10); 434 efl_gfx_size_hint_min_set(o, 10, 10);
@@ -525,7 +525,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
525 elm_win_autodel_set(win, EINA_TRUE); 525 elm_win_autodel_set(win, EINA_TRUE);
526 efl_gfx_size_set(win, 600, 400); 526 efl_gfx_size_set(win, 600, 400);
527 527
528 vbox = eo_add(EFL_UI_BOX_CLASS, win); 528 vbox = efl_add(EFL_UI_BOX_CLASS, win);
529 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); 529 efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
530 efl_orientation_set(vbox, EFL_ORIENT_DOWN); 530 efl_orientation_set(vbox, EFL_ORIENT_DOWN);
531 efl_gfx_size_hint_weight_set(vbox, 1, 1); 531 efl_gfx_size_hint_weight_set(vbox, 1, 1);
@@ -535,7 +535,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
535 535
536 536
537 // create here to pass in cb 537 // create here to pass in cb
538 grid = eo_add(EFL_UI_GRID_CLASS, win); 538 grid = efl_add(EFL_UI_GRID_CLASS, win);
539 539
540 540
541 /* controls */ 541 /* controls */
@@ -546,7 +546,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
546 efl_pack(vbox, f); 546 efl_pack(vbox, f);
547 efl_gfx_visible_set(f, 1); 547 efl_gfx_visible_set(f, 1);
548 548
549 hbox = eo_add(EFL_UI_BOX_CLASS, win); 549 hbox = efl_add(EFL_UI_BOX_CLASS, win);
550 elm_object_content_set(f, hbox); 550 elm_object_content_set(f, hbox);
551 efl_pack_padding_set(hbox, 5, 0, EINA_TRUE); 551 efl_pack_padding_set(hbox, 5, 0, EINA_TRUE);
552 efl_gfx_visible_set(hbox, 1); 552 efl_gfx_visible_set(hbox, 1);
@@ -571,8 +571,8 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
571 571
572 572
573 /* ro info */ 573 /* ro info */
574 bx = eo_add(EFL_UI_BOX_CLASS, win, 574 bx = efl_add(EFL_UI_BOX_CLASS, win,
575 efl_orientation_set(eo_self, EFL_ORIENT_DOWN)); 575 efl_orientation_set(efl_self, EFL_ORIENT_DOWN));
576 efl_gfx_size_hint_align_set(bx, 0, -1); 576 efl_gfx_size_hint_align_set(bx, 0, -1);
577 efl_gfx_size_hint_weight_set(bx, 1, 1); 577 efl_gfx_size_hint_weight_set(bx, 1, 1);
578 efl_pack(hbox, bx); 578 efl_pack(hbox, bx);
diff --git a/src/bin/elementary/test_video.c b/src/bin/elementary/test_video.c
index 0dfca3e..60718ed 100644
--- a/src/bin/elementary/test_video.c
+++ b/src/bin/elementary/test_video.c
@@ -30,7 +30,7 @@ test_video(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
30 elm_win_resize_object_add(win, bg); 30 elm_win_resize_object_add(win, bg);
31 evas_object_show(bg); 31 evas_object_show(bg);
32 32
33 video = elm_video_add(win); 33 video = elm_videfl_add(win);
34 evas_object_size_hint_weight_set(video, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 34 evas_object_size_hint_weight_set(video, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
35 evas_object_show(video); 35 evas_object_show(video);
36 36
diff --git a/src/bin/elementary/test_win_inline.c b/src/bin/elementary/test_win_inline.c
index 1c22214..b9b8d84 100644
--- a/src/bin/elementary/test_win_inline.c
+++ b/src/bin/elementary/test_win_inline.c
@@ -225,7 +225,7 @@ test_win_inline(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
225 elm_win_resize_object_add(win, bg); 225 elm_win_resize_object_add(win, bg);
226 evas_object_show(bg); 226 evas_object_show(bg);
227 227
228 box = eo_add(EFL_UI_BOX_CLASS, win); 228 box = efl_add(EFL_UI_BOX_CLASS, win);
229 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 229 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
230 efl_pack(win, box); 230 efl_pack(win, box);
231 evas_object_show(box); 231 evas_object_show(box);
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 5c2259d..96e2618 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -46,7 +46,7 @@ static const Efl_Class_Description _@#class_class_desc = {\n\
46 @#dtor_name\n\ 46 @#dtor_name\n\
47};\n\ 47};\n\
48\n\ 48\n\
49EO_DEFINE_CLASS(@#klasstype_get, &_@#class_class_desc, @#list_inheritNULL);\ 49EFL_DEFINE_CLASS(@#klasstype_get, &_@#class_class_desc, @#list_inheritNULL);\
50"; 50";
51 51
52static const char 52static const char
@@ -526,7 +526,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
526 Eina_Bool ret_is_void = (!rettype || !strcmp(rettype, "void")); 526 Eina_Bool ret_is_void = (!rettype || !strcmp(rettype, "void"));
527 _class_func_env_create(class, eolian_function_name_get(funcid), ftype, &func_env); 527 _class_func_env_create(class, eolian_function_name_get(funcid), ftype, &func_env);
528 eina_strbuf_append_printf(eo_func_decl, 528 eina_strbuf_append_printf(eo_func_decl,
529 "EOAPI EO_%sFUNC_BODY%s%s(%s", 529 "EOAPI EFL_%sFUNC_BODY%s%s(%s",
530 ret_is_void?"VOID_":"", has_params?"V":"", 530 ret_is_void?"VOID_":"", has_params?"V":"",
531 (ftype == EOLIAN_PROP_GET || 531 (ftype == EOLIAN_PROP_GET ||
532 eolian_function_object_is_const(funcid) || 532 eolian_function_object_is_const(funcid) ||
@@ -553,7 +553,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
553 if (has_params) 553 if (has_params)
554 { 554 {
555 eina_strbuf_replace_all(full_params, " EINA_UNUSED", ""); 555 eina_strbuf_replace_all(full_params, " EINA_UNUSED", "");
556 eina_strbuf_append_printf(eo_func_decl, ", EO_FUNC_CALL(%s)%s", 556 eina_strbuf_append_printf(eo_func_decl, ", EFL_FUNC_CALL(%s)%s",
557 eina_strbuf_string_get(params), 557 eina_strbuf_string_get(params),
558 eina_strbuf_string_get(full_params)); 558 eina_strbuf_string_get(full_params));
559 } 559 }
@@ -562,10 +562,10 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
562 if(has_promise) 562 if(has_promise)
563 { 563 {
564 eina_strbuf_append_printf(fbody, 564 eina_strbuf_append_printf(fbody,
565 "#undef _EO_API_BEFORE_HOOK\n#undef _EO_API_AFTER_HOOK\n#undef _EO_API_CALL_HOOK\n" 565 "#undef _EFL_OBJECT_API_BEFORE_HOOK\n#undef _EFL_OBJECT_API_AFTER_HOOK\n#undef _EFL_OBJECT_API_CALL_HOOK\n"
566 "#define _EO_API_BEFORE_HOOK _EINA_PROMISE_BEFORE_HOOK(%s, %s%s)\n" 566 "#define _EFL_OBJECT_API_BEFORE_HOOK _EINA_PROMISE_BEFORE_HOOK(%s, %s%s)\n"
567 "#define _EO_API_AFTER_HOOK _EINA_PROMISE_AFTER_HOOK(%s)\n" 567 "#define _EFL_OBJECT_API_AFTER_HOOK _EINA_PROMISE_AFTER_HOOK(%s)\n"
568 "#define _EO_API_CALL_HOOK(x) _EINA_PROMISE_CALL_HOOK(EO_FUNC_CALL(%s))\n\n", 568 "#define _EFL_OBJECT_API_CALL_HOOK(x) _EINA_PROMISE_CALL_HOOK(EFL_FUNC_CALL(%s))\n\n",
569 promise_value_type, !rettype ? "void" : rettype, 569 promise_value_type, !rettype ? "void" : rettype,
570 eina_strbuf_string_get(impl_full_params), 570 eina_strbuf_string_get(impl_full_params),
571 promise_param_name, 571 promise_param_name,
@@ -576,9 +576,9 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
576 576
577 if(has_promise) 577 if(has_promise)
578 { 578 {
579 eina_strbuf_append_printf(fbody, "\n#undef _EO_API_BEFORE_HOOK\n#undef _EO_API_AFTER_HOOK\n#undef _EO_API_CALL_HOOK\n" 579 eina_strbuf_append_printf(fbody, "\n#undef _EFL_OBJECT_API_BEFORE_HOOK\n#undef _EFL_OBJECT_API_AFTER_HOOK\n#undef _EFL_OBJECT_API_CALL_HOOK\n"
580 "#define _EO_API_BEFORE_HOOK\n#define _EO_API_AFTER_HOOK\n" 580 "#define _EFL_OBJECT_API_BEFORE_HOOK\n#define _EFL_OBJECT_API_AFTER_HOOK\n"
581 "#define _EO_API_CALL_HOOK(x) x\n"); 581 "#define _EFL_OBJECT_API_CALL_HOOK(x) x\n");
582 } 582 }
583 583
584 eina_strbuf_free(eo_func_decl); 584 eina_strbuf_free(eo_func_decl);
@@ -629,7 +629,7 @@ eo_op_desc_generate(const Eolian_Class *class, const Eolian_Function *fid, Eolia
629 Eina_Bool is_virtual_pure = eolian_function_is_virtual_pure(fid, ftype); 629 Eina_Bool is_virtual_pure = eolian_function_is_virtual_pure(fid, ftype);
630 const char *class_str = ""; 630 const char *class_str = "";
631 if (eolian_function_is_class(fid)) class_str = "CLASS_"; 631 if (eolian_function_is_class(fid)) class_str = "CLASS_";
632 eina_strbuf_append_printf(buf, "\n EO_OP_%sFUNC(%s, ", class_str, func_env.lower_eo_func); 632 eina_strbuf_append_printf(buf, "\n EFL_OBJECT_OP_%sFUNC(%s, ", class_str, func_env.lower_eo_func);
633 if (!is_virtual_pure) 633 if (!is_virtual_pure)
634 { 634 {
635 Eolian_Function_Type ftype2 = (Eolian_Function_Type) eina_hash_find(_funcs_params_init, funcname); 635 Eolian_Function_Type ftype2 = (Eolian_Function_Type) eina_hash_find(_funcs_params_init, funcname);
@@ -697,16 +697,16 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
697 switch(eolian_class_type_get(class)) 697 switch(eolian_class_type_get(class))
698 { 698 {
699 case EOLIAN_CLASS_REGULAR: 699 case EOLIAN_CLASS_REGULAR:
700 str_classtype = "EO_CLASS_TYPE_REGULAR"; 700 str_classtype = "EFL_CLASS_TYPE_REGULAR";
701 break; 701 break;
702 case EOLIAN_CLASS_ABSTRACT: 702 case EOLIAN_CLASS_ABSTRACT:
703 str_classtype = "EO_CLASS_TYPE_REGULAR_NO_INSTANT"; 703 str_classtype = "EFL_CLASS_TYPE_REGULAR_NO_INSTANT";
704 break; 704 break;
705 case EOLIAN_CLASS_MIXIN: 705 case EOLIAN_CLASS_MIXIN:
706 str_classtype = "EO_CLASS_TYPE_MIXIN"; 706 str_classtype = "EFL_CLASS_TYPE_MIXIN";
707 break; 707 break;
708 case EOLIAN_CLASS_INTERFACE: 708 case EOLIAN_CLASS_INTERFACE:
709 str_classtype = "EO_CLASS_TYPE_INTERFACE"; 709 str_classtype = "EFL_CLASS_TYPE_INTERFACE";
710 break; 710 break;
711 default: 711 default:
712 break; 712 break;
@@ -831,7 +831,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
831 if (ftype != EOLIAN_PROP_GET) 831 if (ftype != EOLIAN_PROP_GET)
832 { 832 {
833 Eina_Stringshare *rets = eolian_function_full_c_name_get(fnid, EOLIAN_PROP_SET, EINA_FALSE); 833 Eina_Stringshare *rets = eolian_function_full_c_name_get(fnid, EOLIAN_PROP_SET, EINA_FALSE);
834 eina_strbuf_append_printf(str_op, "\n EO_OP_%sFUNC_OVERRIDE(%s, %s_%s_set),", 834 eina_strbuf_append_printf(str_op, "\n EFL_OBJECT_OP_%sFUNC_OVERRIDE(%s, %s_%s_set),",
835 class_str, rets, implname, funcname); 835 class_str, rets, implname, funcname);
836 eo_bind_func_generate(class, fnid, EOLIAN_PROP_SET, str_bodyf, impl_desc, &impl_env); 836 eo_bind_func_generate(class, fnid, EOLIAN_PROP_SET, str_bodyf, impl_desc, &impl_env);
837 eina_stringshare_del(rets); 837 eina_stringshare_del(rets);
@@ -840,7 +840,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
840 if (ftype != EOLIAN_PROP_SET) 840 if (ftype != EOLIAN_PROP_SET)
841 { 841 {
842 Eina_Stringshare *rets = eolian_function_full_c_name_get(fnid, EOLIAN_PROP_GET, EINA_FALSE); 842 Eina_Stringshare *rets = eolian_function_full_c_name_get(fnid, EOLIAN_PROP_GET, EINA_FALSE);
843 eina_strbuf_append_printf(str_op, "\n EO_OP_%sFUNC_OVERRIDE(%s, %s_%s_get),", 843 eina_strbuf_append_printf(str_op, "\n EFL_OBJECT_OP_%sFUNC_OVERRIDE(%s, %s_%s_get),",
844 class_str, rets, implname, funcname); 844 class_str, rets, implname, funcname);
845 eo_bind_func_generate(class, fnid, EOLIAN_PROP_GET, str_bodyf, impl_desc, &impl_env); 845 eo_bind_func_generate(class, fnid, EOLIAN_PROP_GET, str_bodyf, impl_desc, &impl_env);
846 eina_stringshare_del(rets); 846 eina_stringshare_del(rets);
@@ -849,7 +849,7 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
849 default: 849 default:
850 { 850 {
851 Eina_Stringshare *rets = eolian_function_full_c_name_get(fnid, ftype, EINA_FALSE); 851 Eina_Stringshare *rets = eolian_function_full_c_name_get(fnid, ftype, EINA_FALSE);
852 eina_strbuf_append_printf(str_op, "\n EO_OP_%sFUNC_OVERRIDE(%s, %s_%s),", 852 eina_strbuf_append_printf(str_op, "\n EFL_OBJECT_OP_%sFUNC_OVERRIDE(%s, %s_%s),",
853 class_str, rets, implname, funcname); 853 class_str, rets, implname, funcname);
854 eo_bind_func_generate(class, fnid, ftype, str_bodyf, impl_desc, &impl_env); 854 eo_bind_func_generate(class, fnid, ftype, str_bodyf, impl_desc, &impl_env);
855 eina_stringshare_del(rets); 855 eina_stringshare_del(rets);
@@ -933,13 +933,13 @@ eo_source_end_generate(const Eolian_Class *class, Eina_Strbuf *buf)
933 eina_strbuf_replace_all(str_end, "@#ops_desc", eina_strbuf_string_get(ops_desc)); 933 eina_strbuf_replace_all(str_end, "@#ops_desc", eina_strbuf_string_get(ops_desc));
934 eina_strbuf_free(ops_desc); 934 eina_strbuf_free(ops_desc);
935 _template_fill(tmpbuf, 935 _template_fill(tmpbuf,
936 "EO_CLASS_DESCRIPTION_OPS(_@#class_op_desc)", 936 "EFL_CLASS_DESCRIPTION_OPS(_@#class_op_desc)",
937 class, NULL, NULL, EINA_TRUE); 937 class, NULL, NULL, EINA_TRUE);
938 } 938 }
939 else 939 else
940 { 940 {
941 eina_strbuf_replace_all(str_end, "@#ops_desc", ""); 941 eina_strbuf_replace_all(str_end, "@#ops_desc", "");
942 eina_strbuf_append_printf(tmpbuf, "EO_CLASS_DESCRIPTION_NOOPS()"); 942 eina_strbuf_append_printf(tmpbuf, "EFL_CLASS_DESCRIPTION_NOOPS()");
943 } 943 }
944 944
945 eina_strbuf_replace_all(str_end, "@#functions_body", eina_strbuf_string_get(str_bodyf)); 945 eina_strbuf_replace_all(str_end, "@#functions_body", eina_strbuf_string_get(str_bodyf));
diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 3aacf47..cd16185 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -173,7 +173,7 @@ _prototype_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina
173 { 173 {
174 eina_strbuf_append_printf 174 eina_strbuf_append_printf
175 (super_invok, 175 (super_invok,
176 " %s_%s(eo_super(obj, %s_%s)%s);\n", 176 " %s_%s(efl_super(obj, %s_%s)%s);\n",
177 impl_env.lower_eo_prefix, eolian_function_name_get(foo), 177 impl_env.lower_eo_prefix, eolian_function_name_get(foo),
178 class_env.upper_eo_prefix, class_env.upper_classtype, 178 class_env.upper_eo_prefix, class_env.upper_classtype,
179 eina_strbuf_string_get(short_params)); 179 eina_strbuf_string_get(short_params));
diff --git a/src/examples/ecore/ecore_audio_custom.c b/src/examples/ecore/ecore_audio_custom.c
index 2570a9e..9d88c75 100644
--- a/src/examples/ecore/ecore_audio_custom.c
+++ b/src/examples/ecore/ecore_audio_custom.c
@@ -56,9 +56,9 @@ main(int argc, const char *argv[])
56 56
57 ecore_app_args_set(argc, argv); 57 ecore_app_args_set(argc, argv);
58 58
59 out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL); 59 out = efl_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
60 60
61 in = eo_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL); 61 in = efl_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL);
62 if (!in) 62 if (!in)
63 { 63 {
64 printf("error when creating ecore audio source.\n"); 64 printf("error when creating ecore audio source.\n");
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index e4ab597..2bb8a21 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -252,7 +252,7 @@ main(int argc, const char *argv[])
252 { 252 {
253 if (!strncmp(argv[i], "tone:", 5)) 253 if (!strncmp(argv[i], "tone:", 5))
254 { 254 {
255 in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL); 255 in = efl_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
256 if (!in) 256 if (!in)
257 { 257 {
258 printf("error when creating ecore audio source.\n"); 258 printf("error when creating ecore audio source.\n");
@@ -276,7 +276,7 @@ main(int argc, const char *argv[])
276 } 276 }
277 else 277 else
278 { 278 {
279 in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL); 279 in = efl_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
280 if (!in) 280 if (!in)
281 { 281 {
282 printf("error when creating ecore audio source.\n"); 282 printf("error when creating ecore audio source.\n");
@@ -307,7 +307,7 @@ main(int argc, const char *argv[])
307 307
308 printf("Start: %s (%0.2fs)\n", name, length); 308 printf("Start: %s (%0.2fs)\n", name, length);
309 309
310 out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL); 310 out = efl_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
311 ret = ecore_audio_obj_out_input_attach(out, in); 311 ret = ecore_audio_obj_out_input_attach(out, in);
312 if (!ret) 312 if (!ret)
313 printf("Could not attach input %s\n", name); 313 printf("Could not attach input %s\n", name);
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 13abdb1..932a257 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -49,7 +49,7 @@ main(int argc, char *argv[])
49 ecore_audio_init(); 49 ecore_audio_init();
50 50
51 51
52 in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL); 52 in = efl_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
53 ecore_audio_obj_name_set(in, basename(argv[1])); 53 ecore_audio_obj_name_set(in, basename(argv[1]));
54 ret = ecore_audio_obj_source_set(in, argv[1]); 54 ret = ecore_audio_obj_source_set(in, argv[1]);
55 if (!ret) { 55 if (!ret) {
@@ -60,7 +60,7 @@ main(int argc, char *argv[])
60 60
61 efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL); 61 efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
62 62
63 out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL); 63 out = efl_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
64 ret = ecore_audio_obj_source_set(out, argv[2]); 64 ret = ecore_audio_obj_source_set(out, argv[2]);
65 if (!ret) { 65 if (!ret) {
66 printf("Could not set %s as output\n", argv[2]); 66 printf("Could not set %s as output\n", argv[2]);
diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c
index 8831a4d..5e6ba84 100644
--- a/src/examples/ecore/ecore_idler_example.c
+++ b/src/examples/ecore/ecore_idler_example.c
@@ -110,7 +110,7 @@ main(void)
110 ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt); 110 ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt);
111 ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt); 111 ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt);
112 ctxt.idler = ecore_idler_add(_idler_cb, &ctxt); 112 ctxt.idler = ecore_idler_add(_idler_cb, &ctxt);
113// ctxt.idler = eo_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(eo_self, _idler_cb, &ctxt)); 113// ctxt.idler = efl_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(efl_self, _idler_cb, &ctxt));
114 ctxt.handler = ecore_event_handler_add(_event_type, 114 ctxt.handler = ecore_event_handler_add(_event_type,
115 _event_handler_cb, 115 _event_handler_cb,
116 &ctxt); 116 &ctxt);
diff --git a/src/examples/ecore/ecore_poller_example.c b/src/examples/ecore/ecore_poller_example.c
index 73a09b3..2e0006c 100644
--- a/src/examples/ecore/ecore_poller_example.c
+++ b/src/examples/ecore/ecore_poller_example.c
@@ -48,9 +48,9 @@ main(void)
48 poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2); 48 poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2);
49 poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3); 49 poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3);
50 50
51// poller1 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); 51// poller1 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
52// poller2 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); 52// poller2 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
53// poller3 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); 53// poller3 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
54 54
55 55
56 ecore_main_loop_begin(); 56 ecore_main_loop_begin();
@@ -61,9 +61,9 @@ main(void)
61// ecore_poller_interval_set(poller2, 16, NULL); 61// ecore_poller_interval_set(poller2, 16, NULL);
62 ecore_main_loop_begin(); 62 ecore_main_loop_begin();
63 63
64// eo_unref(poller1); 64// efl_unref(poller1);
65// eo_unref(poller2); 65// efl_unref(poller2);
66// eo_unref(poller3); 66// efl_unref(poller3);
67 ecore_poller_del(poller1); 67 ecore_poller_del(poller1);
68 ecore_poller_del(poller2); 68 ecore_poller_del(poller2);
69 ecore_poller_del(poller3); 69 ecore_poller_del(poller3);
diff --git a/src/examples/eio/efl_io_manager_ls.c b/src/examples/eio/efl_io_manager_ls.c
index a411de1..ea2dcca 100644
--- a/src/examples/eio/efl_io_manager_ls.c
+++ b/src/examples/eio/efl_io_manager_ls.c
@@ -15,7 +15,7 @@ void done_cb(void *data, void *value EINA_UNUSED)
15 Efl_Io_Manager *job = data; 15 Efl_Io_Manager *job = data;
16 printf("%s done listing files.\n", __FUNCTION__); 16 printf("%s done listing files.\n", __FUNCTION__);
17 ecore_main_loop_quit(); 17 ecore_main_loop_quit();
18 eo_unref(job); 18 efl_unref(job);
19} 19}
20 20
21void error_cb(void *data, Eina_Error error) 21void error_cb(void *data, Eina_Error error)
@@ -25,7 +25,7 @@ void error_cb(void *data, Eina_Error error)
25 printf("%s error: %s\n", __FUNCTION__, msg); 25 printf("%s error: %s\n", __FUNCTION__, msg);
26 ecore_main_loop_quit(); 26 ecore_main_loop_quit();
27 27
28 eo_unref(job); 28 efl_unref(job);
29} 29}
30 30
31void filter_cb(void *data EINA_UNUSED, const Eo_Event *event) 31void filter_cb(void *data EINA_UNUSED, const Eo_Event *event)
@@ -51,7 +51,7 @@ void list_files(void *data)
51 Eina_Promise *promise; 51 Eina_Promise *promise;
52 const char *path = data; 52 const char *path = data;
53 53
54 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 54 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
55 efl_event_callback_add(job, EFL_IO_MANAGER_EVENT_FILTER_NAME, (Efl_Event_Cb)&filter_cb, NULL); 55 efl_event_callback_add(job, EFL_IO_MANAGER_EVENT_FILTER_NAME, (Efl_Event_Cb)&filter_cb, NULL);
56 promise = efl_io_manager_file_ls(job, path); 56 promise = efl_io_manager_file_ls(job, path);
57 eina_promise_progress_cb_add(promise, (Eina_Promise_Progress_Cb)&progress_cb, NULL, NULL); 57 eina_promise_progress_cb_add(promise, (Eina_Promise_Progress_Cb)&progress_cb, NULL, NULL);
diff --git a/src/examples/eio/efl_io_manager_open.c b/src/examples/eio/efl_io_manager_open.c
index daa9ded..4c9f4a4 100644
--- a/src/examples/eio/efl_io_manager_open.c
+++ b/src/examples/eio/efl_io_manager_open.c
@@ -51,10 +51,10 @@ void done_open_cb(void *data, void* value)
51 51
52void open_file(const char *path) 52void open_file(const char *path)
53{ 53{
54 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 54 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
55 eina_promise_then(efl_io_manager_file_open(job, path, EINA_FALSE), &done_open_cb, &error_cb, job); 55 eina_promise_then(efl_io_manager_file_open(job, path, EINA_FALSE), &done_open_cb, &error_cb, job);
56 56
57 eo_unref(job); 57 efl_unref(job);
58} 58}
59 59
60int main(int argc, char const *argv[]) 60int main(int argc, char const *argv[])
diff --git a/src/examples/eio/efl_io_manager_open_multi.c b/src/examples/eio/efl_io_manager_open_multi.c
index 291f5a2..e55f039 100644
--- a/src/examples/eio/efl_io_manager_open_multi.c
+++ b/src/examples/eio/efl_io_manager_open_multi.c
@@ -17,7 +17,7 @@ void error_cb(void *data, Eina_Error error)
17 EINA_LOG_ERR("error: %s", msg); 17 EINA_LOG_ERR("error: %s", msg);
18 18
19 Efl_Io_Manager *job = data; 19 Efl_Io_Manager *job = data;
20 eo_unref(job); 20 efl_unref(job);
21 21
22 ecore_main_loop_quit(); 22 ecore_main_loop_quit();
23} 23}
@@ -31,7 +31,7 @@ void done_closing_cb(void *data, void* value EINA_UNUSED)
31 printf("%s closed file.\n", __FUNCTION__); 31 printf("%s closed file.\n", __FUNCTION__);
32 32
33 Efl_Io_Manager *job = data; 33 Efl_Io_Manager *job = data;
34 eo_unref(job); 34 efl_unref(job);
35 35
36 ecore_main_loop_quit(); 36 ecore_main_loop_quit();
37} 37}
@@ -74,7 +74,7 @@ void open_file(const char *path, const char *path2)
74 Eina_Promise *promise; 74 Eina_Promise *promise;
75 Eina_Promise *tasks[3] = {NULL, NULL, NULL}; 75 Eina_Promise *tasks[3] = {NULL, NULL, NULL};
76 76
77 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 77 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
78 tasks[0] = efl_io_manager_file_open(job, path, EINA_FALSE); 78 tasks[0] = efl_io_manager_file_open(job, path, EINA_FALSE);
79 tasks[1] = efl_io_manager_file_open(job, path2, EINA_FALSE); 79 tasks[1] = efl_io_manager_file_open(job, path2, EINA_FALSE);
80 promise = eina_promise_all(eina_carray_iterator_new((void**)&tasks[0])); 80 promise = eina_promise_all(eina_carray_iterator_new((void**)&tasks[0]));
diff --git a/src/examples/eio/eio_sentry.c b/src/examples/eio/eio_sentry.c
index 9f8d03d..4c57f7a 100644
--- a/src/examples/eio/eio_sentry.c
+++ b/src/examples/eio/eio_sentry.c
@@ -27,7 +27,7 @@ void
27monitor_stuff(void *data) 27monitor_stuff(void *data)
28{ 28{
29 const char *path = data; 29 const char *path = data;
30 Eio_Sentry *sentry = eo_add(EIO_SENTRY_CLASS, NULL); 30 Eio_Sentry *sentry = efl_add(EIO_SENTRY_CLASS, NULL);
31 efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)&sentry_cb, NULL); 31 efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)&sentry_cb, NULL);
32 32
33 printf("Starting monitoring path %s\n", path); 33 printf("Starting monitoring path %s\n", path);
diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c
index ea43bc4..5edbcc8 100644
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -134,7 +134,7 @@ main(int argc, char **argv EINA_UNUSED)
134 if (argc > 1) bus = argv[1]; 134 if (argc > 1) bus = argv[1];
135 if (argc > 2) path = argv[2]; 135 if (argc > 2) path = argv[2];
136 136
137 root = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path)); 137 root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path));
138 138
139 Eina_Promise *promises[] = { NULL, NULL, NULL}; 139 Eina_Promise *promises[] = { NULL, NULL, NULL};
140 promises[0] = efl_model_children_slice_get(root, 0, 0); 140 promises[0] = efl_model_children_slice_get(root, 0, 0);
@@ -145,6 +145,6 @@ main(int argc, char **argv EINA_UNUSED)
145 145
146 ecore_main_loop_begin(); 146 ecore_main_loop_begin();
147 147
148 eo_unref(root); 148 efl_unref(root);
149 eldbus_shutdown(); 149 eldbus_shutdown();
150} 150}
diff --git a/src/examples/elementary/evas3d_map_example.c b/src/examples/elementary/evas3d_map_example.c
index 0ce96ed..7ff577c 100644
--- a/src/examples/elementary/evas3d_map_example.c
+++ b/src/examples/elementary/evas3d_map_example.c
@@ -462,7 +462,7 @@ zoom_factor_set(double new_zoom_factor)
462 evas_object_resize(map, src_size, src_size); 462 evas_object_resize(map, src_size, src_size);
463 463
464 /* Apply updated texture source. */ 464 /* Apply updated texture source. */
465 texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 465 texture_diffuse = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
466 evas_canvas3d_texture_source_set(texture_diffuse, map); 466 evas_canvas3d_texture_source_set(texture_diffuse, map);
467 evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE); 467 evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE);
468 468
@@ -845,7 +845,7 @@ skybox_setup(void)
845 Evas_Object *skybox_image; 845 Evas_Object *skybox_image;
846 char buf[PATH_MAX]; 846 char buf[PATH_MAX];
847 847
848 skybox_mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 848 skybox_mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
849 evas_canvas3d_mesh_vertex_count_set(skybox_mesh, 24); 849 evas_canvas3d_mesh_vertex_count_set(skybox_mesh, 24);
850 evas_canvas3d_mesh_frame_add(skybox_mesh, 0); 850 evas_canvas3d_mesh_frame_add(skybox_mesh, 0);
851 evas_canvas3d_mesh_frame_vertex_data_set(skybox_mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &skybox_vertices[0]); 851 evas_canvas3d_mesh_frame_vertex_data_set(skybox_mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &skybox_vertices[0]);
@@ -863,10 +863,10 @@ skybox_setup(void)
863 evas_object_show(skybox_image); 863 evas_object_show(skybox_image);
864 864
865 /* Set skybox texture material. */ 865 /* Set skybox texture material. */
866 skybox_material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 866 skybox_material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
867 evas_canvas3d_mesh_frame_material_set(skybox_mesh, 0, skybox_material); 867 evas_canvas3d_mesh_frame_material_set(skybox_mesh, 0, skybox_material);
868 868
869 skybox_texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 869 skybox_texture_diffuse = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
870 870
871 evas_canvas3d_texture_source_set(skybox_texture_diffuse, skybox_image); 871 evas_canvas3d_texture_source_set(skybox_texture_diffuse, skybox_image);
872 evas_canvas3d_texture_source_visible_set(skybox_texture_diffuse, EINA_FALSE); 872 evas_canvas3d_texture_source_visible_set(skybox_texture_diffuse, EINA_FALSE);
@@ -880,7 +880,7 @@ skybox_setup(void)
880 evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0); 880 evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
881 evas_canvas3d_material_shininess_set(skybox_material, 50.0); 881 evas_canvas3d_material_shininess_set(skybox_material, 50.0);
882 882
883 skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 883 skybox_mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
884 evas_canvas3d_node_member_add(root_node, skybox_mesh_node); 884 evas_canvas3d_node_member_add(root_node, skybox_mesh_node);
885 evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh); 885 evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh);
886 evas_canvas3d_mesh_shader_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE); 886 evas_canvas3d_mesh_shader_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
@@ -921,7 +921,7 @@ static void
921camera_setup(void) 921camera_setup(void)
922{ 922{
923 /* Add the camera. */ 923 /* Add the camera. */
924 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 924 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
925 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 100.0); 925 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 100.0);
926 926
927 /* Set camera position. */ 927 /* Set camera position. */
@@ -939,7 +939,7 @@ camera_setup(void)
939 camera_right_vec.y = 0.0; 939 camera_right_vec.y = 0.0;
940 camera_right_vec.z = 0.0; 940 camera_right_vec.z = 0.0;
941 941
942 camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 942 camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
943 evas_canvas3d_node_camera_set(camera_node, camera); 943 evas_canvas3d_node_camera_set(camera_node, camera);
944 evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z); 944 evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z);
945 evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z); 945 evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z);
@@ -949,12 +949,12 @@ camera_setup(void)
949static void 949static void
950light_setup(void) 950light_setup(void)
951{ 951{
952 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); 952 light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
953 evas_canvas3d_light_ambient_set(light, 0.2, 0.2, 0.2, 1.0); 953 evas_canvas3d_light_ambient_set(light, 0.2, 0.2, 0.2, 1.0);
954 evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); 954 evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
955 evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0); 955 evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0);
956 956
957 light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 957 light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
958 evas_canvas3d_node_light_set(light_node, light); 958 evas_canvas3d_node_light_set(light_node, light);
959 evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE); 959 evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE);
960 evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 960 evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -967,7 +967,7 @@ mesh_setup(void)
967 /* Create a sphere mesh. */ 967 /* Create a sphere mesh. */
968 sphere_init(50); 968 sphere_init(50);
969 969
970 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 970 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
971 evas_canvas3d_mesh_vertex_count_set(mesh, vertex_count); 971 evas_canvas3d_mesh_vertex_count_set(mesh, vertex_count);
972 evas_canvas3d_mesh_frame_add(mesh, 0); 972 evas_canvas3d_mesh_frame_add(mesh, 0);
973 evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vertex), &vertices[0].position); 973 evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vertex), &vertices[0].position);
@@ -978,14 +978,14 @@ mesh_setup(void)
978 evas_canvas3d_mesh_index_data_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]); 978 evas_canvas3d_mesh_index_data_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]);
979 evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES); 979 evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
980 980
981 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 981 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
982 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 982 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
983 983
984 texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 984 texture_diffuse = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
985 evas_canvas3d_texture_source_set(texture_diffuse, map); 985 evas_canvas3d_texture_source_set(texture_diffuse, map);
986 evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE); 986 evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE);
987 987
988 texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 988 texture_normal = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
989 evas_canvas3d_texture_source_set(texture_normal, normal_map); 989 evas_canvas3d_texture_source_set(texture_normal, normal_map);
990 evas_canvas3d_texture_source_visible_set(texture_normal, EINA_FALSE); 990 evas_canvas3d_texture_source_visible_set(texture_normal, EINA_FALSE);
991 991
@@ -1000,7 +1000,7 @@ mesh_setup(void)
1000 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0); 1000 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
1001 evas_canvas3d_material_shininess_set(material, 50.0); 1001 evas_canvas3d_material_shininess_set(material, 50.0);
1002 1002
1003 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 1003 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
1004 evas_canvas3d_node_member_add(root_node, mesh_node); 1004 evas_canvas3d_node_member_add(root_node, mesh_node);
1005 evas_canvas3d_node_mesh_add(mesh_node, mesh); 1005 evas_canvas3d_node_mesh_add(mesh_node, mesh);
1006 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP); 1006 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
@@ -1155,7 +1155,7 @@ elm_main(int argc, char **argv)
1155 evas_object_show(bg); 1155 evas_object_show(bg);
1156 1156
1157 /* Add an image which shows a scene. */ 1157 /* Add an image which shows a scene. */
1158 image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); 1158 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
1159 evas_object_resize(image, WIDTH, HEIGHT); 1159 evas_object_resize(image, WIDTH, HEIGHT);
1160 evas_object_show(image); 1160 evas_object_show(image);
1161 1161
@@ -1165,10 +1165,10 @@ elm_main(int argc, char **argv)
1165 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_WHEEL, mouse_wheel_cb, NULL); 1165 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_WHEEL, mouse_wheel_cb, NULL);
1166 1166
1167 /* Add a scene object. */ 1167 /* Add a scene object. */
1168 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 1168 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
1169 1169
1170 /* Add a root node for the scene. */ 1170 /* Add a root node for the scene. */
1171 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 1171 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
1172 1172
1173 skybox_setup(); 1173 skybox_setup();
1174 texture_source_setup(); 1174 texture_source_setup();
diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c
index dc40bb5..a53d233 100644
--- a/src/examples/elementary/evas3d_object_on_button_example.c
+++ b/src/examples/elementary/evas3d_object_on_button_example.c
@@ -158,12 +158,12 @@ _animate_scene(void *data)
158static void 158static void
159_camera_setup(Scene_Data *data) 159_camera_setup(Scene_Data *data)
160{ 160{
161 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 161 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
162 162
163 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); 163 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
164 164
165 data->camera_node = 165 data->camera_node =
166 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 166 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
167 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 167 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
168 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0); 168 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0);
169 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0); 169 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0);
@@ -173,13 +173,13 @@ _camera_setup(Scene_Data *data)
173static void 173static void
174_light_setup(Scene_Data *data) 174_light_setup(Scene_Data *data)
175{ 175{
176 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); 176 data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
177 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); 177 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
178 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 178 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
179 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 179 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
180 180
181 data->light_node = 181 data->light_node =
182 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 182 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
183 evas_canvas3d_node_light_set(data->light_node, data->light); 183 evas_canvas3d_node_light_set(data->light_node, data->light);
184 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 184 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
185 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 185 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -189,8 +189,8 @@ static void
189_mesh_setup(Scene_Data *data) 189_mesh_setup(Scene_Data *data)
190{ 190{
191 /* Setup material and texture as widget button. */ 191 /* Setup material and texture as widget button. */
192 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 192 data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
193 data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 193 data->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
194 194
195 evas_canvas3d_texture_source_set(data->texture, btn); 195 evas_canvas3d_texture_source_set(data->texture, btn);
196 evas_canvas3d_texture_source_visible_set(data->texture, EINA_FALSE); 196 evas_canvas3d_texture_source_visible_set(data->texture, EINA_FALSE);
@@ -205,7 +205,7 @@ _mesh_setup(Scene_Data *data)
205 evas_canvas3d_material_shininess_set(data->material, 100.0); 205 evas_canvas3d_material_shininess_set(data->material, 100.0);
206 206
207 /* Setup mesh. */ 207 /* Setup mesh. */
208 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 208 data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
209 evas_canvas3d_mesh_vertex_count_set(data->mesh, 24); 209 evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
210 evas_canvas3d_mesh_frame_add(data->mesh, 0); 210 evas_canvas3d_mesh_frame_add(data->mesh, 0);
211 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]); 211 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -219,7 +219,7 @@ _mesh_setup(Scene_Data *data)
219 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE); 219 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
220 220
221 data->mesh_node = 221 data->mesh_node =
222 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 222 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
223 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 223 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
224 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 224 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
225} 225}
@@ -227,12 +227,12 @@ _mesh_setup(Scene_Data *data)
227static void 227static void
228_scene_setup(Scene_Data *data) 228_scene_setup(Scene_Data *data)
229{ 229{
230 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 230 data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
231 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); 231 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
232 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 232 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
233 233
234 data->root_node = 234 data->root_node =
235 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 235 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
236 236
237 _camera_setup(data); 237 _camera_setup(data);
238 _light_setup(data); 238 _light_setup(data);
@@ -256,7 +256,7 @@ elm_main(int argc, char **argv)
256 evas = evas_object_evas_get(win); 256 evas = evas_object_evas_get(win);
257 257
258 /* Add an image object for 3D scene rendering. */ 258 /* Add an image object for 3D scene rendering. */
259 image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); 259 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
260 efl_gfx_size_set(image, WIDTH, HEIGHT); 260 efl_gfx_size_set(image, WIDTH, HEIGHT);
261 efl_gfx_visible_set(image, EINA_TRUE); 261 efl_gfx_visible_set(image, EINA_TRUE);
262 262
diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c
index 57e8a7f..51e47d3 100644
--- a/src/examples/elementary/evas3d_scene_on_button_example.c
+++ b/src/examples/elementary/evas3d_scene_on_button_example.c
@@ -119,12 +119,12 @@ _animate_scene(void *data)
119static void 119static void
120_camera_setup(Scene_Data *data) 120_camera_setup(Scene_Data *data)
121{ 121{
122 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 122 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
123 123
124 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 124 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
125 125
126 data->camera_node = 126 data->camera_node =
127 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 127 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
128 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 128 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
129 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 129 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
130 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 130 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -134,13 +134,13 @@ _camera_setup(Scene_Data *data)
134static void 134static void
135_light_setup(Scene_Data *data) 135_light_setup(Scene_Data *data)
136{ 136{
137 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); 137 data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
138 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); 138 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
139 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 139 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
140 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 140 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
141 141
142 data->light_node = 142 data->light_node =
143 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 143 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
144 evas_canvas3d_node_light_set(data->light_node, data->light); 144 evas_canvas3d_node_light_set(data->light_node, data->light);
145 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 145 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
146 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 146 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -150,7 +150,7 @@ static void
150_mesh_setup(Scene_Data *data) 150_mesh_setup(Scene_Data *data)
151{ 151{
152 /* Setup material. */ 152 /* Setup material. */
153 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 153 data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
154 154
155 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 155 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
156 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 156 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -161,7 +161,7 @@ _mesh_setup(Scene_Data *data)
161 evas_canvas3d_material_shininess_set(data->material, 100.0); 161 evas_canvas3d_material_shininess_set(data->material, 100.0);
162 162
163 /* Setup mesh. */ 163 /* Setup mesh. */
164 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 164 data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
165 evas_canvas3d_mesh_vertex_count_set(data->mesh, 24); 165 evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
166 evas_canvas3d_mesh_frame_add(data->mesh, 0); 166 evas_canvas3d_mesh_frame_add(data->mesh, 0);
167 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]); 167 evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -174,7 +174,7 @@ _mesh_setup(Scene_Data *data)
174 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 174 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
175 175
176 data->mesh_node = 176 data->mesh_node =
177 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 177 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
178 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 178 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
179 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 179 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
180} 180}
@@ -182,12 +182,12 @@ _mesh_setup(Scene_Data *data)
182static void 182static void
183_scene_setup(Scene_Data *data) 183_scene_setup(Scene_Data *data)
184{ 184{
185 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 185 data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
186 evas_canvas3d_scene_size_set(data->scene, WIDTH - d_w, HEIGHT - d_h); 186 evas_canvas3d_scene_size_set(data->scene, WIDTH - d_w, HEIGHT - d_h);
187 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 187 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
188 188
189 data->root_node = 189 data->root_node =
190 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 190 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
191 191
192 _camera_setup(data); 192 _camera_setup(data);
193 _light_setup(data); 193 _light_setup(data);
@@ -247,7 +247,7 @@ elm_main(int argc, char **argv)
247 247
248 _scene_setup(&data); 248 _scene_setup(&data);
249 249
250 image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); 250 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
251 efl_gfx_visible_set(image, EINA_TRUE); 251 efl_gfx_visible_set(image, EINA_TRUE);
252 252
253 /* Set the image object as render target for 3D scene. */ 253 /* Set the image object as render target for 3D scene. */
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index b669c02..d28a593 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -32,10 +32,10 @@ static void
32_cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 32_cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
33{ 33{
34 Efl_Model_Test_Filemvc_Data *priv = (Efl_Model_Test_Filemvc_Data *)data; 34 Efl_Model_Test_Filemvc_Data *priv = (Efl_Model_Test_Filemvc_Data *)data;
35 eo_unref(priv->fileview); 35 efl_unref(priv->fileview);
36 eo_unref(priv->treeview); 36 efl_unref(priv->treeview);
37 eo_unref(priv->formview); 37 efl_unref(priv->formview);
38 eo_unref(priv->treemodel); 38 efl_unref(priv->treemodel);
39} 39}
40 40
41static Eina_Bool 41static Eina_Bool
@@ -65,7 +65,7 @@ _promise_then(void *data, void *value)
65 Eo *model; 65 Eo *model;
66 66
67 eina_value_get(value, &path); 67 eina_value_get(value, &path);
68 model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path)); 68 model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
69 elm_view_list_model_set(priv->fileview, model); 69 elm_view_list_model_set(priv->fileview, model);
70} 70}
71 71
@@ -144,12 +144,12 @@ elm_main(int argc, char **argv)
144 else dirname = EFL_MODEL_TEST_FILENAME_PATH; 144 else dirname = EFL_MODEL_TEST_FILENAME_PATH;
145 145
146 //treemodel 146 //treemodel
147 priv.treemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dirname)); 147 priv.treemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dirname));
148 eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL); 148 eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL);
149 149
150 //treeview 150 //treeview
151 genlist = elm_genlist_add(win); 151 genlist = elm_genlist_add(win);
152 priv.treeview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_TREE, NULL)); 152 priv.treeview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_TREE, NULL));
153 elm_view_list_property_connect(priv.treeview, "filename", "elm.text"); 153 elm_view_list_property_connect(priv.treeview, "filename", "elm.text");
154 elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon"); 154 elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon");
155 elm_view_list_model_set(priv.treeview, priv.treemodel); 155 elm_view_list_model_set(priv.treeview, priv.treemodel);
@@ -164,7 +164,7 @@ elm_main(int argc, char **argv)
164 164
165 //listview 165 //listview
166 genlist = elm_genlist_add(win); 166 genlist = elm_genlist_add(win);
167 priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_NONE, "double_label")); 167 priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
168 elm_view_list_property_connect(priv.fileview, "filename", "elm.text"); 168 elm_view_list_property_connect(priv.fileview, "filename", "elm.text");
169 elm_view_list_property_connect(priv.fileview, "mime_type", "elm.text.sub"); 169 elm_view_list_property_connect(priv.fileview, "mime_type", "elm.text.sub");
170 170
@@ -178,7 +178,7 @@ elm_main(int argc, char **argv)
178 bxr = elm_box_add(win); 178 bxr = elm_box_add(win);
179 _widget_init(bxr); 179 _widget_init(bxr);
180 elm_object_part_content_set(vpanes, "right", bxr); 180 elm_object_part_content_set(vpanes, "right", bxr);
181 priv.formview = eo_add(ELM_VIEW_FORM_CLASS, NULL); 181 priv.formview = efl_add(ELM_VIEW_FORM_CLASS, NULL);
182 182
183 /*Label widget */ 183 /*Label widget */
184 elm_view_form_widget_add(priv.formview, "filename", _label_init(win, bxr, "File Name")); 184 elm_view_form_widget_add(priv.formview, "filename", _label_init(win, bxr, "File Name"));
diff --git a/src/examples/elementary/fileviewlist.c b/src/examples/elementary/fileviewlist.c
index a3a434e..a4613ef 100644
--- a/src/examples/elementary/fileviewlist.c
+++ b/src/examples/elementary/fileviewlist.c
@@ -27,8 +27,8 @@ static void
27_cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 27_cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
28{ 28{
29 Efl_Model_Test_Fileview_Data *priv = (Efl_Model_Test_Fileview_Data *)data; 29 Efl_Model_Test_Fileview_Data *priv = (Efl_Model_Test_Fileview_Data *)data;
30 eo_unref(priv->fileview); 30 efl_unref(priv->fileview);
31 eo_unref(priv->filemodel); 31 efl_unref(priv->filemodel);
32} 32}
33 33
34EAPI_MAIN int 34EAPI_MAIN int
@@ -54,8 +54,8 @@ elm_main(int argc, char **argv)
54 evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 54 evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
55 evas_object_show(genlist); 55 evas_object_show(genlist);
56 56
57 priv.filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dirname)); 57 priv.filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dirname));
58 priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_TREE, "double_label")); 58 priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
59 elm_view_list_model_set(priv.fileview, priv.filemodel); 59 elm_view_list_model_set(priv.fileview, priv.filemodel);
60 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv); 60 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv);
61 61
diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 1dd5822..70a40cd 100644
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -248,7 +248,7 @@ void _init_bounding()
248 20, 21, 22, 22, 21, 23 248 20, 21, 22, 22, 21, 23
249 }; 249 };
250 250
251 globalGraphical.material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas); 251 globalGraphical.material_box = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
252 252
253 evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 253 evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
254 evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 254 evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -259,7 +259,7 @@ void _init_bounding()
259 evas_canvas3d_material_shininess_set(globalGraphical.material_box, 100.0); 259 evas_canvas3d_material_shininess_set(globalGraphical.material_box, 100.0);
260 260
261 /* Setup mesh. */ 261 /* Setup mesh. */
262 globalGraphical.mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas); 262 globalGraphical.mesh_box = efl_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
263 evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh_box, 24); 263 evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh_box, 24);
264 evas_canvas3d_mesh_frame_add(globalGraphical.mesh_box, 0); 264 evas_canvas3d_mesh_frame_add(globalGraphical.mesh_box, 0);
265 evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]); 265 evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -272,7 +272,7 @@ void _init_bounding()
272 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box); 272 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box);
273 273
274 globalGraphical.mesh_nodebox = 274 globalGraphical.mesh_nodebox =
275 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, 0, -30.0, 0.0)); 275 efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, 0, -30.0, 0.0));
276 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox); 276 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox);
277 evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box); 277 evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box);
278} 278}
@@ -307,7 +307,7 @@ _change_scene_setup()
307 _sphere_init(globalGraphical.precision); 307 _sphere_init(globalGraphical.precision);
308 for (i = 0; i < quantity; i++) 308 for (i = 0; i < quantity; i++)
309 { 309 {
310 globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas); 310 globalGraphical.mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
311 if (!globalGraphical.model_path) 311 if (!globalGraphical.model_path)
312 { 312 {
313 evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count); 313 evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count);
@@ -359,7 +359,7 @@ _change_scene_setup()
359 for (i = 0; i < quantity; i++) 359 for (i = 0; i < quantity; i++)
360 { 360 {
361 globalGraphical.mesh_node = 361 globalGraphical.mesh_node =
362 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20)); 362 efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
363 if (globalGraphical.model_path) 363 if (globalGraphical.model_path)
364 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2); 364 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
365 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node); 365 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
@@ -394,23 +394,23 @@ _init_scene(Evas_Object *img)
394 /*Allocate memory - eina_mempool*/ 394 /*Allocate memory - eina_mempool*/
395 395
396 /* Add a scene object .*/ 396 /* Add a scene object .*/
397 globalGraphical.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas); 397 globalGraphical.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas);
398 398
399 /* Add the root node for the scene. */ 399 /* Add the root node for the scene. */
400 globalGraphical.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 400 globalGraphical.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
401 401
402 /* Add the camera. */ 402 /* Add the camera. */
403 globalGraphical.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas); 403 globalGraphical.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas);
404 evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0); 404 evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0);
405 405
406 globalGraphical.camera_node = 406 globalGraphical.camera_node =
407 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 407 efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
408 evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera); 408 evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera);
409 evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0); 409 evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0);
410 evas_canvas3d_node_look_at_set(globalGraphical.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 410 evas_canvas3d_node_look_at_set(globalGraphical.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
411 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.camera_node); 411 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.camera_node);
412 412
413 globalGraphical.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, globalGraphical.evas); 413 globalGraphical.light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, globalGraphical.evas);
414 evas_canvas3d_light_ambient_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0); 414 evas_canvas3d_light_ambient_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
415 evas_canvas3d_light_diffuse_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0); 415 evas_canvas3d_light_diffuse_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
416 evas_canvas3d_light_specular_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0); 416 evas_canvas3d_light_specular_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
@@ -418,15 +418,15 @@ _init_scene(Evas_Object *img)
418 evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15); 418 evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15);
419 419
420 globalGraphical.light_node = 420 globalGraphical.light_node =
421 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 421 efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
422 evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light); 422 evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light);
423 evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0); 423 evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0);
424 evas_canvas3d_node_look_at_set(globalGraphical.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 424 evas_canvas3d_node_look_at_set(globalGraphical.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
425 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.light_node); 425 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.light_node);
426 426
427 427
428 globalGraphical.material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas); 428 globalGraphical.material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
429 globalGraphical.texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, globalGraphical.evas); 429 globalGraphical.texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, globalGraphical.evas);
430 evas_canvas3d_texture_file_set(globalGraphical.texture, "target_texture.png", NULL); 430 evas_canvas3d_texture_file_set(globalGraphical.texture, "target_texture.png", NULL);
431 evas_canvas3d_texture_filter_set(globalGraphical.texture, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR); 431 evas_canvas3d_texture_filter_set(globalGraphical.texture, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR);
432 evas_canvas3d_texture_wrap_set(globalGraphical.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 432 evas_canvas3d_texture_wrap_set(globalGraphical.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
@@ -444,7 +444,7 @@ _init_scene(Evas_Object *img)
444 444
445 for (i = 0; i < quantity; i++) 445 for (i = 0; i < quantity; i++)
446 { 446 {
447 globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas); 447 globalGraphical.mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
448 if (!globalGraphical.model_path) 448 if (!globalGraphical.model_path)
449 { 449 {
450 evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count); 450 evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count);
@@ -474,7 +474,7 @@ _init_scene(Evas_Object *img)
474 for (i = 0; i < quantity; i++) 474 for (i = 0; i < quantity; i++)
475 { 475 {
476 globalGraphical.mesh_node = 476 globalGraphical.mesh_node =
477 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20)); 477 efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
478 if (globalGraphical.model_path) 478 if (globalGraphical.model_path)
479 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2); 479 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
480 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node); 480 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
diff --git a/src/examples/elementary/performance/performance.c b/src/examples/elementary/performance/performance.c
index cdfe6be..1b1091b 100644
--- a/src/examples/elementary/performance/performance.c
+++ b/src/examples/elementary/performance/performance.c
@@ -622,7 +622,7 @@ EAPI_MAIN
622 evas_object_show(startexitbox); 622 evas_object_show(startexitbox);
623 623
624 evas = evas_object_evas_get(win); 624 evas = evas_object_evas_get(win);
625 image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); 625 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
626 626
627 btnstart = elm_button_add(win); 627 btnstart = elm_button_add(win);
628 elm_object_text_set(btnstart, "Apply"); 628 elm_object_text_set(btnstart, "Apply");
diff --git a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
index cb829a3..9c7f55d 100644
--- a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
@@ -434,10 +434,10 @@ _quit_game(void *data EINA_UNUSED, Evas_Object *btn EINA_UNUSED, void *ev EINA_U
434static void 434static void
435_camera_setup(Scene_Data *data) 435_camera_setup(Scene_Data *data)
436{ 436{
437 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 437 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
438 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0); 438 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0);
439 439
440 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 440 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
441 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 441 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
442 evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70); 442 evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70);
443 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 443 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -458,14 +458,14 @@ _animate_camera(void *data)
458static void 458static void
459_light_setup(Scene_Data *data) 459_light_setup(Scene_Data *data)
460{ 460{
461 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); 461 data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
462 462
463 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); 463 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
464 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 464 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
465 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 465 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
466 evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0); 466 evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0);
467 467
468 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 468 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
469 evas_canvas3d_node_light_set(data->light_node, data->light); 469 evas_canvas3d_node_light_set(data->light_node, data->light);
470 evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1); 470 evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1);
471 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 471 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -476,8 +476,8 @@ _light_setup(Scene_Data *data)
476static void 476static void
477_mesh_cube_setup(Scene_Data *data) 477_mesh_cube_setup(Scene_Data *data)
478{ 478{
479 data->mesh_cube = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 479 data->mesh_cube = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
480 data->material_cube = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 480 data->material_cube = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
481 evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 481 evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
482 evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 482 evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
483 evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE); 483 evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
@@ -505,9 +505,9 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real
505 Eo *node = NULL; 505 Eo *node = NULL;
506 Eo *material = NULL; 506 Eo *material = NULL;
507 507
508 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 508 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
509 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 509 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
510 node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 510 node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
511 511
512 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 512 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
513 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 513 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -555,7 +555,7 @@ _create_cubes(Scene_Data *data, Evas_Real r, int count)
555 Eo *node = NULL; 555 Eo *node = NULL;
556 556
557 alpha = d_alpha * i * M_PI / 180; 557 alpha = d_alpha * i * M_PI / 180;
558 node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 558 node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
559 559
560 evas_canvas3d_node_mesh_add(node, data->mesh_cube); 560 evas_canvas3d_node_mesh_add(node, data->mesh_cube);
561 evas_canvas3d_node_position_set(node, r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha)); 561 evas_canvas3d_node_position_set(node, r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha));
@@ -572,9 +572,9 @@ _mesh_ball_setup(Scene_Data *data)
572{ 572{
573 _sphere_init(100); 573 _sphere_init(100);
574 574
575 data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 575 data->mesh_ball = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
576 data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 576 data->material_ball = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
577 data->mesh_node_ball = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 577 data->mesh_node_ball = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
578 578
579 /* Setup material for ball. */ 579 /* Setup material for ball. */
580 evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 580 evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
@@ -608,10 +608,10 @@ _scene_setup(Scene_Data *data, Evas_Real r, int count)
608{ 608{
609 Eina_List *l = NULL; 609 Eina_List *l = NULL;
610 Eo *item = NULL; 610 Eo *item = NULL;
611 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 611 data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
612 612
613 /* Add the root node for the scene. */ 613 /* Add the root node for the scene. */
614 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 614 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
615 615
616 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); 616 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
617 evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE); 617 evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE);
@@ -813,7 +813,7 @@ elm_main(int argc, char **argv)
813 813
814 _scene_setup(&data, 10.0, 10); 814 _scene_setup(&data, 10.0, 10);
815 815
816 image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); 816 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
817 efl_gfx_visible_set(image, EINA_TRUE); 817 efl_gfx_visible_set(image, EINA_TRUE);
818 efl_canvas_scene3d_set(image, data.scene); 818 efl_canvas_scene3d_set(image, data.scene);
819 819
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index d2328a6..c113f6d 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -155,7 +155,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
155 evas_object_resize(em, w - 20, h - 20); 155 evas_object_resize(em, w - 20, h - 20);
156} 156}
157 157
158EO_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, 158EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
159 { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, 159 { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb },
160 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb }, 160 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb },
161 { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, 161 { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb },
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index 71c8e7d..febd0e3 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -152,7 +152,7 @@ _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
152 emotion_object_progress_info_get(ev->object)); 152 emotion_object_progress_info_get(ev->object));
153} 153}
154 154
155EO_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, 155EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
156 { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, 156 { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb },
157 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb }, 157 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb },
158 { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, 158 { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb },
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index 7cf57e3..325a03e 100644
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -84,7 +84,7 @@ _frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev)
84 _display_info(ev->object); 84 _display_info(ev->object);
85} 85}
86 86
87EO_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, 87EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
88 { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb }, 88 { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb },
89 { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_finished_cb }, 89 { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_finished_cb },
90 { EMOTION_OBJECT_EVENT_OPEN_DONE, _open_done_cb }, 90 { EMOTION_OBJECT_EVENT_OPEN_DONE, _open_done_cb },
diff --git a/src/examples/eolian_cxx/colourable.c b/src/examples/eolian_cxx/colourable.c
index 3dcaf36..141bd55 100644
--- a/src/examples/eolian_cxx/colourable.c
+++ b/src/examples/eolian_cxx/colourable.c
@@ -35,7 +35,7 @@ _ns_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED
35 = eina_log_domain_register("colourable", EINA_COLOR_BLUE); 35 = eina_log_domain_register("colourable", EINA_COLOR_BLUE);
36 } 36 }
37 DBG("_ns_colourable_constructor(%p, %p)\n", obj, MY_CLASS); 37 DBG("_ns_colourable_constructor(%p, %p)\n", obj, MY_CLASS);
38 return efl_constructor(eo_super(obj, MY_CLASS)); 38 return efl_constructor(efl_super(obj, MY_CLASS));
39} 39}
40 40
41void 41void
@@ -47,7 +47,7 @@ _ns_colourable_efl_object_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
47 _ns_colourable_impl_logdomain = 0; 47 _ns_colourable_impl_logdomain = 0;
48 } 48 }
49 DBG("_ns_colourable_destructor()\n"); 49 DBG("_ns_colourable_destructor()\n");
50 efl_destructor(eo_super(obj, MY_CLASS)); 50 efl_destructor(efl_super(obj, MY_CLASS));
51} 51}
52 52
53void 53void
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index cd2509f..6399b1e 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -142,40 +142,40 @@ main(void)
142 142
143 evas = ecore_evas_get(ecore_evas); 143 evas = ecore_evas_get(ecore_evas);
144 144
145 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 145 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
146 146
147 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 147 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
148 148
149 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 149 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
150 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); 150 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
151 151
152 camera_node = 152 camera_node =
153 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 153 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
154 evas_canvas3d_node_camera_set(camera_node, camera); 154 evas_canvas3d_node_camera_set(camera_node, camera);
155 evas_canvas3d_node_member_add(root_node, camera_node); 155 evas_canvas3d_node_member_add(root_node, camera_node);
156 evas_canvas3d_node_position_set(camera_node, 100.0, 50.0, 20.0); 156 evas_canvas3d_node_position_set(camera_node, 100.0, 50.0, 20.0);
157 evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); 157 evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0);
158 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); 158 light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
159 evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0); 159 evas_canvas3d_light_ambient_set(light, 1.0, 1.0, 1.0, 1.0);
160 evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); 160 evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
161 evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); 161 evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
162 evas_canvas3d_light_directional_set(light, EINA_TRUE); 162 evas_canvas3d_light_directional_set(light, EINA_TRUE);
163 163
164 light_node = 164 light_node =
165 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 165 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
166 evas_canvas3d_node_light_set(light_node, light); 166 evas_canvas3d_node_light_set(light_node, light);
167 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); 167 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
168 evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 168 evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
169 evas_canvas3d_node_member_add(root_node, light_node); 169 evas_canvas3d_node_member_add(root_node, light_node);
170 170
171 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 171 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
172 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 172 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
173 173
174 efl_file_set(mesh, model_path, NULL); 174 efl_file_set(mesh, model_path, NULL);
175 evas_canvas3d_mesh_frame_material_set(mesh, 0, material); 175 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
176 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 176 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
177 177
178 texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 178 texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
179 evas_canvas3d_texture_file_set(texture, image_path, NULL); 179 evas_canvas3d_texture_file_set(texture, image_path, NULL);
180 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 180 evas_canvas3d_texture_filter_set(texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
181 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 181 evas_canvas3d_texture_wrap_set(texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
@@ -189,16 +189,16 @@ main(void)
189 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); 189 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
190 evas_canvas3d_material_shininess_set(material, 50.0); 190 evas_canvas3d_material_shininess_set(material, 50.0);
191 191
192 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 192 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
193 mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 193 mesh_box_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
194 194
195 material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 195 material_box = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
196 evas_canvas3d_material_enable_set(material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 196 evas_canvas3d_material_enable_set(material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
197 197
198 cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 198 cube = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
199 evas_canvas3d_primitive_form_set(cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); 199 evas_canvas3d_primitive_form_set(cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
200 200
201 mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 201 mesh_box = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
202 evas_canvas3d_mesh_from_primitive_set(mesh_box, 0, cube); 202 evas_canvas3d_mesh_from_primitive_set(mesh_box, 0, cube);
203 evas_canvas3d_mesh_vertex_assembly_set(mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES); 203 evas_canvas3d_mesh_vertex_assembly_set(mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES);
204 evas_canvas3d_mesh_shader_mode_set(mesh_box, EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR); 204 evas_canvas3d_mesh_shader_mode_set(mesh_box, EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR);
@@ -215,12 +215,12 @@ main(void)
215 evas_canvas3d_scene_camera_node_set(scene, camera_node); 215 evas_canvas3d_scene_camera_node_set(scene, camera_node);
216 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 216 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
217 217
218 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 218 background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
219 efl_gfx_color_set(background, 0, 0, 0, 255); 219 efl_gfx_color_set(background, 0, 0, 0, 255);
220 efl_gfx_size_set(background, WIDTH, HEIGHT); 220 efl_gfx_size_set(background, WIDTH, HEIGHT);
221 efl_gfx_visible_set(background, EINA_TRUE); 221 efl_gfx_visible_set(background, EINA_TRUE);
222 222
223 image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); 223 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
224 efl_gfx_size_set(image, WIDTH, HEIGHT); 224 efl_gfx_size_set(image, WIDTH, HEIGHT);
225 efl_gfx_visible_set(image, EINA_TRUE); 225 efl_gfx_visible_set(image, EINA_TRUE);
226 evas_object_focus_set(image, EINA_TRUE); 226 evas_object_focus_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 51dff5a..8e41cf1 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -148,12 +148,12 @@ _animate_scene(void *data)
148static void 148static void
149_camera_setup(Scene_Data *data) 149_camera_setup(Scene_Data *data)
150{ 150{
151 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 151 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
152 152
153 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 153 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
154 154
155 data->camera_node = 155 data->camera_node =
156 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 156 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
157 157
158 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 158 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
159 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 159 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
@@ -165,13 +165,13 @@ _camera_setup(Scene_Data *data)
165static void 165static void
166_light_setup(Scene_Data *data) 166_light_setup(Scene_Data *data)
167{ 167{
168 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); 168 data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
169 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); 169 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
170 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 170 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
171 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 171 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
172 172
173 data->light_node = 173 data->light_node =
174 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 174 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
175 evas_canvas3d_node_light_set(data->light_node, data->light); 175 evas_canvas3d_node_light_set(data->light_node, data->light);
176 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 176 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
177 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 177 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -189,7 +189,7 @@ _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
189static void 189static void
190_mesh_setup(Scene_Data *data) 190_mesh_setup(Scene_Data *data)
191{ 191{
192 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 192 data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
193 193
194 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 194 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
195 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 195 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -199,7 +199,7 @@ _mesh_setup(Scene_Data *data)
199 evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2); 199 evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2);
200 evas_canvas3d_material_shininess_set(data->material, 100.0); 200 evas_canvas3d_material_shininess_set(data->material, 100.0);
201 201
202 data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 202 data->material1 = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
203 203
204 evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 204 evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
205 evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 205 evas_canvas3d_material_enable_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -209,24 +209,24 @@ _mesh_setup(Scene_Data *data)
209 evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2); 209 evas_canvas3d_material_color_set(data->material1, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2);
210 evas_canvas3d_material_shininess_set(data->material1, 100.0); 210 evas_canvas3d_material_shininess_set(data->material1, 100.0);
211 211
212 data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 212 data->sphere = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
213 evas_canvas3d_primitive_form_set(data->sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); 213 evas_canvas3d_primitive_form_set(data->sphere, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
214 evas_canvas3d_primitive_precision_set(data->sphere, 50); 214 evas_canvas3d_primitive_precision_set(data->sphere, 50);
215 215
216 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 216 data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
217 data->mesh1 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 217 data->mesh1 = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
218 218
219 _set_ball(data->mesh, data->sphere, data->material); 219 _set_ball(data->mesh, data->sphere, data->material);
220 _set_ball(data->mesh1, data->sphere, data->material1); 220 _set_ball(data->mesh1, data->sphere, data->material1);
221 221
222 data->mesh_node = 222 data->mesh_node =
223 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 223 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
224 224
225 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 225 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
226 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 226 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
227 227
228 data->mesh_node1 = 228 data->mesh_node1 =
229 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 229 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
230 230
231 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1); 231 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1);
232 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1); 232 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1);
@@ -242,13 +242,13 @@ _mesh_setup(Scene_Data *data)
242static void 242static void
243_scene_setup(Scene_Data *data) 243_scene_setup(Scene_Data *data)
244{ 244{
245 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 245 data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
246 246
247 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); 247 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
248 evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1); 248 evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1);
249 249
250 data->root_node = 250 data->root_node =
251 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 251 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
252 252
253 _camera_setup(data); 253 _camera_setup(data);
254 _light_setup(data); 254 _light_setup(data);
@@ -288,7 +288,7 @@ main(void)
288 evas_object_show(background); 288 evas_object_show(background);
289 289
290 /* Add an image object for 3D scene rendering. */ 290 /* Add an image object for 3D scene rendering. */
291 image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); 291 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
292 evas_object_move(image, 0, 0); 292 evas_object_move(image, 0, 0);
293 evas_object_resize(image, WIDTH, HEIGHT); 293 evas_object_resize(image, WIDTH, HEIGHT);
294 evas_object_show(image); 294 evas_object_show(image);
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 3d79500..bbfcddd 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -237,9 +237,9 @@ Eina_Bool
237_init_sphere(void *this, const char *texture) 237_init_sphere(void *this, const char *texture)
238{ 238{
239 Test_object *sphere = (Test_object *)this; 239 Test_object *sphere = (Test_object *)this;
240 sphere->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 240 sphere->primitive = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
241 sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 241 sphere->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
242 sphere->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 242 sphere->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
243 evas_canvas3d_primitive_form_set(sphere->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE); 243 evas_canvas3d_primitive_form_set(sphere->primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE);
244 evas_canvas3d_primitive_precision_set(sphere->primitive, 50); 244 evas_canvas3d_primitive_precision_set(sphere->primitive, 50);
245 evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive); 245 evas_canvas3d_mesh_from_primitive_set(sphere->mesh, 0, sphere->primitive);
@@ -248,7 +248,7 @@ _init_sphere(void *this, const char *texture)
248 248
249 evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE); 249 evas_canvas3d_mesh_color_pick_enable_set(sphere->mesh, EINA_TRUE);
250 250
251 sphere->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas); 251 sphere->texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
252 evas_canvas3d_texture_file_set(sphere->texture, texture, NULL); 252 evas_canvas3d_texture_file_set(sphere->texture, texture, NULL);
253 evas_canvas3d_texture_filter_set(sphere->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST); 253 evas_canvas3d_texture_filter_set(sphere->texture, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST, EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST);
254 evas_canvas3d_texture_wrap_set(sphere->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT); 254 evas_canvas3d_texture_wrap_set(sphere->texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
@@ -272,27 +272,27 @@ _init_scene(const char *texture)
272 Evas_Real tmp; 272 Evas_Real tmp;
273 Test_object *m; 273 Test_object *m;
274 274
275 globalscene.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 275 globalscene.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
276 276
277 globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 277 globalscene.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
278 278
279 globalscene.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 279 globalscene.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
280 evas_canvas3d_camera_projection_perspective_set(globalscene.camera, 30.0, 1.0, 1.0, 1000.0); 280 evas_canvas3d_camera_projection_perspective_set(globalscene.camera, 30.0, 1.0, 1.0, 1000.0);
281 281
282 globalscene.camera_node = 282 globalscene.camera_node =
283 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 283 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
284 evas_canvas3d_node_camera_set(globalscene.camera_node, globalscene.camera); 284 evas_canvas3d_node_camera_set(globalscene.camera_node, globalscene.camera);
285 evas_canvas3d_node_member_add(globalscene.root_node, globalscene.camera_node); 285 evas_canvas3d_node_member_add(globalscene.root_node, globalscene.camera_node);
286 evas_canvas3d_node_position_set(globalscene.camera_node, 0.0, 30.0, 800.0); 286 evas_canvas3d_node_position_set(globalscene.camera_node, 0.0, 30.0, 800.0);
287 evas_canvas3d_node_look_at_set(globalscene.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -1000.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 287 evas_canvas3d_node_look_at_set(globalscene.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -1000.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
288 globalscene.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); 288 globalscene.light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
289 evas_canvas3d_light_ambient_set(globalscene.light, 1.0, 1.0, 1.0, 1.0); 289 evas_canvas3d_light_ambient_set(globalscene.light, 1.0, 1.0, 1.0, 1.0);
290 evas_canvas3d_light_diffuse_set(globalscene.light, 1.0, 1.0, 1.0, 1.0); 290 evas_canvas3d_light_diffuse_set(globalscene.light, 1.0, 1.0, 1.0, 1.0);
291 evas_canvas3d_light_specular_set(globalscene.light, 1.0, 1.0, 1.0, 1.0); 291 evas_canvas3d_light_specular_set(globalscene.light, 1.0, 1.0, 1.0, 1.0);
292 evas_canvas3d_light_directional_set(globalscene.light, EINA_TRUE); 292 evas_canvas3d_light_directional_set(globalscene.light, EINA_TRUE);
293 293
294 globalscene.light_node = 294 globalscene.light_node =
295 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 295 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
296 evas_canvas3d_node_light_set(globalscene.light_node, globalscene.light); 296 evas_canvas3d_node_light_set(globalscene.light_node, globalscene.light);
297 evas_canvas3d_node_position_set(globalscene.light_node, 100.0, 50.0, 300.0); 297 evas_canvas3d_node_position_set(globalscene.light_node, 100.0, 50.0, 300.0);
298 evas_canvas3d_node_look_at_set(globalscene.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 1.0, 1.0, 1.0); 298 evas_canvas3d_node_look_at_set(globalscene.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 1.0, 1.0, 1.0);
@@ -313,7 +313,7 @@ _init_scene(const char *texture)
313 m->material = spheretmp->material; 313 m->material = spheretmp->material;
314 m->texture = spheretmp->texture; 314 m->texture = spheretmp->texture;
315 } 315 }
316 m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 316 m->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
317 m->speed = tmp; 317 m->speed = tmp;
318 m->sphere_animate = _animate_sphere; 318 m->sphere_animate = _animate_sphere;
319 m->animate = ecore_timer_add(m->speed, m->sphere_animate, m); 319 m->animate = ecore_timer_add(m->speed, m->sphere_animate, m);
@@ -381,7 +381,7 @@ int main(int argc, char **argv)
381 globalscene.precision = precision; 381 globalscene.precision = precision;
382 globalscene.scene_init(texture); 382 globalscene.scene_init(texture);
383 383
384 image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); 384 image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas);
385 385
386 efl_gfx_size_set(image, WIDTH, HEIGHT); 386 efl_gfx_size_set(image, WIDTH, HEIGHT);
387 efl_gfx_visible_set(image, EINA_TRUE); 387 efl_gfx_visible_set(image, EINA_TRUE);
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index 6ed1ad5..24dc10a 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -152,10 +152,10 @@ _animate_scene(void *data)
152static void 152static void
153_camera_setup(Scene_Data *data) 153_camera_setup(Scene_Data *data)
154{ 154{
155 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 155 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
156 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); 156 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
157 157
158 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 158 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
159 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 159 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
160 evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0); 160 evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0);
161 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 161 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -166,13 +166,13 @@ _camera_setup(Scene_Data *data)
166static void 166static void
167_light_setup(Scene_Data *data) 167_light_setup(Scene_Data *data)
168{ 168{
169 data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas); 169 data->light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
170 170
171 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0); 171 evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
172 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 172 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
173 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 173 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
174 174
175 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 175 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
176 176
177 evas_canvas3d_node_light_set(data->light_node, data->light); 177 evas_canvas3d_node_light_set(data->light_node, data->light);
178 evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0); 178 evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0);
@@ -185,7 +185,7 @@ static void
185_mesh_setup(Scene_Data *data) 185_mesh_setup(Scene_Data *data)
186{ 186{
187 /* Setup material. */ 187 /* Setup material. */
188 data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 188 data->material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
189 189
190 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 190 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
191 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 191 evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -196,16 +196,16 @@ _mesh_setup(Scene_Data *data)
196 evas_canvas3d_material_shininess_set(data->material, 100.0); 196 evas_canvas3d_material_shininess_set(data->material, 100.0);
197 197
198 /* Setup primitive */ 198 /* Setup primitive */
199 data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas); 199 data->cube = efl_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
200 evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE); 200 evas_canvas3d_primitive_form_set(data->cube, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE);
201 201
202 /* Setup mesh. */ 202 /* Setup mesh. */
203 data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 203 data->mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
204 evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube); 204 evas_canvas3d_mesh_from_primitive_set(data->mesh, 0, data->cube);
205 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 205 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
206 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 206 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
207 207
208 data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 208 data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
209 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 209 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
210 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 210 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
211} 211}
@@ -213,8 +213,8 @@ _mesh_setup(Scene_Data *data)
213static void 213static void
214_scene_setup(Scene_Data *data) 214_scene_setup(Scene_Data *data)
215{ 215{
216 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);