jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=824792f09d8c824d628cde95a1078b712da5db03
commit 824792f09d8c824d628cde95a1078b712da5db03 Author: Jean-Philippe Andre <[email protected]> Date: Wed Nov 1 15:16:30 2017 +0900 elm: Major cleanup of EO files This prevents legacy EO classes from being exposed through .eo.h headers or .eo in share/eolian/includes. Also removes a slew of useless xxx_eo.h intermediate headers. Notes: - elm_systray has no proper API: it's not clear if the EO API should be released (in which case it needs to be renamed to efl_something) and there is no legacy API to create a systray object. - Some files have been placed in a "FIXME" section, as I believe they are necessary within EO land, but at the same time still don't conform to the interfaces (eg. name starts with elm_). - elm_interface_scrollable is required by photocam. This means photocam needs to be adapted to fit the EO scroller API (still to be completed, I believe). Bugs: - This breaks most C++ examples. I KNOW. And I'm working on it. Ref T5301 --- src/Makefile_Elementary.am | 225 ++++++++++----------- src/bin/elementary/test_bg.c | 2 + src/bin/elementary/test_entry.c | 6 +- src/bin/elementary/test_gfx_filters.c | 2 + src/bin/elementary/test_scroller.c | 3 + src/bin/elementary/test_systray.c | 5 + src/bin/elementary/test_win_plug.c | 3 + src/lib/elementary/efl_ui_image_zoomable_pan.eo | 2 - src/lib/elementary/efl_ui_layout.c | 1 + src/lib/elementary/efl_ui_multibuttonentry.c | 2 +- src/lib/elementary/efl_ui_video_eo.h | 1 - src/lib/elementary/elc_combobox.c | 4 + src/lib/elementary/elc_combobox.h | 3 - src/lib/elementary/elc_ctxpopup.c | 2 + src/lib/elementary/elc_ctxpopup.h | 3 - src/lib/elementary/elc_ctxpopup_eo.h | 2 - src/lib/elementary/elc_fileselector.c | 4 + src/lib/elementary/elc_fileselector.h | 3 - src/lib/elementary/elc_fileselector_button.c | 1 + src/lib/elementary/elc_fileselector_entry.c | 2 + src/lib/elementary/elc_fileselector_eo.h | 11 - src/lib/elementary/elc_popup.c | 2 - src/lib/elementary/elc_popup.h | 3 - src/lib/elementary/elc_popup_eo.h | 12 -- src/lib/elementary/elm_calendar.c | 1 + src/lib/elementary/elm_calendar.h | 3 - src/lib/elementary/elm_calendar_eo.h | 1 - src/lib/elementary/elm_clock.h | 3 - src/lib/elementary/elm_color_class.c | 1 + src/lib/elementary/elm_colorselector.c | 1 + src/lib/elementary/elm_colorselector.h | 3 - src/lib/elementary/elm_colorselector_eo.h | 1 - src/lib/elementary/elm_conform.c | 4 + src/lib/elementary/elm_conform.h | 3 - src/lib/elementary/elm_conform_eo.h | 11 - src/lib/elementary/elm_dayselector.h | 3 - src/lib/elementary/elm_dayselector_eo.h | 1 - src/lib/elementary/elm_entry.h | 3 - src/lib/elementary/elm_gengrid.c | 3 + src/lib/elementary/elm_gengrid.h | 3 - src/lib/elementary/elm_gengrid_eo.h | 14 -- src/lib/elementary/elm_genlist.c | 3 + src/lib/elementary/elm_genlist.h | 3 - src/lib/elementary/elm_genlist_eo.h | 14 -- src/lib/elementary/elm_gesture_layer.c | 1 + src/lib/elementary/elm_gesture_layer.h | 3 - src/lib/elementary/elm_gesture_layer_eo.h | 1 - src/lib/elementary/elm_glview.h | 3 - src/lib/elementary/elm_glview_eo.h | 1 - src/lib/elementary/elm_hover.h | 3 - src/lib/elementary/elm_hover_eo.h | 1 - src/lib/elementary/elm_index.h | 3 - src/lib/elementary/elm_index_eo.h | 12 -- src/lib/elementary/elm_interfaces.h | 8 +- src/lib/elementary/elm_label.h | 3 - src/lib/elementary/elm_label_eo.h | 11 - src/lib/elementary/elm_list.h | 3 - src/lib/elementary/elm_list_eo.h | 12 -- src/lib/elementary/elm_main.c | 1 + src/lib/elementary/elm_map.c | 2 + src/lib/elementary/elm_map.h | 3 - src/lib/elementary/elm_map_eo.h | 2 - src/lib/elementary/elm_menu.h | 3 - src/lib/elementary/elm_menu_eo.h | 2 - src/lib/elementary/elm_notify.h | 3 - src/lib/elementary/elm_notify_eo.h | 11 - src/lib/elementary/elm_object_item.h | 3 - src/lib/elementary/elm_panel.h | 3 - src/lib/elementary/elm_panel_eo.h | 1 - src/lib/elementary/elm_plug.h | 3 - src/lib/elementary/elm_plug_eo.h | 1 - src/lib/elementary/elm_route.h | 3 - src/lib/elementary/elm_route_eo.h | 1 - src/lib/elementary/elm_scroller.c | 1 + src/lib/elementary/elm_scroller.h | 3 - src/lib/elementary/elm_scroller_eo.h | 11 - src/lib/elementary/elm_spinner.c | 1 + src/lib/elementary/elm_spinner.h | 2 +- src/lib/elementary/elm_spinner_eo.h | 1 - src/lib/elementary/elm_store.c | 1 + src/lib/elementary/elm_sys_notify.c | 2 + src/lib/elementary/elm_sys_notify.h | 4 - src/lib/elementary/elm_sys_notify_dbus.c | 2 + src/lib/elementary/elm_systray.c | 4 +- src/lib/elementary/elm_systray.h | 7 +- src/lib/elementary/elm_systray_eo.h | 11 - src/lib/elementary/elm_view_form.c | 2 + src/lib/elementary/elm_view_list.c | 2 + src/lib/elementary/elm_widget.c | 1 + src/lib/elementary/elm_widget_clock.h | 2 + src/lib/elementary/elm_widget_colorselector.h | 2 +- src/lib/elementary/elm_widget_dayselector.h | 1 + src/lib/elementary/elm_widget_entry.h | 1 + src/lib/elementary/elm_widget_glview.h | 1 + src/lib/elementary/elm_widget_hover.h | 1 + src/lib/elementary/elm_widget_index.h | 3 + src/lib/elementary/elm_widget_label.h | 2 + src/lib/elementary/elm_widget_list.h | 2 + src/lib/elementary/elm_widget_menu.h | 4 + src/lib/elementary/elm_widget_notify.h | 2 + src/lib/elementary/elm_widget_panel.h | 1 + src/lib/elementary/elm_widget_player.h | 2 + src/lib/elementary/elm_widget_plug.h | 1 + src/lib/elementary/elm_widget_popup.h | 3 + src/lib/elementary/elm_widget_route.h | 2 + .../clock_input_ctxpopup/clock_input_ctxpopup.c | 2 + src/modules/elementary/prefs/elm_entry.c | 1 + src/modules/elementary/prefs/elm_spinner.c | 1 + 108 files changed, 211 insertions(+), 368 deletions(-) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 9cb3aa1d00..56f110194c 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -2,13 +2,112 @@ ### Library elm_public_eolian_files = \ - lib/elementary/elm_atspi_bridge.eo \ - lib/elementary/elm_atspi_app_object.eo \ + lib/elementary/elm_widget.eo \ lib/elementary/efl_ui_bg.eo \ lib/elementary/efl_ui_button.eo \ - lib/elementary/elm_calendar.eo \ lib/elementary/efl_ui_calendar.eo \ lib/elementary/efl_ui_check.eo \ + lib/elementary/efl_ui_flip.eo \ + lib/elementary/efl_ui_frame.eo \ + lib/elementary/efl_ui_image.eo \ + lib/elementary/efl_ui_image_zoomable.eo \ + lib/elementary/efl_ui_layout.eo \ + lib/elementary/efl_ui_multibuttonentry.eo \ + lib/elementary/efl_ui_nstate.eo \ + lib/elementary/efl_ui_panes.eo \ + lib/elementary/efl_ui_progressbar.eo \ + lib/elementary/efl_ui_radio.eo \ + lib/elementary/efl_ui_slider.eo \ + lib/elementary/efl_ui_slider_interval.eo \ + lib/elementary/efl_ui_video.eo \ + lib/elementary/efl_ui_win.eo \ + lib/elementary/efl_ui_win_inlined.eo \ + lib/elementary/efl_ui_win_socket.eo \ + lib/elementary/efl_ui_box.eo \ + lib/elementary/efl_ui_box_flow.eo \ + lib/elementary/efl_ui_box_stack.eo \ + lib/elementary/efl_ui_grid.eo \ + lib/elementary/efl_ui_grid_static.eo \ + lib/elementary/efl_ui_text_interactive.eo \ + lib/elementary/efl_ui_text.eo \ + lib/elementary/efl_ui_text_editable.eo \ + lib/elementary/efl_ui_text_async.eo \ + lib/elementary/efl_ui_textpath.eo \ + lib/elementary/efl_ui_translatable.eo \ + lib/elementary/efl_ui_clock.eo \ + lib/elementary/efl_ui_cursor.eo \ + lib/elementary/efl_ui_image_factory.eo \ + lib/elementary/efl_ui_focus_manager.eo \ + lib/elementary/efl_ui_focus_manager_calc.eo \ + lib/elementary/efl_ui_focus_manager_sub.eo \ + lib/elementary/efl_ui_focus_manager_root_focus.eo \ + lib/elementary/efl_ui_focus_object.eo \ + lib/elementary/efl_ui_focus_user.eo \ + lib/elementary/efl_ui_focus_layer.eo \ + lib/elementary/efl_ui_focus_composition.eo \ + lib/elementary/efl_ui_button_part.eo \ + lib/elementary/efl_ui_flip_part.eo \ + lib/elementary/efl_ui_layout_part.eo \ + lib/elementary/efl_ui_layout_part_box.eo \ + lib/elementary/efl_ui_layout_part_content.eo \ + lib/elementary/efl_ui_layout_part_text.eo \ + lib/elementary/efl_ui_layout_part_table.eo \ + lib/elementary/efl_ui_layout_part_legacy.eo \ + lib/elementary/efl_ui_multibuttonentry_part.eo \ + lib/elementary/efl_ui_panes_part.eo \ + lib/elementary/efl_ui_progressbar_part.eo \ + lib/elementary/efl_ui_textpath_part.eo \ + lib/elementary/efl_ui_widget_part.eo \ + lib/elementary/efl_ui_win_part.eo \ + lib/elementary/efl_access.eo \ + lib/elementary/efl_access_action.eo \ + lib/elementary/efl_access_component.eo \ + lib/elementary/efl_access_editable_text.eo \ + lib/elementary/efl_access_image.eo \ + lib/elementary/efl_access_selection.eo \ + lib/elementary/efl_access_text.eo \ + lib/elementary/efl_access_value.eo \ + lib/elementary/efl_access_window.eo \ + lib/elementary/efl_config_global.eo \ + lib/elementary/elm_code_widget.eo \ + $(NULL) + +# More public files -- FIXME +elm_public_eolian_files += \ + lib/elementary/elm_spinner.eo \ + lib/elementary/elm_multibuttonentry_item.eo \ + lib/elementary/elm_interface_atspi_widget_action.eo \ + lib/elementary/elm_interface_scrollable.eo \ + lib/elementary/elm_atspi_bridge.eo \ + lib/elementary/elm_atspi_app_object.eo \ + lib/elementary/efl_ui_image_zoomable_pan.eo \ + lib/elementary/elm_pan.eo \ + lib/elementary/elm_toolbar.eo \ + lib/elementary/elm_toolbar_item.eo \ + lib/elementary/elm_view_list.eo \ + lib/elementary/elm_view_form.eo \ + lib/elementary/elm_web.eo \ + lib/elementary/elm_widget_item.eo \ + $(NULL) + +# Private classes (not exposed or shipped) +elm_private_eolian_files = \ + lib/elementary/efl_ui_internal_text_interactive.eo \ + lib/elementary/efl_ui_focus_composition_adapter.eo \ + lib/elementary/efl_ui_win_part.eo \ + lib/elementary/efl_ui_focus_rectangle.eo \ + lib/elementary/efl_ui_focus_parent_provider.eo \ + lib/elementary/efl_ui_focus_parent_provider_standard.eo \ + lib/elementary/efl_ui_focus_parent_provider_gen.eo \ + tests/elementary/focus_test.eo \ + tests/elementary/focus_test_sub_main.eo \ + $(NULL) + +# Legacy classes - not part of public EO API +elm_legacy_eolian_files = \ + lib/elementary/elm_interface_fileselector.eo \ + lib/elementary/elm_calendar.eo \ + lib/elementary/elm_calendar_item.eo \ lib/elementary/elm_clock.eo \ lib/elementary/elm_colorselector.eo \ lib/elementary/elm_combobox.eo \ @@ -17,9 +116,6 @@ elm_public_eolian_files = \ lib/elementary/elm_dayselector.eo \ lib/elementary/elm_entry.eo \ lib/elementary/elm_fileselector.eo \ - lib/elementary/efl_ui_flip.eo \ - lib/elementary/efl_ui_flip_part.eo \ - lib/elementary/efl_ui_frame.eo \ lib/elementary/elm_gengrid.eo \ lib/elementary/elm_gengrid_pan.eo \ lib/elementary/elm_genlist.eo \ @@ -27,85 +123,34 @@ elm_public_eolian_files = \ lib/elementary/elm_gesture_layer.eo \ lib/elementary/elm_glview.eo \ lib/elementary/elm_hover.eo \ - lib/elementary/efl_ui_image.eo \ lib/elementary/elm_index.eo \ - lib/elementary/efl_access.eo \ - lib/elementary/efl_access_action.eo \ - lib/elementary/efl_access_component.eo \ - lib/elementary/efl_access_editable_text.eo \ - lib/elementary/efl_access_image.eo \ - lib/elementary/efl_access_selection.eo \ - lib/elementary/efl_access_text.eo \ - lib/elementary/efl_access_value.eo \ - lib/elementary/elm_interface_atspi_widget_action.eo \ - lib/elementary/efl_access_window.eo \ - lib/elementary/elm_interface_fileselector.eo \ - lib/elementary/elm_interface_scrollable.eo \ lib/elementary/elm_label.eo \ - lib/elementary/efl_ui_layout.eo \ lib/elementary/elm_list.eo \ lib/elementary/elm_map.eo \ lib/elementary/elm_map_pan.eo \ lib/elementary/elm_menu.eo \ - lib/elementary/efl_ui_multibuttonentry.eo \ lib/elementary/elm_notify.eo \ - lib/elementary/efl_ui_nstate.eo \ - lib/elementary/elm_pan.eo \ lib/elementary/elm_panel.eo \ - lib/elementary/efl_ui_panes.eo \ - lib/elementary/efl_ui_image_zoomable.eo \ - lib/elementary/efl_ui_image_zoomable_pan.eo \ lib/elementary/elm_player.eo \ lib/elementary/elm_plug.eo \ lib/elementary/elm_popup.eo \ - lib/elementary/efl_ui_progressbar.eo \ - lib/elementary/efl_ui_radio.eo \ lib/elementary/elm_route.eo \ lib/elementary/elm_scroller.eo \ - lib/elementary/efl_ui_slider.eo \ - lib/elementary/efl_ui_slider_interval.eo \ - lib/elementary/elm_spinner.eo \ lib/elementary/elm_sys_notify_interface.eo \ lib/elementary/elm_sys_notify.eo \ lib/elementary/elm_sys_notify_dbus.eo \ lib/elementary/elm_systray.eo \ - lib/elementary/elm_toolbar.eo \ - lib/elementary/efl_ui_video.eo \ - lib/elementary/elm_view_list.eo \ - lib/elementary/elm_view_form.eo \ - lib/elementary/elm_web.eo \ - lib/elementary/elm_widget.eo \ - lib/elementary/efl_ui_widget_part.eo \ - lib/elementary/efl_ui_win.eo \ - lib/elementary/efl_ui_win_inlined.eo \ - lib/elementary/efl_ui_win_socket.eo \ - lib/elementary/elm_widget_item.eo \ lib/elementary/elm_color_item.eo \ lib/elementary/elm_dayselector_item.eo \ lib/elementary/elm_flipselector_item.eo \ lib/elementary/elm_menu_item.eo \ lib/elementary/elm_ctxpopup_item.eo \ lib/elementary/elm_index_item.eo \ - lib/elementary/elm_multibuttonentry_item.eo \ lib/elementary/elm_genlist_item.eo \ lib/elementary/elm_gengrid_item.eo \ lib/elementary/elm_list_item.eo \ - lib/elementary/elm_toolbar_item.eo \ lib/elementary/elm_popup_item.eo \ - lib/elementary/efl_ui_box.eo \ - lib/elementary/efl_ui_box_flow.eo \ - lib/elementary/efl_ui_box_stack.eo \ - lib/elementary/efl_ui_grid.eo \ - lib/elementary/efl_ui_grid_static.eo \ - lib/elementary/efl_ui_layout_part.eo \ - lib/elementary/efl_ui_layout_part_box.eo \ - lib/elementary/efl_ui_layout_part_content.eo \ - lib/elementary/efl_ui_layout_part_text.eo \ - lib/elementary/efl_ui_layout_part_table.eo \ - lib/elementary/efl_ui_layout_part_legacy.eo \ - lib/elementary/efl_ui_button_part.eo \ lib/elementary/elm_ctxpopup_part.eo \ - lib/elementary/efl_ui_panes_part.eo \ lib/elementary/elm_dayselector_part.eo \ lib/elementary/elm_entry_part.eo \ lib/elementary/elm_fileselector_entry_part.eo \ @@ -116,53 +161,12 @@ elm_public_eolian_files = \ lib/elementary/elm_notify_part.eo \ lib/elementary/elm_panel_part.eo \ lib/elementary/elm_player_part.eo \ - lib/elementary/efl_ui_progressbar_part.eo \ lib/elementary/elm_popup_part.eo \ lib/elementary/elm_scroller_part.eo \ lib/elementary/elm_label_part.eo \ lib/elementary/elm_actionslider_part.eo \ lib/elementary/elm_bubble_part.eo \ lib/elementary/elm_fileselector_part.eo \ - lib/elementary/efl_ui_multibuttonentry_part.eo \ - lib/elementary/elm_code_widget.eo \ - lib/elementary/efl_ui_text_interactive.eo \ - lib/elementary/efl_ui_text.eo \ - lib/elementary/efl_ui_text_editable.eo \ - lib/elementary/efl_ui_text_async.eo \ - lib/elementary/efl_config_global.eo \ - lib/elementary/efl_ui_clock.eo \ - lib/elementary/efl_ui_cursor.eo \ - lib/elementary/efl_ui_image_factory.eo \ - lib/elementary/efl_ui_focus_manager.eo \ - lib/elementary/efl_ui_focus_manager_calc.eo \ - lib/elementary/efl_ui_focus_manager_sub.eo \ - lib/elementary/efl_ui_focus_manager_root_focus.eo \ - lib/elementary/efl_ui_focus_object.eo \ - lib/elementary/efl_ui_focus_user.eo \ - lib/elementary/efl_ui_textpath.eo \ - lib/elementary/efl_ui_textpath_part.eo \ - lib/elementary/efl_ui_translatable.eo \ - lib/elementary/efl_ui_win_part.eo \ - lib/elementary/efl_ui_focus_layer.eo \ - lib/elementary/efl_ui_focus_composition.eo \ - $(NULL) - -# Private classes (not exposed or shipped) -elm_private_eolian_files = \ - lib/elementary/efl_ui_internal_text_interactive.eo \ - lib/elementary/efl_ui_focus_composition_adapter.eo \ - lib/elementary/efl_ui_win_part.eo \ - tests/elementary/focus_test.eo \ - tests/elementary/focus_test_sub_main.eo \ - lib/elementary/efl_ui_focus_rectangle.eo \ - lib/elementary/elm_calendar_item.eo \ - lib/elementary/efl_ui_focus_parent_provider.eo \ - lib/elementary/efl_ui_focus_parent_provider_standard.eo \ - lib/elementary/efl_ui_focus_parent_provider_gen.eo \ - $(NULL) - -# Legacy classes - not part of public EO API -elm_legacy_eolian_files = \ lib/elementary/elm_access.eo \ lib/elementary/elm_actionslider.eo \ lib/elementary/elm_box.eo \ @@ -326,12 +330,10 @@ nodist_includesunstable_HEADERS = \ includesub_HEADERS = \ lib/elementary/elc_ctxpopup.h \ - lib/elementary/elc_ctxpopup_eo.h \ lib/elementary/elc_ctxpopup_legacy.h \ lib/elementary/elc_combobox.h \ lib/elementary/elc_combobox_legacy.h \ lib/elementary/elc_fileselector.h \ - lib/elementary/elc_fileselector_eo.h \ lib/elementary/elc_fileselector_legacy.h \ lib/elementary/elc_fileselector_common.h \ lib/elementary/elc_fileselector_button.h \ @@ -348,7 +350,6 @@ includesub_HEADERS = \ lib/elementary/elc_naviframe_legacy.h \ lib/elementary/elc_naviframe_common.h \ lib/elementary/elc_popup.h \ - lib/elementary/elc_popup_eo.h \ lib/elementary/elc_popup_legacy.h \ lib/elementary/elm_access.h \ lib/elementary/elm_actionslider.h \ @@ -369,7 +370,6 @@ includesub_HEADERS = \ lib/elementary/elm_button_legacy.h \ lib/elementary/elm_cache.h \ lib/elementary/elm_calendar.h \ - lib/elementary/elm_calendar_eo.h \ lib/elementary/elm_calendar_legacy.h \ lib/elementary/elm_calendar_common.h \ lib/elementary/efl_ui_calendar.h \ @@ -377,22 +377,18 @@ includesub_HEADERS = \ lib/elementary/efl_ui_check_eo.h \ lib/elementary/elm_check_legacy.h \ lib/elementary/elm_clock.h \ - lib/elementary/elm_clock_eo.h \ lib/elementary/elm_clock_legacy.h \ lib/elementary/elm_cnp.h \ lib/elementary/elm_colorselector.h \ - lib/elementary/elm_colorselector_eo.h \ lib/elementary/elm_colorselector_legacy.h \ lib/elementary/elm_colorselector_common.h \ lib/elementary/elm_color_class.h \ lib/elementary/elm_config.h \ lib/elementary/elm_conform.h \ - lib/elementary/elm_conform_eo.h \ lib/elementary/elm_conform_legacy.h \ lib/elementary/elm_cursor.h \ lib/elementary/elm_datetime.h \ lib/elementary/elm_dayselector.h \ - lib/elementary/elm_dayselector_eo.h \ lib/elementary/elm_dayselector_legacy.h \ lib/elementary/elm_debug.h \ lib/elementary/elm_deprecated.h \ @@ -419,25 +415,20 @@ includesub_HEADERS = \ lib/elementary/elm_general.h \ lib/elementary/elm_gengrid.h \ lib/elementary/elm_gengrid_common.h \ - lib/elementary/elm_gengrid_eo.h \ lib/elementary/elm_gengrid_legacy.h \ lib/elementary/elm_genlist.h \ lib/elementary/elm_genlist_common.h \ - lib/elementary/elm_genlist_eo.h \ lib/elementary/elm_genlist_legacy.h \ lib/elementary/elm_gesture_layer.h \ lib/elementary/elm_gesture_layer_common.h \ - lib/elementary/elm_gesture_layer_eo.h \ lib/elementary/elm_gesture_layer_legacy.h \ lib/elementary/elm_getting_started.h \ lib/elementary/elm_glview.h \ lib/elementary/elm_glview_common.h \ - lib/elementary/elm_glview_eo.h \ lib/elementary/elm_glview_legacy.h \ lib/elementary/elm_grid.h \ lib/elementary/elm_grid_legacy.h \ lib/elementary/elm_hover.h \ - lib/elementary/elm_hover_eo.h \ lib/elementary/elm_hover_legacy.h \ lib/elementary/elm_icon.h \ lib/elementary/elm_icon_legacy.h \ @@ -445,42 +436,35 @@ includesub_HEADERS = \ lib/elementary/elm_image_eo.h \ lib/elementary/elm_image_legacy.h \ lib/elementary/elm_index.h \ - lib/elementary/elm_index_eo.h \ lib/elementary/elm_index_legacy.h \ ${top_builddir}/elm_intro.h \ lib/elementary/elm_inwin.h \ lib/elementary/elm_inwin_legacy.h \ lib/elementary/elm_label.h \ - lib/elementary/elm_label_eo.h \ lib/elementary/elm_label_legacy.h \ lib/elementary/elm_layout.h \ lib/elementary/elm_layout_common.h \ lib/elementary/elm_layout_legacy.h \ lib/elementary/elm_list.h \ - lib/elementary/elm_list_eo.h \ lib/elementary/elm_list_legacy.h \ lib/elementary/elm_macros.h \ lib/elementary/elm_map.h \ lib/elementary/elm_map_common.h \ - lib/elementary/elm_map_eo.h \ lib/elementary/elm_map_legacy.h \ lib/elementary/elm_mapbuf.h \ lib/elementary/elm_mapbuf_legacy.h \ lib/elementary/elm_menu.h \ - lib/elementary/elm_menu_eo.h \ lib/elementary/elm_menu_legacy.h \ lib/elementary/elm_mirroring.h \ lib/elementary/elm_need.h \ lib/elementary/elm_notify.h \ lib/elementary/elm_notify_common.h \ - lib/elementary/elm_notify_eo.h \ lib/elementary/elm_notify_legacy.h \ lib/elementary/efl_ui_nstate.h \ lib/elementary/elm_object.h \ lib/elementary/elm_object_item.h \ lib/elementary/elm_panel.h \ lib/elementary/elm_panel_common.h \ - lib/elementary/elm_panel_eo.h \ lib/elementary/elm_panel_legacy.h \ lib/elementary/elm_panes.h \ lib/elementary/efl_ui_panes_eo.h \ @@ -491,7 +475,6 @@ includesub_HEADERS = \ lib/elementary/efl_ui_image_zoomable_eo.h \ lib/elementary/elm_photocam_legacy.h \ lib/elementary/elm_plug.h \ - lib/elementary/elm_plug_eo.h \ lib/elementary/elm_plug_legacy.h \ lib/elementary/elm_prefs.h \ lib/elementary/elm_prefs_common.h \ @@ -505,12 +488,10 @@ includesub_HEADERS = \ lib/elementary/efl_ui_radio_eo.h \ lib/elementary/elm_radio_legacy.h \ lib/elementary/elm_route.h \ - lib/elementary/elm_route_eo.h \ lib/elementary/elm_route_legacy.h \ lib/elementary/elm_scale.h \ lib/elementary/elm_scroll.h \ lib/elementary/elm_scroller.h \ - lib/elementary/elm_scroller_eo.h \ lib/elementary/elm_scroller_legacy.h \ lib/elementary/elm_segment_control.h \ lib/elementary/elm_segment_control_legacy.h \ @@ -524,11 +505,9 @@ includesub_HEADERS = \ lib/elementary/elm_slideshow_common.h \ lib/elementary/elm_slideshow_legacy.h \ lib/elementary/elm_spinner.h \ - lib/elementary/elm_spinner_eo.h \ lib/elementary/elm_spinner_legacy.h \ lib/elementary/elm_store.h \ lib/elementary/elm_systray.h \ - lib/elementary/elm_systray_eo.h \ lib/elementary/elm_systray_common.h \ lib/elementary/elm_systray_watcher.h \ lib/elementary/elm_sys_notify.h \ diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c index ba64598505..b8fde191dd 100644 --- a/src/bin/elementary/test_bg.c +++ b/src/bin/elementary/test_bg.c @@ -1,7 +1,9 @@ #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif + #include <Elementary.h> +#include "elm_colorselector.eo.h" static void _cb_size_radio_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c index 9b2275f9d8..f07f86bfb6 100644 --- a/src/bin/elementary/test_entry.c +++ b/src/bin/elementary/test_entry.c @@ -1,9 +1,13 @@ #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif -#define EO_BETA_API + #include <Elementary.h> +// FIXME: elm_entry is not part of EO API, the below test cases may be useless +#include "elm_entry.eo.h" +#include "elm_popup.eo.h" + static void my_entry_bt_1(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c index de8eb5deac..ae7ee106b0 100644 --- a/src/bin/elementary/test_gfx_filters.c +++ b/src/bin/elementary/test_gfx_filters.c @@ -1,7 +1,9 @@ #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif + #include <Elementary.h> +#include "elm_colorselector.eo.h" const int default_font_size = 48; diff --git a/src/bin/elementary/test_scroller.c b/src/bin/elementary/test_scroller.c index 45991c4320..ead5bbca34 100644 --- a/src/bin/elementary/test_scroller.c +++ b/src/bin/elementary/test_scroller.c @@ -1,8 +1,11 @@ #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif + #include <Elementary.h> +// FIXME: Some internal APIs are used here... +#include "elm_interface_scrollable.h" #define PSIZE 318 diff --git a/src/bin/elementary/test_systray.c b/src/bin/elementary/test_systray.c index a1ddeb379c..f4ade32c01 100644 --- a/src/bin/elementary/test_systray.c +++ b/src/bin/elementary/test_systray.c @@ -1,8 +1,13 @@ #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif + #include <Elementary.h> +// FIXME: systray has no proper legacy API and clearly isn't ready for prime +// time with EO either. +#include "elm_systray.eo.h" + #define WIDTH 320 #define HEIGHT 160 diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c index c584af90ad..867e5c4003 100644 --- a/src/bin/elementary/test_win_plug.c +++ b/src/bin/elementary/test_win_plug.c @@ -1,7 +1,10 @@ #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif + #include <Elementary.h> +// FIXME: use smart cb +#include "elm_notify.eo.h" #define MAX_TRY 40 diff --git a/src/lib/elementary/efl_ui_image_zoomable_pan.eo b/src/lib/elementary/efl_ui_image_zoomable_pan.eo index ffab6c0393..e448a144bf 100644 --- a/src/lib/elementary/efl_ui_image_zoomable_pan.eo +++ b/src/lib/elementary/efl_ui_image_zoomable_pan.eo @@ -2,8 +2,6 @@ class Efl.Ui.Image_Zoomable_Pan (Elm.Pan) { [[Elementary photocom pan class]] legacy_prefix: elm_photocam_pan; - //eo_prefix: elm_obj_photocam_pan; - //event_prefix: elm_photocam_pan; implements { class.constructor; Efl.Object.destructor; diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 6ae329897c..f61d72b96d 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -10,6 +10,7 @@ #include "elm_priv.h" #include "elm_widget_layout.h" #include "elm_part_helper.h" +#include "elm_entry.eo.h" #define MY_CLASS EFL_UI_LAYOUT_CLASS #define MY_CLASS_PFX efl_ui_layout diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c index b8c23e3489..ee019f4ac8 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.c +++ b/src/lib/elementary/efl_ui_multibuttonentry.c @@ -10,8 +10,8 @@ #include <Elementary.h> #include "elm_priv.h" #include "efl_ui_multibuttonentry_private.h" - #include "efl_ui_multibuttonentry_part.eo.h" +#include "elm_entry.eo.h" #include "elm_part_helper.h" #define MY_CLASS EFL_UI_MULTIBUTTONENTRY_CLASS diff --git a/src/lib/elementary/efl_ui_video_eo.h b/src/lib/elementary/efl_ui_video_eo.h index 3b8e559249..6df8edb474 100644 --- a/src/lib/elementary/efl_ui_video_eo.h +++ b/src/lib/elementary/efl_ui_video_eo.h @@ -1,2 +1 @@ -#include "elm_player.eo.h" #include "efl_ui_video.eo.h" diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index ba39421750..a7b9e5a375 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -10,6 +10,10 @@ #include <Elementary.h> #include "elm_priv.h" #include "elm_widget_combobox.h" +#include "elm_entry.eo.h" +#include "elm_combobox.eo.h" +#include "elm_genlist.eo.h" +#include "elm_hover.eo.h" #define MY_CLASS ELM_COMBOBOX_CLASS diff --git a/src/lib/elementary/elc_combobox.h b/src/lib/elementary/elc_combobox.h index 006280b716..b51cf0aa8c 100644 --- a/src/lib/elementary/elc_combobox.h +++ b/src/lib/elementary/elc_combobox.h @@ -53,9 +53,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elm_combobox.eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elc_combobox_legacy.h" #endif diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index a440163544..c392d8fcc7 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -12,6 +12,8 @@ #include "elm_priv.h" #include "elm_widget_ctxpopup.h" +#include "elm_ctxpopup_item.eo.h" +#include "elm_ctxpopup.eo.h" #include "elm_ctxpopup_part.eo.h" #include "elm_part_helper.h" diff --git a/src/lib/elementary/elc_ctxpopup.h b/src/lib/elementary/elc_ctxpopup.h index 7d05a6882f..6663f7e863 100644 --- a/src/lib/elementary/elc_ctxpopup.h +++ b/src/lib/elementary/elc_ctxpopup.h @@ -63,9 +63,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elc_ctxpopup_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elc_ctxpopup_legacy.h" #endif diff --git a/src/lib/elementary/elc_ctxpopup_eo.h b/src/lib/elementary/elc_ctxpopup_eo.h deleted file mode 100644 index e3ff124d09..0000000000 --- a/src/lib/elementary/elc_ctxpopup_eo.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "elm_ctxpopup_item.eo.h" -#include "elm_ctxpopup.eo.h" diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 5e4e93a9da..a9b8d41879 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -18,6 +18,10 @@ #include "elm_fileselector_entry.eo.h" #include "elm_interface_fileselector.h" #include "elm_widget_fileselector.h" +#include "elm_entry.eo.h" +#include "elm_fileselector.eo.h" +#include "elm_genlist.eo.h" +#include "elm_gengrid.eo.h" #include "elm_fileselector_part.eo.h" #include "elm_part_helper.h" diff --git a/src/lib/elementary/elc_fileselector.h b/src/lib/elementary/elc_fileselector.h index a2c3e19916..32b8b566a0 100644 --- a/src/lib/elementary/elc_fileselector.h +++ b/src/lib/elementary/elc_fileselector.h @@ -69,9 +69,6 @@ */ #include "elc_fileselector_common.h" -#ifdef EFL_EO_API_SUPPORT -#include "elc_fileselector_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elc_fileselector_legacy.h" #endif diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index d26b8429b5..ef4cd0012a 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -10,6 +10,7 @@ #include "elm_fileselector_entry.eo.h" #include "elm_interface_fileselector.h" #include "elm_widget_fileselector_button.h" +#include "elm_fileselector.eo.h" #define MY_CLASS ELM_FILESELECTOR_BUTTON_CLASS diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index f6c6fec54c..d752e49ea1 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -11,6 +11,8 @@ #include "elm_fileselector_entry.eo.h" #include "elm_interface_fileselector.h" #include "elm_widget_fileselector_entry.h" +#include "elm_entry.eo.h" +#include "elm_fileselector.eo.h" #include "elm_fileselector_entry_part.eo.h" #include "elm_part_helper.h" diff --git a/src/lib/elementary/elc_fileselector_eo.h b/src/lib/elementary/elc_fileselector_eo.h deleted file mode 100644 index 68277bca5c..0000000000 --- a/src/lib/elementary/elc_fileselector_eo.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @ingroup Elm_Fileselector - * - * @{ - */ - -#include "elm_fileselector.eo.h" - -/** - * @} - */ diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index fa2a625184..fc4f6a4a08 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -12,8 +12,6 @@ #include "elm_priv.h" #include "elm_widget_popup.h" -#include "elm_popup_item.eo.h" - #include "elm_popup_part.eo.h" #include "elm_part_helper.h" diff --git a/src/lib/elementary/elc_popup.h b/src/lib/elementary/elc_popup.h index b0028181c7..5671369ab8 100644 --- a/src/lib/elementary/elc_popup.h +++ b/src/lib/elementary/elc_popup.h @@ -125,9 +125,6 @@ * @li @ref popup_example_03_c */ -#ifdef EFL_EO_API_SUPPORT -#include "elc_popup_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elc_popup_legacy.h" #endif diff --git a/src/lib/elementary/elc_popup_eo.h b/src/lib/elementary/elc_popup_eo.h deleted file mode 100644 index ae3657bb8e..0000000000 --- a/src/lib/elementary/elc_popup_eo.h +++ /dev/null @@ -1,12 +0,0 @@ -/** - * @ingroup Elm_Popup - * - * @{ - */ - -#include "elm_popup_item.eo.h" -#include "elm_popup.eo.h" - -/** - * @} - */ diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index a96b44db52..5155389c6d 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -9,6 +9,7 @@ #include <Elementary.h> #include "elm_priv.h" #include "elm_widget_calendar.h" +#include "elm_calendar.eo.h" #include "elm_calendar_item.eo.h" #define MY_CLASS ELM_CALENDAR_CLASS diff --git a/src/lib/elementary/elm_calendar.h b/src/lib/elementary/elm_calendar.h index f67daf5ee2..ea95fb7207 100644 --- a/src/lib/elementary/elm_calendar.h +++ b/src/lib/elementary/elm_calendar.h @@ -49,9 +49,6 @@ */ #include "elm_calendar_common.h" -#ifdef EFL_EO_API_SUPPORT -#include "elm_calendar_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_calendar_legacy.h" #endif diff --git a/src/lib/elementary/elm_calendar_eo.h b/src/lib/elementary/elm_calendar_eo.h deleted file mode 100644 index 9d4bf05581..0000000000 --- a/src/lib/elementary/elm_calendar_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_calendar.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_clock.h b/src/lib/elementary/elm_clock.h index 138d39caa7..8d6bff54e7 100644 --- a/src/lib/elementary/elm_clock.h +++ b/src/lib/elementary/elm_clock.h @@ -57,9 +57,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elm_clock_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_clock_legacy.h" #endif diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c index d0102dc69c..54b6f5686c 100644 --- a/src/lib/elementary/elm_color_class.c +++ b/src/lib/elementary/elm_color_class.c @@ -5,6 +5,7 @@ #include <Elementary.h> #include "elm_priv.h" #include "elm_color_class.h" +#include "elm_colorselector.eo.h" //static Eldbus_Proxy *cc_proxy; //static Ecore_Event_Handler *h1; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 933b79f328..710c3378f4 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -10,6 +10,7 @@ #include <Elementary.h> #include "elm_priv.h" #include "elm_widget_colorselector.h" +#include "elm_widget_spinner.h" #define MY_CLASS ELM_COLORSELECTOR_CLASS diff --git a/src/lib/elementary/elm_colorselector.h b/src/lib/elementary/elm_colorselector.h index bc13bc4cf2..e31669069d 100644 --- a/src/lib/elementary/elm_colorselector.h +++ b/src/lib/elementary/elm_colorselector.h @@ -37,9 +37,6 @@ */ #include "elm_colorselector_common.h" -#ifdef EFL_EO_API_SUPPORT -#include "elm_colorselector_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_colorselector_legacy.h" #endif diff --git a/src/lib/elementary/elm_colorselector_eo.h b/src/lib/elementary/elm_colorselector_eo.h deleted file mode 100644 index 0a120da4d0..0000000000 --- a/src/lib/elementary/elm_colorselector_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_colorselector.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index e54bab47da..4e88196bd4 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -10,6 +10,10 @@ #include "elm_priv.h" #include "elm_widget_conform.h" #include "elm_widget_layout.h" +#include "elm_widget_plug.h" +#include "elm_scroller.eo.h" +#include "elm_genlist.eo.h" +#include "elm_conformant.eo.h" #define MY_CLASS ELM_CONFORMANT_CLASS #define MY_CLASS_PFX elm_conformant diff --git a/src/lib/elementary/elm_conform.h b/src/lib/elementary/elm_conform.h index c1c822fca5..0c021b1713 100644 --- a/src/lib/elementary/elm_conform.h +++ b/src/lib/elementary/elm_conform.h @@ -50,9 +50,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elm_conform_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_conform_legacy.h" #endif diff --git a/src/lib/elementary/elm_conform_eo.h b/src/lib/elementary/elm_conform_eo.h deleted file mode 100644 index e711842db7..0000000000 --- a/src/lib/elementary/elm_conform_eo.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @ingroup Elm_Conformant - * - * @{ - */ - -#include "elm_conformant.eo.h" - -/** - * @} - */ diff --git a/src/lib/elementary/elm_dayselector.h b/src/lib/elementary/elm_dayselector.h index 75371fb401..b96967d194 100644 --- a/src/lib/elementary/elm_dayselector.h +++ b/src/lib/elementary/elm_dayselector.h @@ -75,9 +75,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elm_dayselector_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_dayselector_legacy.h" #endif diff --git a/src/lib/elementary/elm_dayselector_eo.h b/src/lib/elementary/elm_dayselector_eo.h deleted file mode 100644 index c049b7b873..0000000000 --- a/src/lib/elementary/elm_dayselector_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_dayselector.eo.h" diff --git a/src/lib/elementary/elm_entry.h b/src/lib/elementary/elm_entry.h index d4b8832d44..861ca6e331 100644 --- a/src/lib/elementary/elm_entry.h +++ b/src/lib/elementary/elm_entry.h @@ -304,9 +304,6 @@ */ #include "elm_entry_common.h" -#ifdef EFL_EO_API_SUPPORT -#include "elm_entry_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_entry_legacy.h" #endif diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index a4ae02ac4c..42ab62b5fb 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -15,6 +15,9 @@ #include "elm_interface_scrollable.h" #include "efl_ui_focus_parent_provider_gen.eo.h" #include "efl_ui_focus_composition_adapter.eo.h" +#include "elm_gengrid_item.eo.h" +#include "elm_gengrid_pan.eo.h" +#include "elm_gengrid.eo.h" #define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS diff --git a/src/lib/elementary/elm_gengrid.h b/src/lib/elementary/elm_gengrid.h index 0f6bc68360..9485b7781e 100644 --- a/src/lib/elementary/elm_gengrid.h +++ b/src/lib/elementary/elm_gengrid.h @@ -276,9 +276,6 @@ */ #include <elm_gengrid_common.h> -#ifdef EFL_EO_API_SUPPORT -#include <elm_gengrid_eo.h> -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include <elm_gengrid_legacy.h> #endif diff --git a/src/lib/elementary/elm_gengrid_eo.h b/src/lib/elementary/elm_gengrid_eo.h deleted file mode 100644 index c319243228..0000000000 --- a/src/lib/elementary/elm_gengrid_eo.h +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @ingroup Elm_Gengrid - * - * @{ - */ - -#include "elm_gengrid_item.eo.h" -#include "elm_gengrid_pan.eo.h" -#include "elm_gengrid.eo.h" - -/** - * @} - */ - diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 19e2a0c02b..8edbe023a8 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -15,6 +15,9 @@ #include "elm_priv.h" #include "elm_widget_genlist.h" #include "elm_interface_scrollable.h" +#include "elm_genlist_item.eo.h" +#include "elm_genlist_pan.eo.h" +#include "elm_genlist.eo.h" #define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS diff --git a/src/lib/elementary/elm_genlist.h b/src/lib/elementary/elm_genlist.h index 8f0cf93d32..7c271267b9 100644 --- a/src/lib/elementary/elm_genlist.h +++ b/src/lib/elementary/elm_genlist.h @@ -398,9 +398,6 @@ */ #include <elm_genlist_common.h> -#ifdef EFL_EO_API_SUPPORT -#include <elm_genlist_eo.h> -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include <elm_genlist_legacy.h> #endif diff --git a/src/lib/elementary/elm_genlist_eo.h b/src/lib/elementary/elm_genlist_eo.h deleted file mode 100644 index 1eab46374a..0000000000 --- a/src/lib/elementary/elm_genlist_eo.h +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @ingroup Elm_Genlist - * - * @{ - */ - -#include "elm_genlist_item.eo.h" -#include "elm_genlist_pan.eo.h" -#include "elm_genlist.eo.h" - -/** - * @} - */ - diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c index 92c561ab7a..ef286049b8 100644 --- a/src/lib/elementary/elm_gesture_layer.c +++ b/src/lib/elementary/elm_gesture_layer.c @@ -4,6 +4,7 @@ #include <Elementary.h> #include "elm_priv.h" +#include "elm_gesture_layer.eo.h" #define MY_CLASS ELM_GESTURE_LAYER_CLASS diff --git a/src/lib/elementary/elm_gesture_layer.h b/src/lib/elementary/elm_gesture_layer.h index adf7dc09a9..5987f89765 100644 --- a/src/lib/elementary/elm_gesture_layer.h +++ b/src/lib/elementary/elm_gesture_layer.h @@ -68,9 +68,6 @@ */ #include "elm_gesture_layer_common.h" -#ifdef EFL_EO_API_SUPPORT -#include "elm_gesture_layer_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_gesture_layer_legacy.h" #endif diff --git a/src/lib/elementary/elm_gesture_layer_eo.h b/src/lib/elementary/elm_gesture_layer_eo.h deleted file mode 100644 index b043033d2a..0000000000 --- a/src/lib/elementary/elm_gesture_layer_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_gesture_layer.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_glview.h b/src/lib/elementary/elm_glview.h index d1c6672d3b..5829354760 100644 --- a/src/lib/elementary/elm_glview.h +++ b/src/lib/elementary/elm_glview.h @@ -27,9 +27,6 @@ */ #include "elm_glview_common.h" -#ifdef EFL_EO_API_SUPPORT -#include "elm_glview_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_glview_legacy.h" #endif diff --git a/src/lib/elementary/elm_glview_eo.h b/src/lib/elementary/elm_glview_eo.h deleted file mode 100644 index c2bc9d848a..0000000000 --- a/src/lib/elementary/elm_glview_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_glview.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_hover.h b/src/lib/elementary/elm_hover.h index 7e4f3f3ea0..342b3e3ba6 100644 --- a/src/lib/elementary/elm_hover.h +++ b/src/lib/elementary/elm_hover.h @@ -80,9 +80,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elm_hover_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_hover_legacy.h" #endif diff --git a/src/lib/elementary/elm_hover_eo.h b/src/lib/elementary/elm_hover_eo.h deleted file mode 100644 index 59fef4be2b..0000000000 --- a/src/lib/elementary/elm_hover_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_hover.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_index.h b/src/lib/elementary/elm_index.h index 4b124eab6c..6ede67b8d5 100644 --- a/src/lib/elementary/elm_index.h +++ b/src/lib/elementary/elm_index.h @@ -59,9 +59,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include <elm_index_eo.h> -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include <elm_index_legacy.h> #endif diff --git a/src/lib/elementary/elm_index_eo.h b/src/lib/elementary/elm_index_eo.h deleted file mode 100644 index 9ca64187f8..0000000000 --- a/src/lib/elementary/elm_index_eo.h +++ /dev/null @@ -1,12 +0,0 @@ -/** - * @ingroup Elm_Index - * - * @{ - */ - -#include "elm_index_item.eo.h" -#include "elm_index.eo.h" - -/** - * @} - */ diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h index b2025b30a2..e746e1ded6 100644 --- a/src/lib/elementary/elm_interfaces.h +++ b/src/lib/elementary/elm_interfaces.h @@ -3,9 +3,13 @@ #include "elm_interface_atspi_widget_action.h" #include "efl_access_window.h" +// FIXME FIXME FIXME -- Still required because of photocam #ifdef EFL_EO_API_SUPPORT -#include "elm_interface_scrollable.h" +# include "elm_interface_scrollable.h" +#endif + #ifdef EFL_BETA_API_SUPPORT +#ifdef EFL_EO_API_SUPPORT #include "efl_access_action.eo.h" #include "efl_access_component.eo.h" #include "efl_access_editable_text.eo.h" @@ -13,9 +17,7 @@ #include "efl_access_selection.eo.h" #include "efl_access_value.eo.h" #endif -#endif #ifndef EFL_NOLEGACY_API_SUPPORT -#ifdef EFL_BETA_API_SUPPORT #include "efl_access_action.eo.legacy.h" #include "efl_access_component.eo.legacy.h" #include "efl_access_editable_text.eo.legacy.h" diff --git a/src/lib/elementary/elm_label.h b/src/lib/elementary/elm_label.h index 83e497f156..13b52124dc 100644 --- a/src/lib/elementary/elm_label.h +++ b/src/lib/elementary/elm_label.h @@ -39,9 +39,6 @@ * See @ref tutorial_label for a demonstration of how to use a label widget. * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elm_label_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_label_legacy.h" #endif diff --git a/src/lib/elementary/elm_label_eo.h b/src/lib/elementary/elm_label_eo.h deleted file mode 100644 index 266675820c..0000000000 --- a/src/lib/elementary/elm_label_eo.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @ingroup Elm_Label - * - * @{ - */ - -#include "elm_label.eo.h" - -/** - * @} - */ diff --git a/src/lib/elementary/elm_list.h b/src/lib/elementary/elm_list.h index b9e90007bd..72f5a1084f 100644 --- a/src/lib/elementary/elm_list.h +++ b/src/lib/elementary/elm_list.h @@ -96,9 +96,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include <elm_list_eo.h> -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include <elm_list_legacy.h> #endif diff --git a/src/lib/elementary/elm_list_eo.h b/src/lib/elementary/elm_list_eo.h deleted file mode 100644 index d243e2b60f..0000000000 --- a/src/lib/elementary/elm_list_eo.h +++ /dev/null @@ -1,12 +0,0 @@ -/** - * @ingroup Elm_List - * - * @{ - */ - -#include "elm_list_item.eo.h" -#include "elm_list.eo.h" - -/** - * @} - */ diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index faf2ecaee1..cb96aa5b50 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -19,6 +19,7 @@ #include <Elementary.h> #include "elm_priv.h" #include "ecore_internal.h" +#include "elm_interface_scrollable.h" #define SEMI_BROKEN_QUICKLAUNCH 1 diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index bf01cc4991..5093e9db0e 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -10,6 +10,8 @@ #include "elm_priv.h" #include "elm_widget_map.h" #include "elm_interface_scrollable.h" +#include "elm_map_pan.eo.h" +#include "elm_map.eo.h" #define MY_PAN_CLASS ELM_MAP_PAN_CLASS diff --git a/src/lib/elementary/elm_map.h b/src/lib/elementary/elm_map.h index f1b24b4cb4..bf257309ef 100644 --- a/src/lib/elementary/elm_map.h +++ b/src/lib/elementary/elm_map.h @@ -71,9 +71,6 @@ */ #include "elm_map_common.h" -#ifdef EFL_EO_API_SUPPORT -#include "elm_map_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_map_legacy.h" #endif diff --git a/src/lib/elementary/elm_map_eo.h b/src/lib/elementary/elm_map_eo.h deleted file mode 100644 index db537555e6..0000000000 --- a/src/lib/elementary/elm_map_eo.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "elm_map_pan.eo.h" -#include "elm_map.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_menu.h b/src/lib/elementary/elm_menu.h index 1afb076329..bd4a5a35d3 100644 --- a/src/lib/elementary/elm_menu.h +++ b/src/lib/elementary/elm_menu.h @@ -38,9 +38,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elm_menu_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_menu_legacy.h" #endif diff --git a/src/lib/elementary/elm_menu_eo.h b/src/lib/elementary/elm_menu_eo.h deleted file mode 100644 index 72aebb339a..0000000000 --- a/src/lib/elementary/elm_menu_eo.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "elm_menu_item.eo.h" -#include "elm_menu.eo.h" diff --git a/src/lib/elementary/elm_notify.h b/src/lib/elementary/elm_notify.h index 0d4e5da2da..88a2c5cfd3 100644 --- a/src/lib/elementary/elm_notify.h +++ b/src/lib/elementary/elm_notify.h @@ -33,9 +33,6 @@ */ #include <elm_notify_common.h> -#ifdef EFL_EO_API_SUPPORT -#include <elm_notify_eo.h> -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include <elm_notify_legacy.h> #endif diff --git a/src/lib/elementary/elm_notify_eo.h b/src/lib/elementary/elm_notify_eo.h deleted file mode 100644 index e1382c3bf9..0000000000 --- a/src/lib/elementary/elm_notify_eo.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @ingroup Elm_Notify - * - * @{ - */ - -#include "elm_notify.eo.h" - -/** - * @} - */ diff --git a/src/lib/elementary/elm_object_item.h b/src/lib/elementary/elm_object_item.h index 095c77af32..0bda61e1b5 100644 --- a/src/lib/elementary/elm_object_item.h +++ b/src/lib/elementary/elm_object_item.h @@ -21,9 +21,6 @@ typedef Eo Elm_Object_Item; */ typedef void (*Elm_Object_Item_Signal_Cb)(void *data, Elm_Object_Item *it, const char *emission, const char *source); -#ifdef EFL_EO_API_SUPPORT -#include "elm_widget_item.eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_widget_item.eo.legacy.h" #endif diff --git a/src/lib/elementary/elm_panel.h b/src/lib/elementary/elm_panel.h index 9dde7785f4..c94d9fc584 100644 --- a/src/lib/elementary/elm_panel.h +++ b/src/lib/elementary/elm_panel.h @@ -38,9 +38,6 @@ */ #include "elm_panel_common.h" -#ifdef EFL_EO_API_SUPPORT -#include "elm_panel_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_panel_legacy.h" #endif diff --git a/src/lib/elementary/elm_panel_eo.h b/src/lib/elementary/elm_panel_eo.h deleted file mode 100644 index 25846a3f51..0000000000 --- a/src/lib/elementary/elm_panel_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_panel.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_plug.h b/src/lib/elementary/elm_plug.h index 17ba2962f9..88ff450217 100644 --- a/src/lib/elementary/elm_plug.h +++ b/src/lib/elementary/elm_plug.h @@ -31,9 +31,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elm_plug_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_plug_legacy.h" #endif diff --git a/src/lib/elementary/elm_plug_eo.h b/src/lib/elementary/elm_plug_eo.h deleted file mode 100644 index 4230de1d9d..0000000000 --- a/src/lib/elementary/elm_plug_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_plug.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_route.h b/src/lib/elementary/elm_route.h index 74a4cb092e..858ab69c63 100644 --- a/src/lib/elementary/elm_route.h +++ b/src/lib/elementary/elm_route.h @@ -10,9 +10,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include "elm_route_eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_route_legacy.h" #endif diff --git a/src/lib/elementary/elm_route_eo.h b/src/lib/elementary/elm_route_eo.h deleted file mode 100644 index b722adbfea..0000000000 --- a/src/lib/elementary/elm_route_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_route.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index b365e78101..9fe6f14565 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -12,6 +12,7 @@ #include "elm_widget_layout.h" #include "elm_widget_scroller.h" +#include "elm_scroller.eo.h" #include "elm_scroller_part.eo.h" #include "elm_part_helper.h" diff --git a/src/lib/elementary/elm_scroller.h b/src/lib/elementary/elm_scroller.h index fb1569695f..b12de04b6c 100644 --- a/src/lib/elementary/elm_scroller.h +++ b/src/lib/elementary/elm_scroller.h @@ -64,9 +64,6 @@ * @{ */ -#ifdef EFL_EO_API_SUPPORT -#include <elm_scroller_eo.h> -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include <elm_scroller_legacy.h> #endif diff --git a/src/lib/elementary/elm_scroller_eo.h b/src/lib/elementary/elm_scroller_eo.h deleted file mode 100644 index fde88dfd97..0000000000 --- a/src/lib/elementary/elm_scroller_eo.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @ingroup Elm_Scroller - * - * @{ - */ - -#include "elm_scroller.eo.h" - -/** - * @} - */ diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 69f8244cda..ac41e98a6f 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -12,6 +12,7 @@ #include "elm_priv.h" #include "elm_widget_spinner.h" +#include "elm_entry.eo.h" #include "Eo.h" diff --git a/src/lib/elementary/elm_spinner.h b/src/lib/elementary/elm_spinner.h index 6da9976379..16c040a3e7 100644 --- a/src/lib/elementary/elm_spinner.h +++ b/src/lib/elementary/elm_spinner.h @@ -58,7 +58,7 @@ */ #ifdef EFL_EO_API_SUPPORT -#include "elm_spinner_eo.h" +#include "elm_spinner.eo.h" #endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_spinner_legacy.h" diff --git a/src/lib/elementary/elm_spinner_eo.h b/src/lib/elementary/elm_spinner_eo.h deleted file mode 100644 index 8c6d57dfd5..0000000000 --- a/src/lib/elementary/elm_spinner_eo.h +++ /dev/null @@ -1 +0,0 @@ -#include "elm_spinner.eo.h" \ No newline at end of file diff --git a/src/lib/elementary/elm_store.c b/src/lib/elementary/elm_store.c index ec27b8905e..59ab8aa03d 100644 --- a/src/lib/elementary/elm_store.c +++ b/src/lib/elementary/elm_store.c @@ -6,6 +6,7 @@ #include <Elementary_Cursor.h> #include "elm_priv.h" +#include "elm_genlist.eo.h" typedef struct _Elm_Store_Filesystem Elm_Store_Filesystem; typedef struct _Elm_Store_Item_Filesystem Elm_Store_Item_Filesystem; diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c index c7a2dcbd06..4d1db56af8 100644 --- a/src/lib/elementary/elm_sys_notify.c +++ b/src/lib/elementary/elm_sys_notify.c @@ -6,6 +6,8 @@ #include "elm_priv.h" +#include "elm_sys_notify_interface.eo.h" +#include "elm_sys_notify.eo.h" #include "elm_sys_notify_dbus.eo.h" #include "elm_sys_notify_dbus.eo.legacy.h" diff --git a/src/lib/elementary/elm_sys_notify.h b/src/lib/elementary/elm_sys_notify.h index 30f5c9bb16..429ae92f9f 100644 --- a/src/lib/elementary/elm_sys_notify.h +++ b/src/lib/elementary/elm_sys_notify.h @@ -3,10 +3,6 @@ typedef void (*Elm_Sys_Notify_Send_Cb)(void *data, unsigned int id); -#ifdef EFL_EO_API_SUPPORT -#include "elm_sys_notify_interface.eo.h" -#include "elm_sys_notify.eo.h" -#endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_sys_notify_interface.eo.legacy.h" #include "elm_sys_notify.eo.legacy.h" diff --git a/src/lib/elementary/elm_sys_notify_dbus.c b/src/lib/elementary/elm_sys_notify_dbus.c index 0fa412aef7..e2784cd0c7 100644 --- a/src/lib/elementary/elm_sys_notify_dbus.c +++ b/src/lib/elementary/elm_sys_notify_dbus.c @@ -6,6 +6,8 @@ #include "elm_priv.h" +#include "elm_sys_notify_interface.eo.h" +#include "elm_sys_notify.eo.h" #include "elm_sys_notify_dbus.eo.h" #include "elm_sys_notify_dbus.eo.legacy.h" diff --git a/src/lib/elementary/elm_systray.c b/src/lib/elementary/elm_systray.c index d8158241c1..fadd7a29f0 100644 --- a/src/lib/elementary/elm_systray.c +++ b/src/lib/elementary/elm_systray.c @@ -5,9 +5,7 @@ #include <Elementary.h> #include "elm_priv.h" - -#include "Eo.h" - +#include "elm_systray.eo.h" #include "elm_systray_watcher.h" EAPI int ELM_EVENT_SYSTRAY_READY = 0; diff --git a/src/lib/elementary/elm_systray.h b/src/lib/elementary/elm_systray.h index 5c149d3580..0e1953b472 100644 --- a/src/lib/elementary/elm_systray.h +++ b/src/lib/elementary/elm_systray.h @@ -1,4 +1,7 @@ #include "elm_systray_common.h" -#ifdef EFL_EO_API_SUPPORT -#include "elm_systray_eo.h" + +#ifdef EFL_BETA_API_SUPPORT +# ifndef EFL_NOLEGACY_API_SUPPORT +# include "elm_systray.eo.legacy.h" +# endif #endif diff --git a/src/lib/elementary/elm_systray_eo.h b/src/lib/elementary/elm_systray_eo.h deleted file mode 100644 index 5e124f3955..0000000000 --- a/src/lib/elementary/elm_systray_eo.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @ingroup Systray - * - * @{ - */ - -#include "elm_systray.eo.h" - -/** - * @} - */ diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c index 3e8a710939..3055339659 100644 --- a/src/lib/elementary/elm_view_form.c +++ b/src/lib/elementary/elm_view_form.c @@ -9,7 +9,9 @@ #include "elm_view_list.h" #include "elm_priv.h" +#include "elm_entry.eo.h" #include "elm_thumb.eo.h" +#include "elm_label.eo.h" #include <assert.h> diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c index b0069dc628..fdcf8baa07 100644 --- a/src/lib/elementary/elm_view_list.c +++ b/src/lib/elementary/elm_view_list.c @@ -6,6 +6,8 @@ #include <Elementary.h> #include "elm_priv.h" +#include "elm_genlist.eo.h" + #include <assert.h> #define MY_CLASS ELM_VIEW_LIST_CLASS diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index c7af125ba0..421ccf6060 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -16,6 +16,7 @@ #include "elm_widget_container.h" #include "elm_interface_scrollable.h" #include "elm_part_helper.h" +#include "elm_combobox.eo.h" /* FIXME: remove this when we don't rely on evas event structs anymore */ #define EFL_INTERNAL_UNSTABLE diff --git a/src/lib/elementary/elm_widget_clock.h b/src/lib/elementary/elm_widget_clock.h index 3ca5c0e9e7..4aec62d3c7 100644 --- a/src/lib/elementary/elm_widget_clock.h +++ b/src/lib/elementary/elm_widget_clock.h @@ -5,6 +5,8 @@ #include <Eio.h> +#include "elm_clock.eo.h" + /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK diff --git a/src/lib/elementary/elm_widget_colorselector.h b/src/lib/elementary/elm_widget_colorselector.h index a6bd8d38d6..d92d95c50d 100644 --- a/src/lib/elementary/elm_widget_colorselector.h +++ b/src/lib/elementary/elm_widget_colorselector.h @@ -3,7 +3,7 @@ #include "Elementary.h" #include "elm_color_item.eo.h" - +#include "elm_colorselector.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elementary/elm_widget_dayselector.h b/src/lib/elementary/elm_widget_dayselector.h index 544a162244..9dd8784b26 100644 --- a/src/lib/elementary/elm_widget_dayselector.h +++ b/src/lib/elementary/elm_widget_dayselector.h @@ -3,6 +3,7 @@ #include "Elementary.h" #include "elm_dayselector_item.eo.h" +#include "elm_dayselector.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR diff --git a/src/lib/elementary/elm_widget_entry.h b/src/lib/elementary/elm_widget_entry.h index 2ef453928f..896bd99883 100644 --- a/src/lib/elementary/elm_widget_entry.h +++ b/src/lib/elementary/elm_widget_entry.h @@ -3,6 +3,7 @@ #include "elm_interface_scrollable.h" #include "elm_widget_layout.h" +#include "elm_entry.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elementary/elm_widget_glview.h b/src/lib/elementary/elm_widget_glview.h index 3ad104f616..cee7603990 100644 --- a/src/lib/elementary/elm_widget_glview.h +++ b/src/lib/elementary/elm_widget_glview.h @@ -2,6 +2,7 @@ #define ELM_WIDGET_GLVIEW_H #include "Elementary.h" +#include "elm_glview.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elementary/elm_widget_hover.h b/src/lib/elementary/elm_widget_hover.h index 05b531c371..41bc3151ef 100644 --- a/src/lib/elementary/elm_widget_hover.h +++ b/src/lib/elementary/elm_widget_hover.h @@ -3,6 +3,7 @@ #include "Elementary.h" #include "elm_widget_layout.h" +#include "elm_hover.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elementary/elm_widget_index.h b/src/lib/elementary/elm_widget_index.h index af6cf3717c..1b6c1a3d8d 100644 --- a/src/lib/elementary/elm_widget_index.h +++ b/src/lib/elementary/elm_widget_index.h @@ -3,6 +3,9 @@ #include "Elementary.h" +#include "elm_index_item.eo.h" +#include "elm_index.eo.h" + /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK diff --git a/src/lib/elementary/elm_widget_label.h b/src/lib/elementary/elm_widget_label.h index e9927f57a5..1cbc99cf45 100644 --- a/src/lib/elementary/elm_widget_label.h +++ b/src/lib/elementary/elm_widget_label.h @@ -5,6 +5,8 @@ #include <Eio.h> +#include "elm_label.eo.h" + /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK diff --git a/src/lib/elementary/elm_widget_list.h b/src/lib/elementary/elm_widget_list.h index aeba701d57..fc98f142e7 100644 --- a/src/lib/elementary/elm_widget_list.h +++ b/src/lib/elementary/elm_widget_list.h @@ -3,6 +3,8 @@ #include "elm_interface_scrollable.h" #include "elm_widget_layout.h" +#include "elm_list.eo.h" +#include "elm_list_item.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elementary/elm_widget_menu.h b/src/lib/elementary/elm_widget_menu.h index bcd1cea21b..0403a67480 100644 --- a/src/lib/elementary/elm_widget_menu.h +++ b/src/lib/elementary/elm_widget_menu.h @@ -3,6 +3,10 @@ #include "Elementary.h" +#include "elm_menu.eo.h" +#include "elm_menu_item.eo.h" +#include "elm_hover.eo.h" + /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK diff --git a/src/lib/elementary/elm_widget_notify.h b/src/lib/elementary/elm_widget_notify.h index 6d570a5748..71ffd184d4 100644 --- a/src/lib/elementary/elm_widget_notify.h +++ b/src/lib/elementary/elm_widget_notify.h @@ -3,6 +3,8 @@ #include "Elementary.h" +#include <elm_notify.eo.h> + /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK diff --git a/src/lib/elementary/elm_widget_panel.h b/src/lib/elementary/elm_widget_panel.h index a558335e0f..16847480a6 100644 --- a/src/lib/elementary/elm_widget_panel.h +++ b/src/lib/elementary/elm_widget_panel.h @@ -3,6 +3,7 @@ #include "elm_interface_scrollable.h" #include "elm_widget_layout.h" +#include "elm_panel.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elementary/elm_widget_player.h b/src/lib/elementary/elm_widget_player.h index 6f2ab427e4..ea540684ee 100644 --- a/src/lib/elementary/elm_widget_player.h +++ b/src/lib/elementary/elm_widget_player.h @@ -3,6 +3,8 @@ #include "Elementary.h" +#include "elm_player.eo.h" + /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK diff --git a/src/lib/elementary/elm_widget_plug.h b/src/lib/elementary/elm_widget_plug.h index 4ab72ef4ff..bc5e6da5cf 100644 --- a/src/lib/elementary/elm_widget_plug.h +++ b/src/lib/elementary/elm_widget_plug.h @@ -2,6 +2,7 @@ #define ELM_WIDGET_PLUG_H #include "Elementary.h" +#include "elm_plug.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elementary/elm_widget_popup.h b/src/lib/elementary/elm_widget_popup.h index f11c268531..330b074d29 100644 --- a/src/lib/elementary/elm_widget_popup.h +++ b/src/lib/elementary/elm_widget_popup.h @@ -3,6 +3,9 @@ #include "Elementary.h" #include "elm_widget_layout.h" +#include "elm_notify.eo.h" +#include "elm_popup_item.eo.h" +#include "elm_popup.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elementary/elm_widget_route.h b/src/lib/elementary/elm_widget_route.h index 6eaf39c1e6..f8e099f17a 100644 --- a/src/lib/elementary/elm_widget_route.h +++ b/src/lib/elementary/elm_widget_route.h @@ -1,6 +1,8 @@ #ifndef ELM_WIDGET_ROUTE_H #define ELM_WIDGET_ROUTE_H +#include "elm_route.eo.h" + /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK diff --git a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c index d6ef8f2b30..dcb8bf7293 100644 --- a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c +++ b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c @@ -5,6 +5,8 @@ #include <Elementary.h> #include "elm_widget.h" #include "efl_ui_clock_private.h" +#include "elm_ctxpopup_item.eo.h" +#include "elm_ctxpopup.eo.h" #include "elm_module_helper.h" #define CLOCK_FIELD_COUNT 8 diff --git a/src/modules/elementary/prefs/elm_entry.c b/src/modules/elementary/prefs/elm_entry.c index e87fe33e73..02030b7ab6 100644 --- a/src/modules/elementary/prefs/elm_entry.c +++ b/src/modules/elementary/prefs/elm_entry.c @@ -2,6 +2,7 @@ #include "elm_widget.h" #include <sys/types.h> #include <regex.h> +#include "elm_entry.eo.h" #define BLINK_INTERVAL 0.1 diff --git a/src/modules/elementary/prefs/elm_spinner.c b/src/modules/elementary/prefs/elm_spinner.c index c88769ea0f..6b169fca69 100644 --- a/src/modules/elementary/prefs/elm_spinner.c +++ b/src/modules/elementary/prefs/elm_spinner.c @@ -1,4 +1,5 @@ #include "private.h" +#include "elm_spinner.eo.h" static Elm_Prefs_Item_Type supported_types[] = { --
