kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm: Remove some eo files from installation 

These are some of the EO files that shouldn't be part of the public
EO API:
- elm_access (old)
- actionslider
- bubble
- diskselector
- flipselector (a fancy spinner)
- hoversel (use combobox instead)
- icon (use image instead)
- inwin
- naviframe (unreplaced for now)
- photo (use image)
- prefs
- segment control
- separator
- slideshow
- thumb (use image)

Note: This breaks the use of the elm_widget_xxx.h headers. Those
      were internal headers anyway. Exposed because of a lack of
      a proper inheritance API.
This commit is contained in:
Jean-Philippe Andre 2016-10-18 19:34:12 +09:00
parent 40fec5f608
commit d4929e58fc
39 changed files with 51 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/Makefile_Elementary.am
View File

@ -2,12 +2,9 @@
### Library
elm_public_eolian_files = \
lib/elementary/elm_access.eo \
lib/elementary/elm_actionslider.eo \
lib/elementary/elm_atspi_bridge.eo \
lib/elementary/elm_atspi_app_object.eo \
lib/elementary/elm_bg.eo \
lib/elementary/elm_bubble.eo \
lib/elementary/elm_button.eo \
lib/elementary/elm_calendar.eo \
lib/elementary/elm_check.eo \
@ -18,14 +15,10 @@ elm_public_eolian_files = \
lib/elementary/elm_ctxpopup.eo \
lib/elementary/elm_datetime.eo \
lib/elementary/elm_dayselector.eo \
lib/elementary/elm_diskselector.eo \
lib/elementary/elm_entry.eo \
lib/elementary/elm_fileselector.eo \
lib/elementary/elm_fileselector_button.eo \
lib/elementary/elm_fileselector_entry.eo \
lib/elementary/efl_ui_flip.eo \
lib/elementary/efl_ui_flip_internal_part.eo \
lib/elementary/elm_flipselector.eo \
lib/elementary/efl_ui_frame.eo \
lib/elementary/elm_gengrid.eo \
lib/elementary/elm_gengrid_pan.eo \
@ -34,8 +27,6 @@ elm_public_eolian_files = \
lib/elementary/elm_gesture_layer.eo \
lib/elementary/elm_glview.eo \
lib/elementary/elm_hover.eo \
lib/elementary/elm_hoversel.eo \
lib/elementary/elm_icon.eo \
lib/elementary/efl_ui_image.eo \
lib/elementary/elm_index.eo \
lib/elementary/elm_interface_atspi_accessible.eo \
@ -50,7 +41,6 @@ elm_public_eolian_files = \
lib/elementary/elm_interface_atspi_window.eo \
lib/elementary/elm_interface_fileselector.eo \
lib/elementary/elm_interface_scrollable.eo \
lib/elementary/elm_inwin.eo \
lib/elementary/elm_label.eo \
lib/elementary/elm_layout.eo \
lib/elementary/elm_list.eo \
@ -58,33 +48,26 @@ elm_public_eolian_files = \
lib/elementary/elm_map_pan.eo \
lib/elementary/elm_menu.eo \
lib/elementary/elm_multibuttonentry.eo \
lib/elementary/elm_naviframe.eo \
lib/elementary/elm_notify.eo \
lib/elementary/efl_ui_nstate.eo \
lib/elementary/elm_pan.eo \
lib/elementary/elm_panel.eo \
lib/elementary/elm_panes.eo \
lib/elementary/elm_photo.eo \
lib/elementary/elm_photocam.eo \
lib/elementary/elm_photocam_pan.eo \
lib/elementary/elm_player.eo \
lib/elementary/elm_plug.eo \
lib/elementary/elm_popup.eo \
lib/elementary/elm_prefs.eo \
lib/elementary/elm_progressbar.eo \
lib/elementary/elm_radio.eo \
lib/elementary/elm_route.eo \
lib/elementary/elm_scroller.eo \
lib/elementary/elm_segment_control.eo \
lib/elementary/elm_separator.eo \
lib/elementary/elm_slider.eo \
lib/elementary/elm_slideshow.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_thumb.eo \
lib/elementary/elm_toolbar.eo \
lib/elementary/efl_ui_video.eo \
lib/elementary/elm_view_list.eo \
@ -96,20 +79,15 @@ elm_public_eolian_files = \
lib/elementary/elm_widget_item.eo \
lib/elementary/elm_color_item.eo \
lib/elementary/elm_dayselector_item.eo \
lib/elementary/elm_hoversel_item.eo \
lib/elementary/elm_segment_control_item.eo \
lib/elementary/elm_slideshow_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_naviframe_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_diskselector_item.eo \
lib/elementary/elm_popup_item.eo \
lib/elementary/efl_ui_box.eo \
lib/elementary/efl_ui_box_flow.eo \
@ -147,10 +125,32 @@ elm_private_eolian_files = \
# 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 \
lib/elementary/elm_bubble.eo \
lib/elementary/elm_diskselector.eo \
lib/elementary/elm_diskselector_item.eo \
lib/elementary/elm_fileselector_button.eo \
lib/elementary/elm_fileselector_entry.eo \
lib/elementary/elm_flipselector.eo \
lib/elementary/elm_grid.eo \
lib/elementary/elm_table.eo \
lib/elementary/elm_hoversel.eo \
lib/elementary/elm_hoversel_item.eo \
lib/elementary/elm_icon.eo \
lib/elementary/elm_inwin.eo \
lib/elementary/elm_mapbuf.eo \
lib/elementary/elm_naviframe.eo \
lib/elementary/elm_naviframe_item.eo \
lib/elementary/elm_photo.eo \
lib/elementary/elm_prefs.eo \
lib/elementary/elm_segment_control.eo \
lib/elementary/elm_segment_control_item.eo \
lib/elementary/elm_separator.eo \
lib/elementary/elm_slideshow.eo \
lib/elementary/elm_slideshow_item.eo \
lib/elementary/elm_table.eo \
lib/elementary/elm_thumb.eo \
$(NULL)
elm_eolian_type_files = \
@ -298,14 +298,12 @@ includesub_HEADERS = \
lib/elementary/elc_fileselector_entry_eo.h \
lib/elementary/elc_fileselector_entry_legacy.h \
lib/elementary/elc_hoversel.h \
lib/elementary/elc_hoversel_eo.h \
lib/elementary/elc_hoversel_legacy.h \
lib/elementary/elc_multibuttonentry.h \
lib/elementary/elc_multibuttonentry_eo.h \
lib/elementary/elc_multibuttonentry_legacy.h \
lib/elementary/elc_multibuttonentry_common.h \
lib/elementary/elc_naviframe.h \
lib/elementary/elc_naviframe_eo.h \
lib/elementary/elc_naviframe_legacy.h \
lib/elementary/elc_naviframe_common.h \
lib/elementary/elc_popup.h \
@ -313,7 +311,6 @@ includesub_HEADERS = \
lib/elementary/elc_popup_legacy.h \
lib/elementary/elm_access.h \
lib/elementary/elm_actionslider.h \
lib/elementary/elm_actionslider_eo.h \
lib/elementary/elm_actionslider_legacy.h \
lib/elementary/elm_app.h \
lib/elementary/elm_atspi_app_object.h \
@ -325,7 +322,6 @@ includesub_HEADERS = \
lib/elementary/elm_box_legacy.h \
lib/elementary/elm_box_common.h \
lib/elementary/elm_bubble.h \
lib/elementary/elm_bubble_eo.h \
lib/elementary/elm_bubble_legacy.h \
lib/elementary/elm_button.h \
lib/elementary/elm_button_eo.h \
@ -374,7 +370,6 @@ includesub_HEADERS = \
lib/elementary/efl_ui_flip_eo.h \
lib/elementary/efl_ui_flip_legacy.h \
lib/elementary/elm_flipselector.h \
lib/elementary/elm_flipselector_eo.h \
lib/elementary/elm_flipselector_legacy.h \
lib/elementary/elm_focus.h \
lib/elementary/elm_focus_item.h \
@ -407,7 +402,6 @@ includesub_HEADERS = \
lib/elementary/elm_hover_eo.h \
lib/elementary/elm_hover_legacy.h \
lib/elementary/elm_icon.h \
lib/elementary/elm_icon_eo.h \
lib/elementary/elm_icon_legacy.h \
lib/elementary/elm_image.h \
lib/elementary/elm_image_eo.h \
@ -417,7 +411,6 @@ includesub_HEADERS = \
lib/elementary/elm_index_legacy.h \
${top_builddir}/elm_intro.h \
lib/elementary/elm_inwin.h \
lib/elementary/elm_inwin_eo.h \
lib/elementary/elm_inwin_legacy.h \
lib/elementary/elm_label.h \
lib/elementary/elm_label_eo.h \
@ -456,7 +449,6 @@ includesub_HEADERS = \
lib/elementary/elm_panes_eo.h \
lib/elementary/elm_panes_legacy.h \
lib/elementary/elm_photo.h \
lib/elementary/elm_photo_eo.h \
lib/elementary/elm_photo_legacy.h \
lib/elementary/elm_photocam.h \
lib/elementary/elm_photocam_eo.h \
@ -466,7 +458,6 @@ includesub_HEADERS = \
lib/elementary/elm_plug_legacy.h \
lib/elementary/elm_prefs.h \
lib/elementary/elm_prefs_common.h \
lib/elementary/elm_prefs_eo.h \
lib/elementary/elm_prefs_legacy.h \
lib/elementary/elm_prefs_data.h \
lib/elementary/elm_progressbar.h \
@ -512,7 +503,6 @@ includesub_HEADERS = \
lib/elementary/elm_theme.h \
lib/elementary/elm_thumb.h \
lib/elementary/elm_thumb_common.h \
lib/elementary/elm_thumb_eo.h \
lib/elementary/elm_thumb_legacy.h \
lib/elementary/elm_toolbar.h \
lib/elementary/elm_toolbar_common.h \

