From 24f32c5ad75e030159426a69ea1988e354c7d21d Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 8 Mar 2019 08:57:51 -0500 Subject: [PATCH] elementary,evas: remove obsolete legacy includes Summary: Since the removal of legacy interfaces from eo files, these files contain nothing useful, and can safely be removed. One exception is `efl_ui_layout.eo.legacy.h`, which will require more involved work to remove, since a lot of things seem to depend on the Efl_Ui_Layout typedef being present, wrongly (i suspect this will break everything with `EFL_NOLEGACY_API_SUPPORT`). Reviewers: cedric, zmike, bu5hm4n Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8251 Change-Id: I07511538b865391ef9e0fe6780ef175253e77da2 --- src/lib/elementary/elm_image_legacy.h | 2 -- src/lib/elementary/elm_layout_legacy.h | 1 + src/lib/elementary/elm_progressbar_legacy.h | 2 -- src/lib/elementary/elm_scroller_legacy.h | 40 ++++++++++++++++++++++++++++- src/lib/elementary/elm_slider_legacy.h | 2 -- src/lib/evas/Evas_Legacy.h | 10 -------- 6 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/lib/elementary/elm_image_legacy.h b/src/lib/elementary/elm_image_legacy.h index a53e063..77286c9 100644 --- a/src/lib/elementary/elm_image_legacy.h +++ b/src/lib/elementary/elm_image_legacy.h @@ -553,5 +553,3 @@ EAPI Eina_Bool elm_image_aspect_fixed_get(const Evas_Object *obj); * @ingroup Elm_Image */ EAPI void elm_image_async_open_set(Evas_Object *obj, Eina_Bool async); - -#include "efl_ui_image.eo.legacy.h" diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h index 58c44b7..2c69e49 100644 --- a/src/lib/elementary/elm_layout_legacy.h +++ b/src/lib/elementary/elm_layout_legacy.h @@ -738,4 +738,5 @@ EAPI double elm_layout_valign_get(Evas_Object *obj, const char *part); * END * *******/ +/* FIXME: this shouldn't have to be included but causes build errors otherwise */ #include "efl_ui_layout.eo.legacy.h" diff --git a/src/lib/elementary/elm_progressbar_legacy.h b/src/lib/elementary/elm_progressbar_legacy.h index 8eedf94..a6b6799 100644 --- a/src/lib/elementary/elm_progressbar_legacy.h +++ b/src/lib/elementary/elm_progressbar_legacy.h @@ -284,5 +284,3 @@ EAPI void elm_progressbar_part_value_set(Evas_Object *obj, const char *part, dou * @ingroup Elm_Progressbar */ EAPI double elm_progressbar_part_value_get(const Evas_Object *obj, const char *part); - -#include "efl_ui_progressbar.eo.legacy.h" diff --git a/src/lib/elementary/elm_scroller_legacy.h b/src/lib/elementary/elm_scroller_legacy.h index 6b40eff..2e0cec9 100644 --- a/src/lib/elementary/elm_scroller_legacy.h +++ b/src/lib/elementary/elm_scroller_legacy.h @@ -1,4 +1,42 @@ -#include "elm_interface_scrollable.eo.legacy.h" +#ifndef _ELM_INTERFACE_SCROLLABLE_EO_TYPES +#define _ELM_INTERFACE_SCROLLABLE_EO_TYPES + +/** + * @brief Type that controls when scrollbars should appear. + * + * See also @ref Elm.Interface_Scrollable.policy.set. + * + * @ingroup Elm_Scroller + */ +typedef enum +{ + ELM_SCROLLER_POLICY_AUTO = 0, /**< Show scrollbars as needed */ + ELM_SCROLLER_POLICY_ON, /**< Always show scrollbars */ + ELM_SCROLLER_POLICY_OFF, /**< Never show scrollbars */ + ELM_SCROLLER_POLICY_LAST /**< Sentinel value to indicate last enum field + * during iteration */ +} Elm_Scroller_Policy; + +/** + * @brief Type that controls how the content is scrolled. + * + * See also @ref Elm.Interface_Scrollable.single_direction.set. + * + * @ingroup Elm_Scroller + */ +typedef enum +{ + ELM_SCROLLER_SINGLE_DIRECTION_NONE = 0, /**< Scroll every direction */ + ELM_SCROLLER_SINGLE_DIRECTION_SOFT, /**< Scroll single direction if the + * direction is certain */ + ELM_SCROLLER_SINGLE_DIRECTION_HARD, /**< Scroll only single direction */ + ELM_SCROLLER_SINGLE_DIRECTION_LAST /**< Sentinel value to indicate last enum + * field during iteration */ +} Elm_Scroller_Single_Direction; + + +#endif + #include "elm_scroller_eo.legacy.h" /** diff --git a/src/lib/elementary/elm_slider_legacy.h b/src/lib/elementary/elm_slider_legacy.h index 99c5097..aa32dec 100644 --- a/src/lib/elementary/elm_slider_legacy.h +++ b/src/lib/elementary/elm_slider_legacy.h @@ -381,5 +381,3 @@ EAPI double elm_slider_step_get(const Evas_Object *obj); * @ingroup Elm_Slider */ EAPI void elm_slider_step_set(Evas_Object *obj, double step); - -#include "efl_ui_slider.eo.legacy.h" diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 13acbec..579ce60 100755 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -3562,8 +3562,6 @@ EWAPI Eina_Bool _evas_object_intercept_call(Evas_Object *obj, Evas_Object_Interc */ EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; -#include "canvas/efl_canvas_rectangle.eo.legacy.h" - /** * @} */ @@ -4430,8 +4428,6 @@ EAPI void evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s); */ EAPI Efl_Gfx_Gradient_Spread evas_vg_gradient_spread_get(Eo *obj); -#include "canvas/efl_canvas_vg_gradient.eo.legacy.h" - /** * Creates a new linear gradient object \. * @@ -4481,8 +4477,6 @@ EAPI void evas_vg_gradient_linear_end_set(Eo *obj, double x, double y); */ EAPI void evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y); -#include "canvas/efl_canvas_vg_gradient_linear.eo.legacy.h" - /** * Creates a new radial gradient object \. * @@ -4549,8 +4543,6 @@ EAPI void evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y); */ EAPI void evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y); -#include "canvas/efl_canvas_vg_gradient_radial.eo.legacy.h" - /** * @} */ @@ -8294,8 +8286,6 @@ EAPI void evas_object_map_enable_set(Evas_Object *obj, Eina_Bool enabled); */ EAPI Eina_Bool evas_object_map_enable_get(const Evas_Object *obj); -#include "canvas/efl_gfx_mapping.eo.legacy.h" - /** * @brief Apply an evas filter program on this text object. * -- 2.7.4