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

efl_ui: cleanup elm headers 

since e2980cd981, `efl.ui.text` doesn't need
`elm_general.h`.

This partially reverts commit 96be3cd83d.

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D10849
This commit is contained in:
Yeongjong Lee 2019-12-12 01:37:16 +00:00 committed by Cedric BAIL
parent 55d987b418
commit 4c77ee6843
16 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/elementary/test_efl_ui_animation_view.c
View File

@ -3,7 +3,7 @@
#endif #endif
#include <Elementary.h> #include <Elementary.h>
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#ifndef EFL_BETA_API_SUPPORT #ifndef EFL_BETA_API_SUPPORT
#define EFL_BETA_API_SUPPORT #define EFL_BETA_API_SUPPORT
#endif #endif

1
src/bin/elementary/test_efl_ui_text.c
View File

@ -4,7 +4,6 @@
#define EO_BETA_API #define EO_BETA_API
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
static void static void
_apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style) _apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)

2
src/bin/elementary/test_gfx_filters.c
View File

@ -5,7 +5,7 @@
#include <Elementary.h> #include <Elementary.h>
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include "elm_spinner_eo.h" #include "elm_spinner_eo.h"
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static const int default_font_size = 48; static const int default_font_size = 48;
typedef struct _Filter_Image typedef struct _Filter_Image

2
src/bin/elementary/test_part_bg.c
View File

@ -3,7 +3,7 @@
#endif #endif
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
#define MAX_NUM_OF_CONTENT 17 #define MAX_NUM_OF_CONTENT 17
const Efl_Class *content_class[MAX_NUM_OF_CONTENT]; const Efl_Class *content_class[MAX_NUM_OF_CONTENT];

2
src/bin/elementary/test_photocam.c
View File

@ -3,7 +3,7 @@
#endif #endif
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static const struct { static const struct {
Evas_Image_Orient orient; Evas_Image_Orient orient;
const char *name; const char *name;

2
src/bin/elementary/test_ui_clock.c
View File

@ -3,7 +3,7 @@
#endif #endif
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
/* A simple test, just displaying clock in its default format */ /* A simple test, just displaying clock in its default format */
Evas_Object *dt1, *dt2, *dt3, *dt4; Evas_Object *dt1, *dt2, *dt3, *dt4;

7
src/bin/elementary/test_ui_collection.c
View File

@ -2,7 +2,6 @@
# include "elementary_config.h" # include "elementary_config.h"
#endif #endif
#include <Elementary.h>
#include <Efl_Ui.h> #include <Efl_Ui.h>
static void static void
@ -114,7 +113,7 @@ _add_item(Efl_Ui_Collection *c, Eo *cont)
snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13); snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13);
efl_text_set(il, buf); efl_text_set(il, buf);
rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_object_evas_get(c)); rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, c);
switch (i % 5) switch (i % 5)
{ {
case 0: case 0:
@ -312,14 +311,14 @@ void create_item_container_ui(const Efl_Class *collection_class, const Efl_Class
} }
void test_efl_ui_collection_grid(void *data EINA_UNUSED, void test_efl_ui_collection_grid(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, Efl_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
create_item_container_ui(EFL_UI_GRID_CLASS, EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Grid"); create_item_container_ui(EFL_UI_GRID_CLASS, EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Grid");
} }
void test_efl_ui_collection_list(void *data EINA_UNUSED, void test_efl_ui_collection_list(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, Efl_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
create_item_container_ui(EFL_UI_LIST_CLASS, EFL_UI_LIST_DEFAULT_ITEM_CLASS, "Efl.Ui.List"); create_item_container_ui(EFL_UI_LIST_CLASS, EFL_UI_LIST_DEFAULT_ITEM_CLASS, "Efl.Ui.List");

2
src/bin/elementary/test_ui_frame.c
View File

@ -3,7 +3,7 @@
#endif #endif
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static void static void
_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED) _inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
{ {

2
src/bin/elementary/test_ui_image.c
View File

@ -3,7 +3,7 @@
#endif #endif
#include <Elementary.h> #include <Elementary.h>
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static const struct { static const struct {
Efl_Gfx_Image_Orientation orient; Efl_Gfx_Image_Orientation orient;
const char *name; const char *name;

5
src/bin/elementary/test_ui_items.c
View File

@ -2,7 +2,6 @@
# include "elementary_config.h" # include "elementary_config.h"
#endif #endif
#include <Elementary.h>
#include <Efl_Ui.h> #include <Efl_Ui.h>
static Efl_Ui_Widget* static Efl_Ui_Widget*
@ -15,7 +14,7 @@ _item_add(Eo *box, const Efl_Class *c, int i)
snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13); snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13);
efl_text_set(il, buf); efl_text_set(il, buf);
rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_object_evas_get(il)); rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, il);
switch (i % 5) switch (i % 5)
{ {
case 0: case 0:
@ -49,7 +48,7 @@ _item_add(Eo *box, const Efl_Class *c, int i)
} }
void test_efl_ui_item(void *data EINA_UNUSED, void test_efl_ui_item(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, Efl_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
Eo *win, *box, *o; Eo *win, *box, *o;

2
src/bin/elementary/test_ui_relative_container.c
View File

@ -4,8 +4,8 @@
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
#include "test.h" #include "test.h"
static Eo *layout, *btn1, *btn2, *btn3; static Eo *layout, *btn1, *btn2, *btn3;
typedef enum { typedef enum {

2
src/bin/elementary/test_ui_slider.c
View File

@ -3,7 +3,7 @@
#endif #endif
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static void static void
_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev) _slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{ {

2
src/bin/elementary/test_ui_slider_interval.c
View File

@ -3,7 +3,7 @@
#endif #endif
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static double static double
_step_size_calculate(double min, double max) _step_size_calculate(double min, double max)
{ {

2
src/bin/elementary/test_win_dialog.c
View File

@ -4,8 +4,6 @@
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static void static void
_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) _bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {

6
src/examples/elementary/efl_ui_list_example_1.c
View File

@ -13,12 +13,6 @@
#include <Eio.h> #include <Eio.h>
#include <stdio.h> #include <stdio.h>
//FIXME this can go away when efl_ui_text doesn't need elm_general
# include <elm_general.h>
# include <efl_text_interactive.eo.h>
# include <efl_ui_textbox.eo.h>
# include <efl_ui_textbox_async.eo.h>
#define NUM_ITEMS 400 #define NUM_ITEMS 400
typedef struct _List_Scroll_Data { typedef struct _List_Scroll_Data {

6
src/lib/elementary/elm_priv.h
View File

@ -167,12 +167,6 @@
# include "efl_ui_selection_manager.eo.h" # include "efl_ui_selection_manager.eo.h"
# include "efl_datetime_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 <elm_general.h>
# include <efl_text_interactive.eo.h>
# include <efl_ui_textbox.eo.h>
# include <efl_ui_textbox_async.eo.h>
extern const char *_efl_model_property_itemw; extern const char *_efl_model_property_itemw;
extern const char *_efl_model_property_itemh; extern const char *_efl_model_property_itemh;
extern const char *_efl_model_property_selfw; extern const char *_efl_model_property_selfw;