summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-27 11:07:17 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-30 10:33:34 +0200
commit96be3cd83d3426c5a9eb8d903245c51927567dc6 (patch)
treee1b0465874ce6b2b723c1416541c6cfa90738403 /src
parent525790b6b310e3484818d2e79ff43845825d8109 (diff)
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 <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D10235
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_efl_ui_animation_view.c2
-rw-r--r--src/bin/elementary/test_efl_ui_text.c2
-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.c1
-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.c1
-rw-r--r--src/bin/elementary/test_ui_relative_layout.c4
-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
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c7
-rw-r--r--src/lib/elementary/Efl_Ui.h3
-rw-r--r--src/lib/elementary/elm_priv.h7
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 31bdb5b..b4a12a4 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 6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
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 8a4da1e..e7e909b 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -4,7 +4,7 @@
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 7#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
8static void 8static void
9_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)
10{ 10{
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 11ee74c..4cd5214 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 8#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
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 3f3c9db..d375f2d 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 6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
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 c26be3a..eb068e6 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 6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
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 4542fe8..14660dc 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 6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
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 3d1b34e..2f74809 100644
--- a/src/bin/elementary/test_ui_collection.c
+++ b/src/bin/elementary/test_ui_collection.c
@@ -2,6 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include <Elementary.h>
5#include <Efl_Ui.h> 6#include <Efl_Ui.h>
6 7
7static void 8static void
diff --git a/src/bin/elementary/test_ui_frame.c b/src/bin/elementary/test_ui_frame.c
index 4f37a26..d0dba5c 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 6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
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 5e7e254..bb4cea8 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 6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
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 b254069..826f4e4 100644
--- a/src/bin/elementary/test_ui_items.c
+++ b/src/bin/elementary/test_ui_items.c
@@ -2,6 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include <Elementary.h>
5#include <Efl_Ui.h> 6#include <Efl_Ui.h>
6 7
7static Efl_Ui_Widget* 8static Efl_Ui_Widget*
diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c
index 052b3ba..426d471 100644
--- a/src/bin/elementary/test_ui_relative_layout.c
+++ b/src/bin/elementary/test_ui_relative_layout.c
@@ -1,11 +1,11 @@
1#include "test.h"
2#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
3# include "elementary_config.h" 2# include "elementary_config.h"
4#endif 3#endif
5 4
6#include <Efl_Ui.h> 5#include <Efl_Ui.h>
7#include <Elementary.h> 6#include <Elementary.h>
8 7#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
8#include "test.h"
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 5aa3100..13ecfa6 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 6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
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 186e2da..5107f82 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 6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
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 ef8a67b..11b59da 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -4,6 +4,8 @@
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.text doesn't need elm_general.h
8
7static void 9static void
8_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 10_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
9{ 11{
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index 5b808d0..ac4976a 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 @@
13#include <Eio.h> 13#include <Eio.h>
14#include <stdio.h> 14#include <stdio.h>
15 15
16//FIXME this can go away when efl_ui_text doesn't need elm_general
17# include <elm_general.h>
18# include <efl_text_interactive.eo.h>
19# include <efl_ui_text.eo.h>
20# include <efl_ui_text_editable.eo.h>
21# include <efl_ui_text_async.eo.h>
22
16#define NUM_ITEMS 400 23#define NUM_ITEMS 400
17 24
18typedef struct _List_Scroll_Data { 25typedef struct _List_Scroll_Data {
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index a546fa4..b6b0228 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);
245# include <efl_ui_win_socket.eo.h> 245# include <efl_ui_win_socket.eo.h>
246# include <efl_ui_relative_layout.eo.h> 246# include <efl_ui_relative_layout.eo.h>
247 247
248/* FIXME: Efl.Ui.Text must not use elm_general.h */ 248/* FIXME: Efl.Ui.Text must not use elm_general.h
249# include <elm_general.h> 249# include <elm_general.h>
250# include <efl_text_interactive.eo.h> 250# include <efl_text_interactive.eo.h>
251# include <efl_ui_text.eo.h> 251# include <efl_ui_text.eo.h>
252# include <efl_ui_text_editable.eo.h> 252# include <efl_ui_text_editable.eo.h>
253# include <efl_ui_text_async.eo.h> 253# include <efl_ui_text_async.eo.h>
254*/
254 255
255# include <efl_ui_animation_view.eo.h> 256# include <efl_ui_animation_view.eo.h>
256# include <efl_ui_clock.eo.h> 257# include <efl_ui_clock.eo.h>
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 8cb7ee5..fede13f 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -166,6 +166,13 @@
166# include "efl_ui_selection_manager.eo.h" 166# include "efl_ui_selection_manager.eo.h"
167# include "efl_datetime_manager.eo.h" 167# include "efl_datetime_manager.eo.h"
168 168
169//FIXME this needs to not use elm_general.h and go to Efl_Ui.h
170# include <elm_general.h>
171# include <efl_text_interactive.eo.h>
172# include <efl_ui_text.eo.h>
173# include <efl_ui_text_editable.eo.h>
174# include <efl_ui_text_async.eo.h>
175
169extern const char *_efl_model_property_itemw; 176extern const char *_efl_model_property_itemw;
170extern const char *_efl_model_property_itemh; 177extern const char *_efl_model_property_itemh;
171extern const char *_efl_model_property_selfw; 178extern const char *_efl_model_property_selfw;