From 96be3cd83d3426c5a9eb8d903245c51927567dc6 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 27 Sep 2019 11:07:17 -0400 Subject: [PATCH] efl_ui: remove efl_ui_text headers from Efl_Ui.h for now these require legacy types and headers, which should not be brought into this header Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D10235 --- src/bin/elementary/test_efl_ui_animation_view.c | 2 +- src/bin/elementary/test_efl_ui_text.c | 2 +- src/bin/elementary/test_gfx_filters.c | 2 +- src/bin/elementary/test_part_bg.c | 2 +- src/bin/elementary/test_photocam.c | 2 +- src/bin/elementary/test_ui_clock.c | 2 +- src/bin/elementary/test_ui_collection.c | 1 + src/bin/elementary/test_ui_frame.c | 2 +- src/bin/elementary/test_ui_image.c | 2 +- src/bin/elementary/test_ui_items.c | 1 + src/bin/elementary/test_ui_relative_layout.c | 4 ++-- src/bin/elementary/test_ui_slider.c | 2 +- src/bin/elementary/test_ui_slider_interval.c | 2 +- src/bin/elementary/test_win_dialog.c | 2 ++ src/examples/elementary/efl_ui_list_example_1.c | 7 +++++++ src/lib/elementary/Efl_Ui.h | 3 ++- src/lib/elementary/elm_priv.h | 7 +++++++ 17 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/bin/elementary/test_efl_ui_animation_view.c b/src/bin/elementary/test_efl_ui_animation_view.c index 31bdb5bfaf..b4a12a4332 100644 --- a/src/bin/elementary/test_efl_ui_animation_view.c +++ b/src/bin/elementary/test_efl_ui_animation_view.c @@ -3,7 +3,7 @@ #endif #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h #ifndef EFL_BETA_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c index 8a4da1e849..e7e909b84f 100644 --- a/src/bin/elementary/test_efl_ui_text.c +++ b/src/bin/elementary/test_efl_ui_text.c @@ -4,7 +4,7 @@ #define EO_BETA_API #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h static void _apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style) { diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c index 11ee74cae3..4cd521430f 100644 --- a/src/bin/elementary/test_gfx_filters.c +++ b/src/bin/elementary/test_gfx_filters.c @@ -5,7 +5,7 @@ #include #include #include "elm_spinner_eo.h" - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h static const int default_font_size = 48; typedef struct _Filter_Image diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c index 3f3c9db14a..d375f2d969 100644 --- a/src/bin/elementary/test_part_bg.c +++ b/src/bin/elementary/test_part_bg.c @@ -3,7 +3,7 @@ #endif #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h #define MAX_NUM_OF_CONTENT 17 const Efl_Class *content_class[MAX_NUM_OF_CONTENT]; diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c index c26be3a334..eb068e663c 100644 --- a/src/bin/elementary/test_photocam.c +++ b/src/bin/elementary/test_photocam.c @@ -3,7 +3,7 @@ #endif #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h static const struct { Evas_Image_Orient orient; const char *name; diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c index 4542fe81f3..14660dceab 100644 --- a/src/bin/elementary/test_ui_clock.c +++ b/src/bin/elementary/test_ui_clock.c @@ -3,7 +3,7 @@ #endif #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h /* A simple test, just displaying clock in its default format */ Evas_Object *dt1, *dt2, *dt3, *dt4; diff --git a/src/bin/elementary/test_ui_collection.c b/src/bin/elementary/test_ui_collection.c index 3d1b34e3cd..2f74809d29 100644 --- a/src/bin/elementary/test_ui_collection.c +++ b/src/bin/elementary/test_ui_collection.c @@ -2,6 +2,7 @@ # include "elementary_config.h" #endif +#include #include static void diff --git a/src/bin/elementary/test_ui_frame.c b/src/bin/elementary/test_ui_frame.c index 4f37a26a10..d0dba5c35b 100644 --- a/src/bin/elementary/test_ui_frame.c +++ b/src/bin/elementary/test_ui_frame.c @@ -3,7 +3,7 @@ #endif #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h static void _inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED) { diff --git a/src/bin/elementary/test_ui_image.c b/src/bin/elementary/test_ui_image.c index 5e7e25400a..bb4cea8aec 100644 --- a/src/bin/elementary/test_ui_image.c +++ b/src/bin/elementary/test_ui_image.c @@ -3,7 +3,7 @@ #endif #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h static const struct { Efl_Gfx_Image_Orientation orient; const char *name; diff --git a/src/bin/elementary/test_ui_items.c b/src/bin/elementary/test_ui_items.c index b2540699ad..826f4e43e4 100644 --- a/src/bin/elementary/test_ui_items.c +++ b/src/bin/elementary/test_ui_items.c @@ -2,6 +2,7 @@ # include "elementary_config.h" #endif +#include #include static Efl_Ui_Widget* diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c index 052b3ba145..426d471c06 100644 --- a/src/bin/elementary/test_ui_relative_layout.c +++ b/src/bin/elementary/test_ui_relative_layout.c @@ -1,11 +1,11 @@ -#include "test.h" #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h +#include "test.h" static Eo *layout, *btn1, *btn2, *btn3; typedef enum { diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c index 5aa31004f9..13ecfa604b 100644 --- a/src/bin/elementary/test_ui_slider.c +++ b/src/bin/elementary/test_ui_slider.c @@ -3,7 +3,7 @@ #endif #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h static void _slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev) { diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c index 186e2daadd..5107f82ecc 100644 --- a/src/bin/elementary/test_ui_slider_interval.c +++ b/src/bin/elementary/test_ui_slider_interval.c @@ -3,7 +3,7 @@ #endif #include #include - +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h static double _step_size_calculate(double min, double max) { diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c index ef8a67b133..11b59da0cd 100644 --- a/src/bin/elementary/test_win_dialog.c +++ b/src/bin/elementary/test_win_dialog.c @@ -4,6 +4,8 @@ #include #include +#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h + static void _bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c index 5b808d0da8..ac4976a3c1 100644 --- a/src/examples/elementary/efl_ui_list_example_1.c +++ b/src/examples/elementary/efl_ui_list_example_1.c @@ -13,6 +13,13 @@ #include #include +//FIXME this can go away when efl_ui_text doesn't need elm_general +# include +# include +# include +# include +# include + #define NUM_ITEMS 400 typedef struct _List_Scroll_Data { diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index a546fa4359..b6b02283e8 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h @@ -245,12 +245,13 @@ EAPI Eina_Bool efl_ui_win_autodel_get(const Efl_Ui_Win *obj); # include # include -/* FIXME: Efl.Ui.Text must not use elm_general.h */ +/* FIXME: Efl.Ui.Text must not use elm_general.h # include # include # include # include # include +*/ # include # include diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index 8cb7ee5c64..fede13fa67 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -166,6 +166,13 @@ # include "efl_ui_selection_manager.eo.h" # include "efl_datetime_manager.eo.h" +//FIXME this needs to not use elm_general.h and go to Efl_Ui.h +# include +# include +# include +# include +# include + extern const char *_efl_model_property_itemw; extern const char *_efl_model_property_itemh; extern const char *_efl_model_property_selfw;