1
src/lib/elementary/efl_ui_text.c
View File

@ -19,6 +19,7 @@
#include "elm_entry_common.h"
#include "elm_widget_entry.h"
#include "efl_ui_text.eo.h"
#include "elm_hoversel.eo.h"
typedef struct _Efl_Ui_Text_Data Efl_Ui_Text_Data;
typedef struct _Efl_Ui_Text_Rectangle Efl_Ui_Text_Rectangle;

2
src/lib/elementary/elc_hoversel.c
View File

@ -9,6 +9,8 @@
#define ELM_WIDGET_ITEM_PROTECTED
#include <Elementary.h>
#include "elm_priv.h"
#include "elm_hoversel.eo.h"
#include "elm_hoversel_item.eo.h"
#include "elm_widget_hoversel.h"
#define MY_CLASS ELM_HOVERSEL_CLASS

3
src/lib/elementary/elc_hoversel.h
View File

@ -57,9 +57,6 @@
* @{
*/
#ifdef EFL_EO_API_SUPPORT
#include "elc_hoversel_eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elc_hoversel_legacy.h"
#endif

2
src/lib/elementary/elc_hoversel_eo.h
View File

@ -1,2 +0,0 @@
#include "elm_hoversel_item.eo.h"
#include "elm_hoversel.eo.h"

2
src/lib/elementary/elc_naviframe.c
View File

@ -8,6 +8,8 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "elm_naviframe.eo.h"
#include "elm_naviframe_item.eo.h"
#include "elm_widget_naviframe.h"
#include "elm_widget_container.h"

3
src/lib/elementary/elc_naviframe.h
View File

@ -90,9 +90,6 @@
*/
#include "elc_naviframe_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "elc_naviframe_eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elc_naviframe_legacy.h"
#endif

12
src/lib/elementary/elc_naviframe_eo.h
View File

@ -1,12 +0,0 @@
/**
* @ingroup Elm_Naviframe
*
* @{
*/
#include "elm_naviframe_item.eo.h"
#include "elm_naviframe.eo.h"
/**
* @}
*/

2
src/lib/elementary/elm_actionslider.c
View File

@ -11,6 +11,8 @@
#include "elm_widget_actionslider.h"
#include "elm_widget_layout.h"
#include "elm_actionslider.eo.h"
#define MY_CLASS ELM_ACTIONSLIDER_CLASS
#define MY_CLASS_NAME "Elm_Actionslider"

3
src/lib/elementary/elm_actionslider.h
View File

@ -50,9 +50,6 @@
* @{
*/
#ifdef EFL_EO_API_SUPPORT
#include "elm_actionslider_eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_actionslider_legacy.h"
#endif

1
src/lib/elementary/elm_actionslider_eo.h
View File

@ -1 +0,0 @@
#include "elm_actionslider.eo.h"

1
src/lib/elementary/elm_bubble.c
View File

@ -7,6 +7,7 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "elm_bubble.eo.h"
#include "elm_widget_bubble.h"
#include "elm_widget_layout.h"

3
src/lib/elementary/elm_bubble.h
View File

@ -61,9 +61,6 @@
* @{
*/
#ifdef EFL_EO_API_SUPPORT
#include "elm_bubble_eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_bubble_legacy.h"
#endif

1
src/lib/elementary/elm_bubble_eo.h
View File

@ -1 +0,0 @@
#include "elm_bubble.eo.h"

3
src/lib/elementary/elm_code_widget.c
View File

@ -9,6 +9,9 @@
#include "elm_code_private.h"
#include "elm_code_widget_private.h"
/* FIXME: hoversel is deprecated in EO APIs */
#include "elm_hoversel.eo.h"
#define MY_CLASS ELM_CODE_WIDGET_CLASS
typedef enum {

1
src/lib/elementary/elm_dbus_menu.c
View File

@ -5,6 +5,7 @@
#include <Elementary.h>
#include <stdint.h>
#include "elm_priv.h"
#include "elm_icon.eo.h"
#include "elm_widget_menu.h"
#include "elm_widget_icon.h"

1
src/lib/elementary/elm_entry.c
View File

@ -14,6 +14,7 @@
#include "elm_entry_internal_part.eo.h"
#include "elm_part_helper.h"
#include "elm_hoversel.eo.h"
#define MY_CLASS ELM_ENTRY_CLASS

3
src/lib/elementary/elm_flipselector.c
View File

@ -10,6 +10,9 @@
#include "elm_priv.h"
#include "elm_widget_flipselector.h"
#include "elm_flipselector.eo.h"
#include "elm_flipselector_item.eo.h"
#define MY_CLASS ELM_FLIPSELECTOR_CLASS
#define MY_CLASS_NAME "Elm_Flipselector"

3
src/lib/elementary/elm_flipselector.h
View File

@ -59,9 +59,6 @@
* @{
*/
#ifdef EFL_EO_API_SUPPORT
#include "elm_flipselector_eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_flipselector_legacy.h"
#endif

2
src/lib/elementary/elm_flipselector_eo.h
View File

@ -1,2 +0,0 @@
#include "elm_flipselector_item.eo.h"
#include "elm_flipselector.eo.h"

1
src/lib/elementary/elm_icon.c
View File

@ -9,6 +9,7 @@
#include "elm_priv.h"
#include "elm_widget_icon.h"
#include "efl_ui_widget_image.h"
#include "elm_icon.eo.h"
#define NON_EXISTING (void *)-1

3
src/lib/elementary/elm_icon.h
View File

@ -151,9 +151,6 @@
* @li @ref tutorial_icon
*/
#ifdef EFL_EO_API_SUPPORT
#include "elm_icon_eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_icon_legacy.h"
#endif

1
src/lib/elementary/elm_icon_eo.h
View File

@ -1 +0,0 @@
#include "elm_icon.eo.h"

1
src/lib/elementary/elm_inwin.c
View File

@ -9,6 +9,7 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "elm_inwin.eo.h"
#include "elm_widget_inwin.h"
#include "elm_widget_layout.h"

3
src/lib/elementary/elm_inwin.h
View File

@ -44,9 +44,6 @@
* @{
*/
#ifdef EFL_EO_API_SUPPORT
#include "elm_inwin_eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_inwin_legacy.h"
#endif

1
src/lib/elementary/elm_inwin_eo.h
View File

@ -1 +0,0 @@
#include "elm_inwin.eo.h"

2
src/lib/elementary/elm_photo.c
View File

@ -8,6 +8,8 @@
#include "elm_priv.h"
#include "elm_widget_photo.h"
#include "elm_photo.eo.h"
#include "elm_icon.eo.h"
#define MY_CLASS ELM_PHOTO_CLASS

3
src/lib/elementary/elm_photo.h
View File

@ -24,9 +24,6 @@
* @{
*/
#ifdef EFL_EO_API_SUPPORT
#include <elm_photo_eo.h>
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include <elm_photo_legacy.h>
#endif

11
src/lib/elementary/elm_photo_eo.h
View File

@ -1,11 +0,0 @@
/**
* @ingroup Elm_Photo
*
* @{
*/
#include "elm_photo.eo.h"
/**
* @}
*/

3
src/lib/elementary/elm_prefs.c
View File

@ -7,11 +7,10 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "elm_prefs.eo.h"
#include "elm_widget_prefs.h"
#include "elm_prefs_edd.x"
#include "Eo.h"
#define MY_CLASS ELM_PREFS_CLASS
#define MY_CLASS_NAME "Elm_Prefs"

3
src/lib/elementary/elm_prefs.h
View File

@ -74,9 +74,6 @@
*/
#include "elm_prefs_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "elm_prefs_eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_prefs_legacy.h"
#endif

11
src/lib/elementary/elm_prefs_eo.h
View File

@ -1,11 +0,0 @@
/**
* @ingroup Elm_Prefs
*
* @{
*/
#include "elm_prefs.eo.h"
/**
* @}
*/

1
src/lib/elementary/elm_theme.c
View File

@ -5,6 +5,7 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "elm_icon.eo.h"
static Elm_Theme theme_default =
{

1
src/lib/elementary/elm_thumb.c
View File

@ -7,6 +7,7 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "elm_thumb.eo.h"
#include "elm_widget_thumb.h"
#define MY_CLASS_NAME "Elm_Thumb"

3
src/lib/elementary/elm_thumb.h
View File

@ -56,9 +56,6 @@
*/
#include "elm_thumb_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "elm_thumb_eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_thumb_legacy.h"
#endif

1
src/lib/elementary/elm_thumb_eo.h
View File

@ -1 +0,0 @@
#include "elm_thumb.eo.h"

2
src/lib/elementary/elm_view_form.c
View File

@ -9,6 +9,8 @@
#include "elm_view_list.h"
#include "elm_priv.h"
#include "elm_thumb.eo.h"
#include <assert.h>
#define MY_CLASS ELM_VIEW_FORM_CLASS

2
src/lib/elementary/elm_widget_naviframe.h
View File

@ -2,6 +2,8 @@
#define ELM_WIDGET_NAVIFRAME_H
#include "Elementary.h"
#include "elm_naviframe.eo.h"
#include "elm_naviframe_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

1
src/lib/elementary/elm_widget_prefs.h
View File

@ -2,6 +2,7 @@
#define ELM_WIDGET_PREFS_H
#include "Elementary.h"
#include "elm_prefs.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