summaryrefslogtreecommitdiff
path: root/src/lib
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/lib
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 '')
-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
40 files changed, 0 insertions, 54 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index cdfcc81732..f09265f37b 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 859fcc2851..010b1aff6b 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 98311b8525..25a00022b4 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 5a715b35ed..b7ca9c02d2 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 75ffcd984c..aee86025d6 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 84b958f694..20ca327282 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 8e56d79fd2..da5cd1b4e2 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 f4a3c653bc..83f7640249 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 bb0c920f49..47b2f2724a 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 9b0e9c680d..88e2269826 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 4ed23e7d76..df79eb9762 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 4db9968d90..c9ecd825b5 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 9590838c1e..16876a068c 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 9ff9934b79..237343a024 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 1a0f9aa812..e7d4bfced9 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 5481803e4e..fe454690a0 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 3e7c8d9b5e..d23e2919b3 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 d88e0d4b15..866b79e11c 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 ef8cc1a52b..be2e773bc4 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 2fd60c4a38..675eb0cf99 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 f7b37f3799..f191f87e02 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 5fbae19c3c..45758cbc98 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 67a2a01bba..5840051086 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 74d741f4e2..442194e1cb 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 fd8a4337e5..dabc798777 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 0001287ca7..6dabb93164 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 82b9c699f2..6724a0e080 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 1a963bd6d8..0c0290ea88 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 c726711d94..9bff045c04 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 91ad3dfc93..4b1eb17609 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 091911100a..cd2c1957c6 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 8e59f0ac6b..ed5eb36f34 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 2cd1f51fd9..6c55790d1c 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 9891a68b15..75f4c2cfc0 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 0d574c5418..1c70871c96 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 fb8177639f..49647136f0 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 8f218fa8c2..aa0ac8359a 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 a5ff430772..03e036beab 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 bc18487e95..fb49c4abc4 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 e73bea08ab..578db6427f 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"