summaryrefslogtreecommitdiff
path: root/src/bin/elementary
diff options
context:
space:
mode:
authorYeongjong Lee <yj34.lee@samsung.com>2019-12-12 01:37:16 +0000
committerCedric BAIL <cedric.bail@free.fr>2019-12-12 10:20:31 -0800
commit4c77ee6843807cb0e27d73153203eec6ea42b8fb (patch)
tree2ad2eda99b619a747996d53dd6bf677d791c9be1 /src/bin/elementary
parent55d987b4189b907db646f85c8cbde6a0bf62776b (diff)
efl_ui: cleanup elm headers
since e2980cd9812113fc4a216749eb23d7611b02fd55, `efl.ui.text` doesn't need `elm_general.h`. This partially reverts commit 96be3cd83d3426c5a9eb8d903245c51927567dc6. Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D10849
Diffstat (limited to 'src/bin/elementary')
-rw-r--r--src/bin/elementary/test_efl_ui_animation_view.c2
-rw-r--r--src/bin/elementary/test_efl_ui_text.c1
-rw-r--r--src/bin/elementary/test_gfx_filters.c2
-rw-r--r--src/bin/elementary/test_part_bg.c2
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/bin/elementary/test_ui_clock.c2
-rw-r--r--src/bin/elementary/test_ui_collection.c7
-rw-r--r--src/bin/elementary/test_ui_frame.c2
-rw-r--r--src/bin/elementary/test_ui_image.c2
-rw-r--r--src/bin/elementary/test_ui_items.c5
-rw-r--r--src/bin/elementary/test_ui_relative_container.c2
-rw-r--r--src/bin/elementary/test_ui_slider.c2
-rw-r--r--src/bin/elementary/test_ui_slider_interval.c2
-rw-r--r--src/bin/elementary/test_win_dialog.c2
14 files changed, 15 insertions, 20 deletions
diff --git a/src/bin/elementary/test_efl_ui_animation_view.c b/src/bin/elementary/test_efl_ui_animation_view.c
index b086a1b..f5a73df 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 @@
3#endif 3#endif
4#include <Elementary.h> 4#include <Elementary.h>
5#include <Efl_Ui.h> 5#include <Efl_Ui.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 6
7#ifndef EFL_BETA_API_SUPPORT 7#ifndef EFL_BETA_API_SUPPORT
8#define EFL_BETA_API_SUPPORT 8#define EFL_BETA_API_SUPPORT
9#endif 9#endif
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index f14d25d..066e732 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -4,7 +4,6 @@
4#define EO_BETA_API 4#define EO_BETA_API
5#include <Efl_Ui.h> 5#include <Efl_Ui.h>
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
8 7
9static void 8static void
10_apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style) 9_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 8fb84ab..7ab9a63 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -5,7 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6#include <Efl_Ui.h> 6#include <Efl_Ui.h>
7#include "elm_spinner_eo.h" 7#include "elm_spinner_eo.h"
8#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h 8
9static const int default_font_size = 48; 9static const int default_font_size = 48;
10 10
11typedef struct _Filter_Image 11typedef struct _Filter_Image
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index 1ee74d7..850377b 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h 6
7#define MAX_NUM_OF_CONTENT 17 7#define MAX_NUM_OF_CONTENT 17
8 8
9const Efl_Class *content_class[MAX_NUM_OF_CONTENT]; 9const 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 6de8bde..166f669 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h 6
7static const struct { 7static const struct {
8 Evas_Image_Orient orient; 8 Evas_Image_Orient orient;
9 const char *name; 9 const char *name;
diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c
index c2840a6..79e9074 100644
--- a/src/bin/elementary/test_ui_clock.c
+++ b/src/bin/elementary/test_ui_clock.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h 6
7/* A simple test, just displaying clock in its default format */ 7/* A simple test, just displaying clock in its default format */
8 8
9Evas_Object *dt1, *dt2, *dt3, *dt4; 9Evas_Object *dt1, *dt2, *dt3, *dt4;
diff --git a/src/bin/elementary/test_ui_collection.c b/src/bin/elementary/test_ui_collection.c
index 2397e14..6e4d832 100644
--- a/src/bin/elementary/test_ui_collection.c
+++ b/src/bin/elementary/test_ui_collection.c
@@ -2,7 +2,6 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include <Elementary.h>
6#include <Efl_Ui.h> 5#include <Efl_Ui.h>
7 6
8static void 7static void
@@ -114,7 +113,7 @@ _add_item(Efl_Ui_Collection *c, Eo *cont)
114 snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13); 113 snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13);
115 efl_text_set(il, buf); 114 efl_text_set(il, buf);
116 115
117 rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_object_evas_get(c)); 116 rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, c);
118 switch (i % 5) 117 switch (i % 5)
119 { 118 {
120 case 0: 119 case 0:
@@ -312,14 +311,14 @@ void create_item_container_ui(const Efl_Class *collection_class, const Efl_Class
312} 311}
313 312
314void test_efl_ui_collection_grid(void *data EINA_UNUSED, 313void test_efl_ui_collection_grid(void *data EINA_UNUSED,
315 Evas_Object *obj EINA_UNUSED, 314 Efl_Object *obj EINA_UNUSED,
316 void *event_info EINA_UNUSED) 315 void *event_info EINA_UNUSED)
317{ 316{
318 create_item_container_ui(EFL_UI_GRID_CLASS, EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Grid"); 317 create_item_container_ui(EFL_UI_GRID_CLASS, EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Grid");
319} 318}
320 319
321void test_efl_ui_collection_list(void *data EINA_UNUSED, 320void test_efl_ui_collection_list(void *data EINA_UNUSED,
322 Evas_Object *obj EINA_UNUSED, 321 Efl_Object *obj EINA_UNUSED,
323 void *event_info EINA_UNUSED) 322 void *event_info EINA_UNUSED)
324{ 323{
325 create_item_container_ui(EFL_UI_LIST_CLASS, EFL_UI_LIST_DEFAULT_ITEM_CLASS, "Efl.Ui.List"); 324 create_item_container_ui(EFL_UI_LIST_CLASS, EFL_UI_LIST_DEFAULT_ITEM_CLASS, "Efl.Ui.List");
diff --git a/src/bin/elementary/test_ui_frame.c b/src/bin/elementary/test_ui_frame.c
index 2c152c9..4271f41 100644
--- a/src/bin/elementary/test_ui_frame.c
+++ b/src/bin/elementary/test_ui_frame.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h 6
7static void 7static void
8_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED) 8_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
9{ 9{
diff --git a/src/bin/elementary/test_ui_image.c b/src/bin/elementary/test_ui_image.c
index 1608605..fc8a9fb 100644
--- a/src/bin/elementary/test_ui_image.c
+++ b/src/bin/elementary/test_ui_image.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Elementary.h> 4#include <Elementary.h>
5#include <Efl_Ui.h> 5#include <Efl_Ui.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h 6
7static const struct { 7static const struct {
8 Efl_Gfx_Image_Orientation orient; 8 Efl_Gfx_Image_Orientation orient;
9 const char *name; 9 const char *name;
diff --git a/src/bin/elementary/test_ui_items.c b/src/bin/elementary/test_ui_items.c
index 826f4e4..36c5f97 100644
--- a/src/bin/elementary/test_ui_items.c
+++ b/src/bin/elementary/test_ui_items.c
@@ -2,7 +2,6 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include <Elementary.h>
6#include <Efl_Ui.h> 5#include <Efl_Ui.h>
7 6
8static Efl_Ui_Widget* 7static Efl_Ui_Widget*
@@ -15,7 +14,7 @@ _item_add(Eo *box, const Efl_Class *c, int i)
15 snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13); 14 snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13);
16 efl_text_set(il, buf); 15 efl_text_set(il, buf);
17 16
18 rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_object_evas_get(il)); 17 rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, il);
19 switch (i % 5) 18 switch (i % 5)
20 { 19 {
21 case 0: 20 case 0:
@@ -49,7 +48,7 @@ _item_add(Eo *box, const Efl_Class *c, int i)
49} 48}
50 49
51void test_efl_ui_item(void *data EINA_UNUSED, 50void test_efl_ui_item(void *data EINA_UNUSED,
52 Evas_Object *obj EINA_UNUSED, 51 Efl_Object *obj EINA_UNUSED,
53 void *event_info EINA_UNUSED) 52 void *event_info EINA_UNUSED)
54{ 53{
55 Eo *win, *box, *o; 54 Eo *win, *box, *o;
diff --git a/src/bin/elementary/test_ui_relative_container.c b/src/bin/elementary/test_ui_relative_container.c
index 5ed7a84..1578256 100644
--- a/src/bin/elementary/test_ui_relative_container.c
+++ b/src/bin/elementary/test_ui_relative_container.c
@@ -4,8 +4,8 @@
4 4
5#include <Efl_Ui.h> 5#include <Efl_Ui.h>
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
8#include "test.h" 7#include "test.h"
8
9static Eo *layout, *btn1, *btn2, *btn3; 9static Eo *layout, *btn1, *btn2, *btn3;
10 10
11typedef enum { 11typedef enum {
diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c
index 90932a8..81d4cf1 100644
--- a/src/bin/elementary/test_ui_slider.c
+++ b/src/bin/elementary/test_ui_slider.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h 6
7static void 7static void
8_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev) 8_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
9{ 9{
diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c
index 09d97be..29dd76b 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h 6
7static double 7static double
8_step_size_calculate(double min, double max) 8_step_size_calculate(double min, double max)
9{ 9{
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index f2b0a16..0504669 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -4,8 +4,6 @@
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
8
9static void 7static void
10_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 8_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
11{ 9{