summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-02-13 11:58:33 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-02-13 18:09:17 +0100
commit6b7346b7b2b0db05e76cc217966d3304e4cbc41a (patch)
tree20033403a3659e0db98c9e576e10470a4dd54170 /src
parent56f06d21c19cddb056f6ced6822b275c08ebfc3a (diff)
Remove individual class BETA guards
Summary: Eolian adds a per-class BETA guard (like EFL_UI_WIN_BETA) to any method tagged as @beta. This means that any app (and the EFL code) wanting to use BETA features has to enable them class by class, which is cumbersome. This commit replaces the individual guards with the global EFL_BETA_API_SUPPORT guard, so apps only need to define one symbol to access BETA features. Any usage of the per-class guards has been removed from the EFL code and examples. When building EFL the global guard is defined by configure, so all EFL methods already have access to BETA API. Efl_Core.h and Efl_Ui.h no longer define EFL_BETA_API_SUPPORT. Apps wanting to use BETA API have to define this symbol before including any EFL header (It has been added to the examples requiring it). Test Plan: make && make check && make examples still work, but there's a lot less #defines in the code Reviewers: zmike, bu5hm4n, q66 Reviewed By: q66 Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T6788 Differential Revision: https://phab.enlightenment.org/D7924
Diffstat (limited to 'src')
-rw-r--r--src/bin/eolian/headers.c10
-rw-r--r--src/examples/ecore/ecore_promise2_example.c1
-rw-r--r--src/examples/ecore/efl_io_buffered_stream_example.c1
-rw-r--r--src/examples/ecore/efl_io_copier_example.c1
-rw-r--r--src/examples/ecore/efl_io_copier_simple_example.c1
-rw-r--r--src/examples/ecore/efl_io_queue_example.c1
-rw-r--r--src/examples/ecore/efl_net_control_example.c1
-rw-r--r--src/examples/ecore/efl_net_dialer_http_example.c1
-rw-r--r--src/examples/ecore/efl_net_dialer_simple_example.c1
-rw-r--r--src/examples/ecore/efl_net_dialer_udp_example.c1
-rw-r--r--src/examples/ecore/efl_net_dialer_unix_example.c1
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c1
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_example.c1
-rw-r--r--src/examples/ecore/efl_net_server_example.c1
-rw-r--r--src/examples/ecore/efl_net_server_simple_example.c1
-rw-r--r--src/examples/ecore/efl_net_session_example.c1
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_dialer_example.c1
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_server_example.c1
-rw-r--r--src/lib/edje/edje_calc.c1
-rw-r--r--src/lib/edje/edje_edit.c1
-rw-r--r--src/lib/edje/edje_private.h1
-rw-r--r--src/lib/edje/edje_smart.c1
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/eio/eio_sentry.c1
-rw-r--r--src/lib/elementary/efl_access_action.c1
-rw-r--r--src/lib/elementary/efl_access_component.c1
-rw-r--r--src/lib/elementary/efl_access_widget_action.c1
-rw-r--r--src/lib/elementary/efl_ui_anchor_popup.c1
-rw-r--r--src/lib/elementary/efl_ui_dnd.c1
-rw-r--r--src/lib/elementary/efl_ui_grid.c1
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c1
-rw-r--r--src/lib/elementary/efl_ui_internal_text_scroller.c1
-rw-r--r--src/lib/elementary/efl_ui_list.c1
-rw-r--r--src/lib/elementary/efl_ui_list_view.c1
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup.c1
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c1
-rw-r--r--src/lib/elementary/efl_ui_scroller.c1
-rw-r--r--src/lib/elementary/efl_ui_selection.c1
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c1
-rw-r--r--src/lib/elementary/efl_ui_tab_pager.c1
-rw-r--r--src/lib/elementary/efl_ui_widget.c1
-rw-r--r--src/lib/elementary/efl_ui_win.c3
-rw-r--r--src/lib/elementary/elc_ctxpopup.c1
-rw-r--r--src/lib/elementary/elc_fileselector.c1
-rw-r--r--src/lib/elementary/elc_fileselector_button.c1
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c1
-rw-r--r--src/lib/elementary/elementary_config.h10
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c1
-rw-r--r--src/lib/elementary/elm_interface_fileselector.c1
-rw-r--r--src/lib/emotion/emotion_smart.c1
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c2
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c1
-rw-r--r--src/lib/evas/canvas/evas_main.c1
-rw-r--r--src/lib/evas/canvas/evas_object_box.c1
-rw-r--r--src/lib/evas/canvas/evas_object_main.c1
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c1
-rw-r--r--src/lib/evas/canvas/evas_object_table.c2
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c1
-rw-r--r--src/tests/eolian/data/class_simple_ref_eo.h12
59 files changed, 28 insertions, 65 deletions
diff --git a/src/bin/eolian/headers.c b/src/bin/eolian/headers.c
index 70520fc..472043b 100644
--- a/src/bin/eolian/headers.c
+++ b/src/bin/eolian/headers.c
@@ -92,7 +92,7 @@ _gen_func(const Eolian_State *state, const Eolian_Function *fid,
92 92
93 /* this one will never be satisfied in legacy */ 93 /* this one will never be satisfied in legacy */
94 if (eolian_function_is_beta(fid)) 94 if (eolian_function_is_beta(fid))
95 eina_strbuf_append_printf(buf, "#ifdef %s_BETA\n", cnameu); 95 eina_strbuf_append(buf, "#ifdef EFL_BETA_API_SUPPORT\n");
96 /* XXX: is this right? we expose potentially internal stuff into legacy */ 96 /* XXX: is this right? we expose potentially internal stuff into legacy */
97 if (!legacy && (fsc == EOLIAN_SCOPE_PROTECTED)) 97 if (!legacy && (fsc == EOLIAN_SCOPE_PROTECTED))
98 eina_strbuf_append_printf(buf, "#ifdef %s_PROTECTED\n", cnameu); 98 eina_strbuf_append_printf(buf, "#ifdef %s_PROTECTED\n", cnameu);
@@ -174,10 +174,10 @@ _gen_func(const Eolian_State *state, const Eolian_Function *fid,
174 } 174 }
175 eina_strbuf_append(buf, ";\n"); 175 eina_strbuf_append(buf, ";\n");
176 176
177 if (eolian_function_is_beta(fid))
178 eina_strbuf_append_printf(buf, "#endif\n");
179 if (!legacy && (fsc == EOLIAN_SCOPE_PROTECTED)) 177 if (!legacy && (fsc == EOLIAN_SCOPE_PROTECTED))
180 eina_strbuf_append_printf(buf, "#endif\n"); 178 eina_strbuf_append_printf(buf, "#endif\n");
179 if (eolian_function_is_beta(fid))
180 eina_strbuf_append_printf(buf, "#endif /* EFL_BETA_API_SUPPORT */\n");
181} 181}
182 182
183void 183void
@@ -267,7 +267,7 @@ events:
267 267
268 if (eolian_event_is_beta(ev)) 268 if (eolian_event_is_beta(ev))
269 { 269 {
270 eina_strbuf_append_printf(buf, "\n#ifdef %s_BETA\n", cnameu); 270 eina_strbuf_append(buf, "#ifdef EFL_BETA_API_SUPPORT\n");
271 } 271 }
272 if (evs == EOLIAN_SCOPE_PROTECTED) 272 if (evs == EOLIAN_SCOPE_PROTECTED)
273 { 273 {
@@ -292,7 +292,7 @@ events:
292 if (evs == EOLIAN_SCOPE_PROTECTED) 292 if (evs == EOLIAN_SCOPE_PROTECTED)
293 eina_strbuf_append(buf, "#endif\n"); 293 eina_strbuf_append(buf, "#endif\n");
294 if (eolian_event_is_beta(ev)) 294 if (eolian_event_is_beta(ev))
295 eina_strbuf_append(buf, "#endif\n"); 295 eina_strbuf_append(buf, "#endif /* EFL_BETA_API_SUPPORT */\n");
296 296
297 eina_stringshare_del(evn); 297 eina_stringshare_del(evn);
298 } 298 }
diff --git a/src/examples/ecore/ecore_promise2_example.c b/src/examples/ecore/ecore_promise2_example.c
index bdf153d..a88b1ff 100644
--- a/src/examples/ecore/ecore_promise2_example.c
+++ b/src/examples/ecore/ecore_promise2_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT 1
1#include <Efl_Core.h> 2#include <Efl_Core.h>
2#include <stdlib.h> 3#include <stdlib.h>
3#include <errno.h> 4#include <errno.h>
diff --git a/src/examples/ecore/efl_io_buffered_stream_example.c b/src/examples/ecore/efl_io_buffered_stream_example.c
index 3338bae..c7fe102 100644
--- a/src/examples/ecore/efl_io_buffered_stream_example.c
+++ b/src/examples/ecore/efl_io_buffered_stream_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3 4
diff --git a/src/examples/ecore/efl_io_copier_example.c b/src/examples/ecore/efl_io_copier_example.c
index b7e526b..25a8114 100644
--- a/src/examples/ecore/efl_io_copier_example.c
+++ b/src/examples/ecore/efl_io_copier_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_io_copier_simple_example.c b/src/examples/ecore/efl_io_copier_simple_example.c
index ee945cc..0a1fd65 100644
--- a/src/examples/ecore/efl_io_copier_simple_example.c
+++ b/src/examples/ecore/efl_io_copier_simple_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Core.h> 2#include <Efl_Core.h>
2 3
3static void 4static void
diff --git a/src/examples/ecore/efl_io_queue_example.c b/src/examples/ecore/efl_io_queue_example.c
index 9367716..62e6035 100644
--- a/src/examples/ecore/efl_io_queue_example.c
+++ b/src/examples/ecore/efl_io_queue_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3 4
diff --git a/src/examples/ecore/efl_net_control_example.c b/src/examples/ecore/efl_net_control_example.c
index 3053c87..408ea8e 100644
--- a/src/examples/ecore/efl_net_control_example.c
+++ b/src/examples/ecore/efl_net_control_example.c
@@ -1,6 +1,7 @@
1#ifdef HAVE_SYS_SOCKET_H 1#ifdef HAVE_SYS_SOCKET_H
2 #include <sys/socket.h> 2 #include <sys/socket.h>
3#endif 3#endif
4#define EFL_BETA_API_SUPPORT
4#include <Efl_Net.h> 5#include <Efl_Net.h>
5#include <Ecore_Getopt.h> 6#include <Ecore_Getopt.h>
6#include <ctype.h> 7#include <ctype.h>
diff --git a/src/examples/ecore/efl_net_dialer_http_example.c b/src/examples/ecore/efl_net_dialer_http_example.c
index f1a97ee..70861dc 100644
--- a/src/examples/ecore/efl_net_dialer_http_example.c
+++ b/src/examples/ecore/efl_net_dialer_http_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_simple_example.c b/src/examples/ecore/efl_net_dialer_simple_example.c
index 219da89..1285dae 100644
--- a/src/examples/ecore/efl_net_dialer_simple_example.c
+++ b/src/examples/ecore/efl_net_dialer_simple_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_udp_example.c b/src/examples/ecore/efl_net_dialer_udp_example.c
index 3b13a60..bb01b58 100644
--- a/src/examples/ecore/efl_net_dialer_udp_example.c
+++ b/src/examples/ecore/efl_net_dialer_udp_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_unix_example.c b/src/examples/ecore/efl_net_dialer_unix_example.c
index b610dd4..f0298ae 100644
--- a/src/examples/ecore/efl_net_dialer_unix_example.c
+++ b/src/examples/ecore/efl_net_dialer_unix_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
index fd0c098..037a0ac 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_dialer_websocket_example.c b/src/examples/ecore/efl_net_dialer_websocket_example.c
index e0b72e4..e46a8c7 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_example.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c
index d98e66b..b599336 100644
--- a/src/examples/ecore/efl_net_server_example.c
+++ b/src/examples/ecore/efl_net_server_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_server_simple_example.c b/src/examples/ecore/efl_net_server_simple_example.c
index a68e9b9..6477ad2 100644
--- a/src/examples/ecore/efl_net_server_simple_example.c
+++ b/src/examples/ecore/efl_net_server_simple_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_session_example.c b/src/examples/ecore/efl_net_session_example.c
index 683f341..fbefb21 100644
--- a/src/examples/ecore/efl_net_session_example.c
+++ b/src/examples/ecore/efl_net_session_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3 4
diff --git a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
index 45dc189..0bc77c3 100644
--- a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/examples/ecore/efl_net_socket_ssl_server_example.c b/src/examples/ecore/efl_net_socket_ssl_server_example.c
index 2babc8b..33b67d2 100644
--- a/src/examples/ecore/efl_net_socket_ssl_server_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_server_example.c
@@ -1,3 +1,4 @@
1#define EFL_BETA_API_SUPPORT
1#include <Efl_Net.h> 2#include <Efl_Net.h>
2#include <Ecore_Getopt.h> 3#include <Ecore_Getopt.h>
3#include <fcntl.h> 4#include <fcntl.h>
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index cdfcc81..f09265f 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1,4 +1,3 @@
1#define EFL_GFX_FILTER_BETA
2#define EFL_GFX_SIZE_HINT_PROTECTED 1#define EFL_GFX_SIZE_HINT_PROTECTED
3 2
4#include "edje_private.h" 3#include "edje_private.h"
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 859fcc2..010b1af 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -9,7 +9,6 @@
9 9
10#define _EDJE_EDIT_EO_CLASS_TYPE 10#define _EDJE_EDIT_EO_CLASS_TYPE
11#define EFL_CANVAS_GROUP_PROTECTED 11#define EFL_CANVAS_GROUP_PROTECTED
12#define EFL_CANVAS_GROUP_BETA
13 12
14#include "edje_private.h" 13#include "edje_private.h"
15 14
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 98311b8..25a0002 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -40,7 +40,6 @@
40#endif 40#endif
41 41
42// auto_unref 42// auto_unref
43#define EFL_CANVAS_LAYOUT_BETA
44#define EFL_CANVAS_OBJECT_PROTECTED 43#define EFL_CANVAS_OBJECT_PROTECTED
45#define EFL_LAYOUT_CALC_PROTECTED 44#define EFL_LAYOUT_CALC_PROTECTED
46 45
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 5a715b3..b7ca9c0 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -1,5 +1,4 @@
1#define EFL_CANVAS_GROUP_PROTECTED 1#define EFL_CANVAS_GROUP_PROTECTED
2#define EFL_CANVAS_GROUP_BETA
3#define EFL_PART_PROTECTED 2#define EFL_PART_PROTECTED
4 3
5#include "edje_private.h" 4#include "edje_private.h"
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 75ffcd9..aee8602 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -2,9 +2,7 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#define EFL_CANVAS_SCENE_BETA
6#define EFL_UI_SCROLLBAR_PROTECTED 5#define EFL_UI_SCROLLBAR_PROTECTED
7#define EFL_UI_SCROLLBAR_BETA
8#define EFL_PART_PROTECTED 6#define EFL_PART_PROTECTED
9 7
10#include "eo_internal.h" 8#include "eo_internal.h"
diff --git a/src/lib/eio/eio_sentry.c b/src/lib/eio/eio_sentry.c
index 84b958f..20ca327 100644
--- a/src/lib/eio/eio_sentry.c
+++ b/src/lib/eio/eio_sentry.c
@@ -21,7 +21,6 @@
21# include <config.h> 21# include <config.h>
22#endif 22#endif
23 23
24#define EIO_SENTRY_BETA 1
25 24
26#include <Eo.h> 25#include <Eo.h>
27#include "Ecore.h" 26#include "Ecore.h"
diff --git a/src/lib/elementary/efl_access_action.c b/src/lib/elementary/efl_access_action.c
index 8e56d79..da5cd1b 100644
--- a/src/lib/elementary/efl_access_action.c
+++ b/src/lib/elementary/efl_access_action.c
@@ -3,7 +3,6 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_ACTION_PROTECTED 5#define EFL_ACCESS_ACTION_PROTECTED
6#define EFL_ACCESS_ACTION_BETA
7 6
8#include <Elementary.h> 7#include <Elementary.h>
9#include "elm_widget.h" 8#include "elm_widget.h"
diff --git a/src/lib/elementary/efl_access_component.c b/src/lib/elementary/efl_access_component.c
index f4a3c65..83f7640 100644
--- a/src/lib/elementary/efl_access_component.c
+++ b/src/lib/elementary/efl_access_component.c
@@ -3,7 +3,6 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_COMPONENT_PROTECTED 5#define EFL_ACCESS_COMPONENT_PROTECTED
6#define EFL_ACCESS_COMPONENT_BETA
7#define EFL_ACCESS_OBJECT_PROTECTED 6#define EFL_ACCESS_OBJECT_PROTECTED
8 7
9#include <Elementary.h> 8#include <Elementary.h>
diff --git a/src/lib/elementary/efl_access_widget_action.c b/src/lib/elementary/efl_access_widget_action.c
index bb0c920..47b2f27 100644
--- a/src/lib/elementary/efl_access_widget_action.c
+++ b/src/lib/elementary/efl_access_widget_action.c
@@ -4,7 +4,6 @@
4 4
5#define EFL_ACCESS_ACTION_PROTECTED 5#define EFL_ACCESS_ACTION_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define EFL_ACCESS_ACTION_BETA
8 7
9#include <Elementary.h> 8#include <Elementary.h>
10#include "elm_widget.h" 9#include "elm_widget.h"
diff --git a/src/lib/elementary/efl_ui_anchor_popup.c b/src/lib/elementary/efl_ui_anchor_popup.c
index 9b0e9c6..88e2269 100644
--- a/src/lib/elementary/efl_ui_anchor_popup.c
+++ b/src/lib/elementary/efl_ui_anchor_popup.c
@@ -3,7 +3,6 @@
3#endif 3#endif
4 4
5#define EFL_UI_POPUP_PROTECTED 5#define EFL_UI_POPUP_PROTECTED
6#define EFL_UI_ANCHOR_POPUP_BETA
7 6
8#include <Elementary.h> 7#include <Elementary.h>
9 8
diff --git a/src/lib/elementary/efl_ui_dnd.c b/src/lib/elementary/efl_ui_dnd.c
index 4ed23e7..df79eb9 100644
--- a/src/lib/elementary/efl_ui_dnd.c
+++ b/src/lib/elementary/efl_ui_dnd.c
@@ -7,7 +7,6 @@
7#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED 7#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED
8#define ELM_LAYOUT_PROTECTED 8#define ELM_LAYOUT_PROTECTED
9 9
10#define EFL_UI_SELECTION_MANAGER_BETA
11 10
12#include <Elementary.h> 11#include <Elementary.h>
13#include <Elementary_Cursor.h> 12#include <Elementary_Cursor.h>
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 4db9968..c9ecd82 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -5,7 +5,6 @@
5#define ELM_LAYOUT_PROTECTED 5#define ELM_LAYOUT_PROTECTED
6#define EFL_UI_SCROLL_MANAGER_PROTECTED 6#define EFL_UI_SCROLL_MANAGER_PROTECTED
7#define EFL_UI_SCROLLBAR_PROTECTED 7#define EFL_UI_SCROLLBAR_PROTECTED
8#define EFL_UI_SCROLLBAR_BETA
9 8
10#include <Elementary.h> 9#include <Elementary.h>
11#include "elm_priv.h" 10#include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 9590838..16876a0 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -6,7 +6,6 @@
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define EFL_UI_SCROLL_MANAGER_PROTECTED 7#define EFL_UI_SCROLL_MANAGER_PROTECTED
8#define EFL_UI_SCROLLBAR_PROTECTED 8#define EFL_UI_SCROLLBAR_PROTECTED
9#define EFL_UI_SCROLLBAR_BETA
10 9
11#include <Elementary.h> 10#include <Elementary.h>
12 11
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.c b/src/lib/elementary/efl_ui_internal_text_scroller.c
index 9ff9934..237343a 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.c
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.c
@@ -5,7 +5,6 @@
5#define ELM_LAYOUT_PROTECTED 5#define ELM_LAYOUT_PROTECTED
6#define EFL_UI_SCROLL_MANAGER_PROTECTED 6#define EFL_UI_SCROLL_MANAGER_PROTECTED
7#define EFL_UI_SCROLLBAR_PROTECTED 7#define EFL_UI_SCROLLBAR_PROTECTED
8#define EFL_UI_SCROLLBAR_BETA
9 8
10#ifdef HAVE_CONFIG_H 9#ifdef HAVE_CONFIG_H
11# include "elementary_config.h" 10# include "elementary_config.h"
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 1a0f9aa..e7d4bfc 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -5,7 +5,6 @@
5#define ELM_LAYOUT_PROTECTED 5#define ELM_LAYOUT_PROTECTED
6#define EFL_UI_SCROLL_MANAGER_PROTECTED 6#define EFL_UI_SCROLL_MANAGER_PROTECTED
7#define EFL_UI_SCROLLBAR_PROTECTED 7#define EFL_UI_SCROLLBAR_PROTECTED
8#define EFL_UI_SCROLLBAR_BETA
9 8
10#include <Elementary.h> 9#include <Elementary.h>
11#include "elm_priv.h" 10#include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 5481803..fe45469 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -5,7 +5,6 @@
5#define EFL_ACCESS_SELECTION_PROTECTED 5#define EFL_ACCESS_SELECTION_PROTECTED
6#define EFL_UI_SCROLL_MANAGER_PROTECTED 6#define EFL_UI_SCROLL_MANAGER_PROTECTED
7#define EFL_UI_SCROLLBAR_PROTECTED 7#define EFL_UI_SCROLLBAR_PROTECTED
8#define EFL_UI_SCROLLBAR_BETA
9#define EFL_UI_FOCUS_COMPOSITION_PROTECTED 8#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
10#define EFL_UI_WIDGET_FOCUS_MANAGER_PROTECTED 9#define EFL_UI_WIDGET_FOCUS_MANAGER_PROTECTED
11 10
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c
index 3e7c8d9..d23e291 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.c
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.c
@@ -2,7 +2,6 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_UI_SCROLL_ALERT_POPUP_BETA
6#define EFL_PART_PROTECTED 5#define EFL_PART_PROTECTED
7 6
8#include <Elementary.h> 7#include <Elementary.h>
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c
index d88e0d4..866b79e 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -4,7 +4,6 @@
4 4
5#define EFL_UI_SCROLL_MANAGER_PROTECTED 5#define EFL_UI_SCROLL_MANAGER_PROTECTED
6#define EFL_UI_SCROLLBAR_PROTECTED 6#define EFL_UI_SCROLLBAR_PROTECTED
7#define EFL_UI_SCROLLBAR_BETA
8 7
9#include <Elementary.h> 8#include <Elementary.h>
10#include "elm_priv.h" 9#include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index ef8cc1a..be2e773 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -5,7 +5,6 @@
5#define ELM_LAYOUT_PROTECTED 5#define ELM_LAYOUT_PROTECTED
6#define EFL_UI_SCROLL_MANAGER_PROTECTED 6#define EFL_UI_SCROLL_MANAGER_PROTECTED
7#define EFL_UI_SCROLLBAR_PROTECTED 7#define EFL_UI_SCROLLBAR_PROTECTED
8#define EFL_UI_SCROLLBAR_BETA
9 8
10#include <Elementary.h> 9#include <Elementary.h>
11#include "elm_priv.h" 10#include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_selection.c b/src/lib/elementary/efl_ui_selection.c
index 2fd60c4..675eb0c 100644
--- a/src/lib/elementary/efl_ui_selection.c
+++ b/src/lib/elementary/efl_ui_selection.c
@@ -2,7 +2,6 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_UI_SELECTION_MANAGER_BETA
6 5
7#include <Elementary.h> 6#include <Elementary.h>
8#include "elm_priv.h" 7#include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index f7b37f3..f191f87 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -2,7 +2,6 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_UI_TAB_BAR_BETA
6 5
7#include <Elementary.h> 6#include <Elementary.h>
8#include "elm_priv.h" 7#include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_tab_pager.c b/src/lib/elementary/efl_ui_tab_pager.c
index 5fbae19..45758cb 100644
--- a/src/lib/elementary/efl_ui_tab_pager.c
+++ b/src/lib/elementary/efl_ui_tab_pager.c
@@ -2,7 +2,6 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_UI_TAB_BAR_BETA
6 5
7#include <Elementary.h> 6#include <Elementary.h>
8#include "elm_priv.h" 7#include "elm_priv.h"
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 67a2a01..5840051 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -6,7 +6,6 @@
6#define EFL_ACCESS_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define ELM_WIDGET_ITEM_PROTECTED 8#define ELM_WIDGET_ITEM_PROTECTED
9#define EFL_CANVAS_OBJECT_BETA
10#define EFL_INPUT_EVENT_PROTECTED 9#define EFL_INPUT_EVENT_PROTECTED
11#define EFL_UI_L10N_PROTECTED 10#define EFL_UI_L10N_PROTECTED
12#define EFL_UI_FOCUS_OBJECT_PROTECTED 11#define EFL_UI_FOCUS_OBJECT_PROTECTED
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 74d741f..442194e 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7,13 +7,10 @@
7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
8#define EFL_INPUT_EVENT_PROTECTED 8#define EFL_INPUT_EVENT_PROTECTED
9#define EFL_GFX_SIZE_HINT_PROTECTED 9#define EFL_GFX_SIZE_HINT_PROTECTED
10#define EFL_CANVAS_OBJECT_BETA
11#define EFL_CANVAS_OBJECT_PROTECTED 10#define EFL_CANVAS_OBJECT_PROTECTED
12#define EFL_UI_L10N_PROTECTED 11#define EFL_UI_L10N_PROTECTED
13#define EFL_UI_WIN_INLINED_PROTECTED 12#define EFL_UI_WIN_INLINED_PROTECTED
14#define EFL_UI_FOCUS_OBJECT_PROTECTED 13#define EFL_UI_FOCUS_OBJECT_PROTECTED
15#define EFL_UI_WIN_BETA
16#define EFL_CANVAS_SCENE_BETA
17#define EFL_UI_WIDGET_FOCUS_MANAGER_PROTECTED 14#define EFL_UI_WIDGET_FOCUS_MANAGER_PROTECTED
18#define EFL_PART_PROTECTED 15#define EFL_PART_PROTECTED
19#define IPA_YLNO_ESU_LANRETNI_MLE 16#define IPA_YLNO_ESU_LANRETNI_MLE
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index fd8a433..dabc798 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -5,7 +5,6 @@
5#define EFL_ACCESS_OBJECT_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define EFL_UI_WIDGET_PROTECTED 7#define EFL_UI_WIDGET_PROTECTED
8//#define EFL_UI_WIDGET_BETA
9#define ELM_WIDGET_ITEM_PROTECTED 8#define ELM_WIDGET_ITEM_PROTECTED
10#define EFL_UI_L10N_PROTECTED 9#define EFL_UI_L10N_PROTECTED
11#define EFL_PART_PROTECTED 10#define EFL_PART_PROTECTED
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 0001287..6dabb93 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -11,7 +11,6 @@
11 11
12#define EFL_ACCESS_OBJECT_PROTECTED 12#define EFL_ACCESS_OBJECT_PROTECTED
13#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 13#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
14#define ELM_INTERFACE_FILESELECTOR_BETA
15#define EFL_PART_PROTECTED 14#define EFL_PART_PROTECTED
16#define EFL_UI_FOCUS_COMPOSITION_PROTECTED 15#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
17 16
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 82b9c69..6724a0e 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -3,7 +3,6 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_OBJECT_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_INTERFACE_FILESELECTOR_BETA
7 6
8#include <Elementary.h> 7#include <Elementary.h>
9#include "Eio_Eo.h" 8#include "Eio_Eo.h"
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 1a963bd..0c0290e 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -4,7 +4,6 @@
4#endif 4#endif
5 5
6#define EFL_ACCESS_OBJECT_PROTECTED 6#define EFL_ACCESS_OBJECT_PROTECTED
7#define ELM_INTERFACE_FILESELECTOR_BETA
8#define EFL_PART_PROTECTED 7#define EFL_PART_PROTECTED
9 8
10#include <Elementary.h> 9#include <Elementary.h>
diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h
index c726711..9bff045 100644
--- a/src/lib/elementary/elementary_config.h
+++ b/src/lib/elementary/elementary_config.h
@@ -11,17 +11,7 @@
11 11
12#if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC) 12#if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC)
13#define EFL_UI_WIDGET_PROTECTED 13#define EFL_UI_WIDGET_PROTECTED
14#define EFL_UI_WIDGET_BETA
15#define EFL_CANVAS_OBJECT_PROTECTED 14#define EFL_CANVAS_OBJECT_PROTECTED
16#define EFL_CANVAS_GROUP_PROTECTED 15#define EFL_CANVAS_GROUP_PROTECTED
17#define EFL_CANVAS_GROUP_BETA
18#define EFL_ACCESS_OBJECT_BETA
19#define EFL_ACCESS_COMPONENT_BETA
20#define EFL_ACCESS_EDITABLE_TEXT_BETA
21#define EFL_ACCESS_IMAGE_BETA
22#define EFL_ACCESS_SELECTION_BETA
23#define EFL_ACCESS_TEXT_BETA
24#define EFL_ACCESS_VALUE_BETA
25#define EFL_ACCESS_WIDGET_ACTION_BETA
26#define EFL_UI_FOCUS_OBJECT_PROTECTED 16#define EFL_UI_FOCUS_OBJECT_PROTECTED
27#endif 17#endif
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 91ad3df..4b1eb17 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -10,7 +10,6 @@
10#define EFL_ACCESS_TEXT_PROTECTED 10#define EFL_ACCESS_TEXT_PROTECTED
11#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED 11#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
12 12
13#define EFL_ACCESS_ACTION_BETA
14 13
15#include "atspi/atspi-constants.h" 14#include "atspi/atspi-constants.h"
16 15
diff --git a/src/lib/elementary/elm_interface_fileselector.c b/src/lib/elementary/elm_interface_fileselector.c
index 0919111..cd2c195 100644
--- a/src/lib/elementary/elm_interface_fileselector.c
+++ b/src/lib/elementary/elm_interface_fileselector.c
@@ -2,7 +2,6 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_FILESELECTOR_BETA
6 5
7#include <Elementary.h> 6#include <Elementary.h>
8#include "Eio_Eo.h" 7#include "Eio_Eo.h"
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 8e59f0a..ed5eb36 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -4,7 +4,6 @@
4 4
5#define EFL_CANVAS_OBJECT_PROTECTED 5#define EFL_CANVAS_OBJECT_PROTECTED
6#define EFL_CANVAS_GROUP_PROTECTED 6#define EFL_CANVAS_GROUP_PROTECTED
7#define EFL_CANVAS_GROUP_BETA
8 7
9#include <Evas.h> 8#include <Evas.h>
10#include <Ecore.h> 9#include <Ecore.h>
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 2cd1f51..6c55790 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -1,5 +1,3 @@
1#define EFL_CANVAS_OBJECT_BETA
2#define EVAS_CANVAS_BETA
3 1
4#include "evas_common_private.h" 2#include "evas_common_private.h"
5#include "evas_private.h" 3#include "evas_private.h"
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index 9891a68..75f4c2c 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -1,4 +1,3 @@
1#define EFL_CANVAS_OBJECT_BETA
2 1
3#include "evas_image_private.h" 2#include "evas_image_private.h"
4#include "evas_image.eo.h" 3#include "evas_image.eo.h"
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 0d574c5..1c70871 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1,4 +1,3 @@
1#define EVAS_CANVAS_BETA
2#define EFL_INPUT_EVENT_PROTECTED 1#define EFL_INPUT_EVENT_PROTECTED
3 2
4#include "evas_common_private.h" 3#include "evas_common_private.h"
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index fb81776..4964713 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -1,5 +1,4 @@
1#define EFL_CANVAS_GROUP_PROTECTED 1#define EFL_CANVAS_GROUP_PROTECTED
2#define EFL_CANVAS_GROUP_BETA
3 2
4#include "evas_common_private.h" 3#include "evas_common_private.h"
5#include "evas_private.h" 4#include "evas_private.h"
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 8f218fa..aa0ac83 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1,5 +1,4 @@
1#define EFL_CANVAS_OBJECT_PROTECTED 1#define EFL_CANVAS_OBJECT_PROTECTED
2#define EFL_CANVAS_OBJECT_BETA
3#define EFL_GFX_SIZE_HINT_PROTECTED 2#define EFL_GFX_SIZE_HINT_PROTECTED
4 3
5#include "evas_common_private.h" 4#include "evas_common_private.h"
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index a5ff430..03e036b 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1,5 +1,4 @@
1#define EFL_CANVAS_GROUP_PROTECTED 1#define EFL_CANVAS_GROUP_PROTECTED
2#define EFL_CANVAS_GROUP_BETA
3 2
4#include "evas_common_private.h" 3#include "evas_common_private.h"
5#include "evas_private.h" 4#include "evas_private.h"
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index bc18487..fb49c4a 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -1,6 +1,4 @@
1#define EFL_CANVAS_OBJECT_BETA
2#define EFL_CANVAS_GROUP_PROTECTED 1#define EFL_CANVAS_GROUP_PROTECTED
3#define EFL_CANVAS_GROUP_BETA
4 2
5#include "evas_common_private.h" 3#include "evas_common_private.h"
6#include "evas_private.h" 4#include "evas_private.h"
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index e73bea0..578db64 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -62,7 +62,6 @@
62 * @todo write @ref textblock_layout 62 * @todo write @ref textblock_layout
63 */ 63 */
64 64
65#define EFL_CANVAS_OBJECT_BETA
66#define EFL_CANVAS_FILTER_INTERNAL_PROTECTED 65#define EFL_CANVAS_FILTER_INTERNAL_PROTECTED
67 66
68#include "evas_common_private.h" 67#include "evas_common_private.h"
diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h
index 16a690d..1b63422 100644
--- a/src/tests/eolian/data/class_simple_ref_eo.h
+++ b/src/tests/eolian/data/class_simple_ref_eo.h
@@ -41,7 +41,7 @@ EWAPI extern long BAZ;
41 41
42EWAPI const Efl_Class *class_simple_class_get(void); 42EWAPI const Efl_Class *class_simple_class_get(void);
43 43
44#ifdef CLASS_SIMPLE_BETA 44#ifdef EFL_BETA_API_SUPPORT
45/** 45/**
46 * @brief Common desc for a 46 * @brief Common desc for a
47 * 47 *
@@ -55,9 +55,9 @@ EWAPI const Efl_Class *class_simple_class_get(void);
55 * @ingroup Class_Simple 55 * @ingroup Class_Simple
56 */ 56 */
57EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value); 57EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value);
58#endif 58#endif /* EFL_BETA_API_SUPPORT */
59 59
60#ifdef CLASS_SIMPLE_BETA 60#ifdef EFL_BETA_API_SUPPORT
61/** 61/**
62 * @brief Common desc for a 62 * @brief Common desc for a
63 * 63 *
@@ -68,11 +68,11 @@ EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value);
68 * @ingroup Class_Simple 68 * @ingroup Class_Simple
69 */ 69 */
70EOAPI int efl_canvas_object_simple_a_get(const Eo *obj); 70EOAPI int efl_canvas_object_simple_a_get(const Eo *obj);
71#endif 71#endif /* EFL_BETA_API_SUPPORT */
72 72
73EOAPI void efl_canvas_object_simple_b_set(Eo *obj); 73EOAPI void efl_canvas_object_simple_b_set(Eo *obj);
74 74
75#ifdef CLASS_SIMPLE_BETA 75#ifdef EFL_BETA_API_SUPPORT
76/** 76/**
77 * @brief comment foo 77 * @brief comment foo
78 * 78 *
@@ -87,7 +87,7 @@ EOAPI void efl_canvas_object_simple_b_set(Eo *obj);
87 * @ingroup Class_Simple 87 * @ingroup Class_Simple
88 */ 88 */
89EOAPI char *efl_canvas_object_simple_foo(Eo *obj, int a, char *b, double *c, int *d); 89EOAPI char *efl_canvas_object_simple_foo(Eo *obj, int a, char *b, double *c, int *d);
90#endif 90#endif /* EFL_BETA_API_SUPPORT */
91 91
92EOAPI int *efl_canvas_object_simple_bar(Eo *obj, int x); 92EOAPI int *efl_canvas_object_simple_bar(Eo *obj, int x);
93 93