efl: remove EFL_EO_API_SUPPORT macro

Summary:
Since we're now going to be shipping some eo classes as stable,
there is no point in keeping the eo api behind a macro, and it
should be enabled by default. Another case is beta classes, but
those are behind the EFL_BETA_API_SUPPORT guard.

This also changes includes around the place where things are
clearly broken (such as an included header needing something
from another header but that other header being guarded, notably
efl_ui_widget.h needing focus manager but focus manager being
behind beta in Elementary.h)

Reviewers: zmike, cedric, bu5hm4n, stefan_schmidt, segfaultxavi

Reviewed By: cedric, segfaultxavi

Subscribers: segfaultxavi, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8322

Change-Id: I2161b4b1aa388f968641fa6b0d318597bd30d964

diff --git a/configure.ac b/configure.ac
index d2adc9b6fe4fc83ecf39223031bad6844b82a2f8..49ed6db9a992e8e7e6d0ab765250e796d1d2e84c 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,6 @@ CXXFLAGS="${CXXFLAGS} -Wno-shadow" # No shadow warnings
 #### Apply configuring with legacy api's only, eo api's or both.
 
 EFL_API_LEGACY_DEF="#define EFL_NOLEGACY_API_SUPPORT"
-EFL_API_EO_DEF="#define EFL_EO_API_SUPPORT"
 efl_api="both"
 
 #### For the moment the Eo EFL API is not ready you need to explicitly optin.
@@ -43,22 +42,15 @@ AC_ARG_WITH([api],
 case "$efl_api" in
     eo)
         EFL_API_LEGACY_DEF="#define EFL_NOLEGACY_API_SUPPORT"
-        EFL_API_EO_DEF="#define EFL_EO_API_SUPPORT"
         CFOPT_WARNING="xyes"
         ;;
-    legacy)
+    legacy|both)
         EFL_API_LEGACY_DEF=""
-        EFL_API_EO_DEF=""
-        ;;
-    both)
-        EFL_API_LEGACY_DEF=""
-        EFL_API_EO_DEF="#define EFL_EO_API_SUPPORT"
         ;;
     *) AC_MSG_ERROR([Invalid api (${efl_api}): must be eo, legacy or both]) ;;
 esac
 
 AC_SUBST(EFL_API_LEGACY_DEF)
-AC_SUBST(EFL_API_EO_DEF)
 
 #### Additional options to configure
 

diff --git a/meson.build b/meson.build
index 3fbf2ad7b56e57df823426aedbcb43e737030ae9..c6d30b4d069b1cb2accc284a1948bddc2f439b60 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -97,7 +97,6 @@ add_global_arguments(dev_cflags, language: 'cpp')
 foreach lang : ['c', 'objc', 'cpp']
   add_global_arguments('-DHAVE_CONFIG_H=1', language: lang)
   add_global_arguments('-D_GNU_SOURCE=1', language: lang)
-  add_global_arguments('-DEFL_EO_API_SUPPORT=1', language: lang)
   add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang)
   add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang)
   add_global_arguments('-DEFL_BUILD=1', language: lang)
@@ -479,7 +478,6 @@ efl_config_h.set('EFL_VERSION_MICRO', version_micro)
 efl_config_h.set('EFL_BUILD_ID', get_option('build-id'))
 
 #FIXME placeholder
-efl_config_h.set('EFL_API_EO_DEF', '#define EFL_API_EO_DEF "FIXME NOT IMPLEMENTED"')
 efl_config_h.set('EFL_API_LEGACY_DEF', '#define EFL_API_LEGACY_DEF "FIXME NOT IMPLEMENTED"')
 
 configure_file(

diff --git a/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c b/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
index 02d22ecdb663f9be4dc806376c32c122dca27a47..526a3761f670cc329b4305915707e65b7a8f7314 100644 (file)
--- a/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
+++ b/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
@@ -3,7 +3,6 @@
 #endif
 
 #define EFL_BETA_API_SUPPORT 1
-#define EFL_EO_API_SUPPORT 1
 #include <Eet.h>
 #include <Ecore.h>
 #include <Ecore_Con.h>

diff --git a/src/bin/efl/efl_debugd.c b/src/bin/efl/efl_debugd.c
index 7baffd464d4fccb57885d36faac8c8690a3bf90d..3962aa6a80ab66e24267a3a7e26ea167f0f0000e 100644 (file)
--- a/src/bin/efl/efl_debugd.c
+++ b/src/bin/efl/efl_debugd.c
@@ -21,7 +21,6 @@
 #endif
 
 #define EFL_BETA_API_SUPPORT 1
-#define EFL_EO_API_SUPPORT 1
 
 #include <fcntl.h>
 #include "eina_debug_private.h"

diff --git a/src/examples/ecore/ecore_evas_vnc_example.c b/src/examples/ecore/ecore_evas_vnc_example.c
index c3d1ac7cfdb8751cb5271c51450101a969f9415b..2796771a9c0994210a032fbaec9fffc997fc558e 100644 (file)
--- a/src/examples/ecore/ecore_evas_vnc_example.c
+++ b/src/examples/ecore/ecore_evas_vnc_example.c
@@ -1,4 +1,3 @@
-#define EFL_EO_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
 
 #include <Efl.h>

diff --git a/src/examples/ecore/ecore_evas_wayland_multiseat_example.c b/src/examples/ecore/ecore_evas_wayland_multiseat_example.c
index 3aec0fa524c97d1e6d1ef52c6711b988106eed32..dc1d53747896792748dc55ff62319b6abb34d36c 100644 (file)
--- a/src/examples/ecore/ecore_evas_wayland_multiseat_example.c
+++ b/src/examples/ecore/ecore_evas_wayland_multiseat_example.c
@@ -1,4 +1,3 @@
-#define EFL_EO_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
 
 #include <Efl.h>

diff --git a/src/examples/ecore/efl_exe.c b/src/examples/ecore/efl_exe.c
index e50d49588c2fd3389c5d647c13e5f37996fdd16c..f435bcadd25e5217dec61091223b9fdd924afad7 100644 (file)
--- a/src/examples/ecore/efl_exe.c
+++ b/src/examples/ecore/efl_exe.c
@@ -1,5 +1,4 @@
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 
 #include <stdio.h>
 #include <string.h>

diff --git a/src/examples/ecore/efl_net_ip_address_example.c b/src/examples/ecore/efl_net_ip_address_example.c
index 0097c2ac72e3c02cbf1ec411ef24e7fa0d48e8c0..b2bc9c66756828525459c77f52beceeb05bfd035 100644 (file)
--- a/src/examples/ecore/efl_net_ip_address_example.c
+++ b/src/examples/ecore/efl_net_ip_address_example.c
@@ -1,5 +1,4 @@
 #define EFL_BETA_API_SUPPORT 1
-#define EFL_EO_API_SUPPORT 1
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif

diff --git a/src/examples/ecore/efl_thread.c b/src/examples/ecore/efl_thread.c
index a0b1a3a4eba2ffb9617ce55c1fbd194bde3e0ffc..0298be15d05c45e1ee6412779475934089a8c217 100644 (file)
--- a/src/examples/ecore/efl_thread.c
+++ b/src/examples/ecore/efl_thread.c
@@ -1,5 +1,4 @@
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 
 #include <stdio.h>
 #include <string.h>

diff --git a/src/examples/elementary/efl_canvas_layout_text.c b/src/examples/elementary/efl_canvas_layout_text.c
index da0e089c014ecab6775a7a3cd0a6b0e3918a9608..bb4fa7b97cb15dd7fa2e8653b98ee84505bc7e22 100644 (file)
--- a/src/examples/elementary/efl_canvas_layout_text.c
+++ b/src/examples/elementary/efl_canvas_layout_text.c
@@ -6,7 +6,6 @@
 # include "elementary_config.h"
 #else
 # define EFL_BETA_API_SUPPORT 1
-# define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Efl.h>

diff --git a/src/examples/elementary/efl_ui_grid_example_1.c b/src/examples/elementary/efl_ui_grid_example_1.c
index 92379fe6e4ff78d95018ff8aa00a88d8afb7db4b..6fe455c9046dde467aecf7f089d6dfdff19c7b3f 100644 (file)
--- a/src/examples/elementary/efl_ui_grid_example_1.c
+++ b/src/examples/elementary/efl_ui_grid_example_1.c
@@ -4,7 +4,6 @@
 #include "elementary_config.h"
 #else
 #define EFL_BETA_API_SUPPORT 1
-#define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Efl_Ui.h>

diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index cad8e112add232c4323e39d415b9d19ac9f66a46..071eb329632404d779610900e4a1bb74ce313df2 100644 (file)
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -5,7 +5,6 @@
 # include "elementary_config.h"
 #else
 # define EFL_BETA_API_SUPPORT 1
-# define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Efl_Ui.h>

diff --git a/src/examples/elementary/efl_ui_list_view_example_1.c b/src/examples/elementary/efl_ui_list_view_example_1.c
index 3943a7793b9a231766dfe400820ece08aef5750f..04ae147f2a735f20ff3851fde1132204fa4c3901 100644 (file)
--- a/src/examples/elementary/efl_ui_list_view_example_1.c
+++ b/src/examples/elementary/efl_ui_list_view_example_1.c
@@ -4,7 +4,6 @@
 # include "elementary_config.h"
 #else
 # define EFL_BETA_API_SUPPORT 1
-# define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Efl_Ui.h>

diff --git a/src/examples/elementary/efl_ui_list_view_example_2.c b/src/examples/elementary/efl_ui_list_view_example_2.c
index 8e47d9222a0192c260bfa39e99b19802a02bad8e..a843f6ed9cfc9e50dfb1d4c477b1014a6d19c892 100644 (file)
--- a/src/examples/elementary/efl_ui_list_view_example_2.c
+++ b/src/examples/elementary/efl_ui_list_view_example_2.c
@@ -4,7 +4,6 @@
 # include "config.h"
 #else
 # define EFL_BETA_API_SUPPORT 1
-# define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Efl_Ui.h>

diff --git a/src/examples/elementary/efl_ui_list_view_example_3.c b/src/examples/elementary/efl_ui_list_view_example_3.c
index 9cc4c8efdeb049a898e38cec92902415c5d5df67..c027856df7ef4acb171c6205b350d41c3080766d 100644 (file)
--- a/src/examples/elementary/efl_ui_list_view_example_3.c
+++ b/src/examples/elementary/efl_ui_list_view_example_3.c
@@ -4,7 +4,6 @@
 # include "config.h"
 #else
 # define EFL_BETA_API_SUPPORT 1
-# define EFL_EO_API_SUPPORT 1
 #endif
 
 #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED

diff --git a/src/examples/elementary/efl_ui_relative_layout_example_01.c b/src/examples/elementary/efl_ui_relative_layout_example_01.c
index 7ccec35651b860e23c44c2a717daff36f305b668..e2d2af794857f516c77956561a9373cecf78a8f3 100644 (file)
--- a/src/examples/elementary/efl_ui_relative_layout_example_01.c
+++ b/src/examples/elementary/efl_ui_relative_layout_example_01.c
@@ -4,7 +4,6 @@
 #include "elementary_config.h"
 #else
 #define EFL_BETA_API_SUPPORT 1
-#define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Efl_Ui.h>

diff --git a/src/examples/elementary/efl_ui_relative_layout_example_02.c b/src/examples/elementary/efl_ui_relative_layout_example_02.c
index 14af786cd6523cf39b334c895d47d62a062b5e7a..fe254633bb895b075a2e6ceb44d9731ba1f5c080 100644 (file)
--- a/src/examples/elementary/efl_ui_relative_layout_example_02.c
+++ b/src/examples/elementary/efl_ui_relative_layout_example_02.c
@@ -4,7 +4,6 @@
 #include "elementary_config.h"
 #else
 #define EFL_BETA_API_SUPPORT 1
-#define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Efl_Ui.h>

diff --git a/src/examples/elementary/efl_ui_scroller_example.c b/src/examples/elementary/efl_ui_scroller_example.c
index e76254d8aade0e8afda1e3066b98be7ec224333d..90e6f5594198c41c871c2a6bdaa7a7b8c7633ff9 100644 (file)
--- a/src/examples/elementary/efl_ui_scroller_example.c
+++ b/src/examples/elementary/efl_ui_scroller_example.c
@@ -2,7 +2,6 @@
 //gcc -g efl_ui_scroller_example.c -o efl_ui_scroller_example `pkg-config --cflags --libs elementary`
 
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 
 #include <Efl_Ui.h>
 #include <Elementary.h>

diff --git a/src/examples/elementary/efl_ui_theme_example_01.c b/src/examples/elementary/efl_ui_theme_example_01.c
index 29614c8f3b4a761229d5898b04b7a4c54a810b8a..15e1017e50a2b15ee9483b19667918e8b72c7c03 100644 (file)
--- a/src/examples/elementary/efl_ui_theme_example_01.c
+++ b/src/examples/elementary/efl_ui_theme_example_01.c
@@ -3,7 +3,6 @@
  * gcc -o efl_ui_theme_example_01 efl_ui_theme_example_01.c `pkg-config --cflags --libs elementary`
  */
 #define EFL_BETA_API_SUPPORT 1
-#define EFL_EO_API_SUPPORT 1
 
 #define EFL_UI_WIDGET_PROTECTED
 #include <Efl_Ui.h>

diff --git a/src/examples/elementary/efl_ui_theme_example_02.c b/src/examples/elementary/efl_ui_theme_example_02.c
index b78dc73f0b5ff7f98b6f2491f45a6d9f07360b2c..0d0390b82c60521a59d8eda9af69d4e9224d7d28 100644 (file)
--- a/src/examples/elementary/efl_ui_theme_example_02.c
+++ b/src/examples/elementary/efl_ui_theme_example_02.c
@@ -3,7 +3,6 @@
  * gcc -o efl_ui_theme_example_02 efl_ui_theme_example_02.c `pkg-config --cflags --libs elementary`
  */
 #define EFL_BETA_API_SUPPORT 1
-#define EFL_EO_API_SUPPORT 1
 
 #define EFL_UI_WIDGET_PROTECTED
 #include <Efl_Ui.h>

diff --git a/src/examples/elementary/evas3d_map_example.c b/src/examples/elementary/evas3d_map_example.c
index 6ce53290e35498624190f749ef172c960ad6474d..f0859e30acef0e1df1b674f0fe8e9b5454d72fa1 100644 (file)
--- a/src/examples/elementary/evas3d_map_example.c
+++ b/src/examples/elementary/evas3d_map_example.c
@@ -1,6 +1,3 @@
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c
index 8b6724aacdc337313110fbb0aa0f70dfb4d47c8f..fe458eb454ddfaa1c04994b76774ed6760c9d0e2 100644 (file)
--- a/src/examples/elementary/evas3d_object_on_button_example.c
+++ b/src/examples/elementary/evas3d_object_on_button_example.c
@@ -8,9 +8,6 @@
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 
 #include <Eo.h>
 #include <Evas.h>

diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c
index 05817990ad4cb4cc76ccd430d0cc33df5b68132e..267e45b7e967b19477feda3048c624b4655f2a5f 100644 (file)
--- a/src/examples/elementary/evas3d_scene_on_button_example.c
+++ b/src/examples/elementary/evas3d_scene_on_button_example.c
@@ -5,9 +5,6 @@
 * Compile with:
 * gcc -o evas3d_scene_on_button_example evas3d_scene_on_button_example.c -g `pkg-config --libs --cflags evas ecore eo elementary`
 */
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index 2aa0a54e859eadc4c20aeb1bd2faf24771783640..dfe73c8b2b2b91633886fb9ec925dc13284bbf0c 100644 (file)
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -4,7 +4,6 @@
 # include "config.h"
 #else
 # define EFL_BETA_API_SUPPORT 1
-# define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Elementary.h>

diff --git a/src/examples/elementary/fileviewlist.c b/src/examples/elementary/fileviewlist.c
index 4f7ff608c593cac08c06beff886f15762dba6f18..ffbaca57b56ae5ac35ebb7d0c0560650cd38716e 100644 (file)
--- a/src/examples/elementary/fileviewlist.c
+++ b/src/examples/elementary/fileviewlist.c
@@ -5,7 +5,6 @@
 # include "config.h"
 #else
 # define EFL_BETA_API_SUPPORT 1
-# define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Elementary.h>

diff --git a/src/examples/elementary/layout_property_bind.c b/src/examples/elementary/layout_property_bind.c
index 3277288c1629125766c975dc16b6640706b895a1..2b911018eff521588aaacab2987eec29ce9fb698 100644 (file)
--- a/src/examples/elementary/layout_property_bind.c
+++ b/src/examples/elementary/layout_property_bind.c
@@ -4,7 +4,6 @@
 # include "config.h"
 #else
 # define EFL_BETA_API_SUPPORT 1
-# define EFL_EO_API_SUPPORT 1
 #endif
 
 #include <Efl_Ui.h>

diff --git a/src/examples/elementary/location_example_01.c b/src/examples/elementary/location_example_01.c
index b98371de36d89e1e2cef772f925c1d233856b05a..7b8ad6f89711fac7bd3e0e219268bd4d5587a438 100644 (file)
--- a/src/examples/elementary/location_example_01.c
+++ b/src/examples/elementary/location_example_01.c
@@ -1,8 +1,5 @@
 //Compile with:
 //gcc -o location_example_01 location_example_01.c -g `pkg-config --cflags --libs elementary elocation`
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 3c7caa20fc0c455400df9bd133d484c074c927d3..c3a87683b70d1df023a94ad16606f372acf59d10 100644 (file)
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -1,6 +1,3 @@
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/elementary/performance/performance.c b/src/examples/elementary/performance/performance.c
index cced019c4a4a1b8e6b94111b6dc8fa11f2205cf1..d6e9ac5f97503dfa17157fa258da6b7a72ff9269 100644 (file)
--- a/src/examples/elementary/performance/performance.c
+++ b/src/examples/elementary/performance/performance.c
@@ -30,9 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/elementary/performance/tools_private.h b/src/examples/elementary/performance/tools_private.h
index 20aa80d073ade4cdf8457436ed7e065b5c95d6f9..40d6f12afc02fa6dfbe6137ac9eea772fabf1bd0 100644 (file)
--- a/src/examples/elementary/performance/tools_private.h
+++ b/src/examples/elementary/performance/tools_private.h
@@ -1,6 +1,3 @@
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
index 7b789740e35ee8eb846da1f95290288b099175c4..5120154715fcf8d14920d87df4eea1cfa443de26 100644 (file)
--- a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c
@@ -14,9 +14,6 @@
 * edje_cc sphere_hunter.edc
 * gcc -o evas_3d_sphere_hunter evas_3d_sphere_hunter.c -g `pkg-config --libs --cflags evas ecore elementary eina eo` -lm
 */
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c
index 8f470041a7e775396045033e8d3c0c74ff7be593..04df0e802cd544149b6620da4bef826904e06e20 100644 (file)
--- a/src/examples/emotion/emotion_basic_example.c
+++ b/src/examples/emotion/emotion_basic_example.c
@@ -1,9 +1,6 @@
 //Compile with:
 // gcc -o emotion_basic_example emotion_basic_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eo`
 
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index 7a24b8dae5ca12819f70466b95d5bd5ca2d12f3f..8ece2d298aef8ff0a7914d8a7276cc5b834943c3 100644 (file)
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -1,8 +1,5 @@
 //Compile with:
 // gcc -o emotion_border_example emotion_border_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eina eo`
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index 0bd722a0cd76ff12187084182d2e46ad8ed12163..4ac996f33a02725ab59dff9fc16393e0b5595311 100644 (file)
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -1,8 +1,5 @@
 //Compile with:
 // gcc -o emotion_generic_example emotion_generic_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eina eo`
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c
index 07c897364153f1d05903255160cc15085e252318..40543f44b20d7c5b48b67da9e5483d0d06cfd81a 100644 (file)
--- a/src/examples/emotion/emotion_generic_subtitle_example.c
+++ b/src/examples/emotion/emotion_generic_subtitle_example.c
@@ -1,9 +1,6 @@
 //Compile with:
 // gcc -o emotion_generic_subtitle_example emotion_generic_subtitle_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eo`
 
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index b5dc6257c7e43fe558868ca1749368f84f59a046..dbc7a5b969d51c755e47ce40a6689700cb720f13 100644 (file)
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -1,9 +1,6 @@
 //Compile with:
 // gcc -o emotion_signals_example emotion_signals_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eo`
 
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
 #ifndef EFL_BETA_API_SUPPORT
 # define EFL_BETA_API_SUPPORT
 #endif

diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index fdb8a45278797ef13899cff2c69eebf132f7bb08..99e3b98cce8457c002720ecee34544b9e26c4199 100644 (file)
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -14,7 +14,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 667b67119791ff3d7dcf10693f08567e8666029f..47271ff4607cd6d81ad1fe2d3d1e5991c53fd5a8 100644 (file)
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -14,7 +14,6 @@
 #include "config.h"
 #else
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 7b894cd23ee7e7a96620e41d51e084b6976dd86b..138ceb089a33223b5aa29d0da13db85c4efb495b 100644 (file)
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -19,7 +19,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index 25889024d1f4ef4faf7c0563bcbcaca4f23847a2..d5b89b30375632b439f660ffe0506193875dfef0 100644 (file)
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -16,7 +16,6 @@
 #include "config.h"
 #else
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Ecore.h>

diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index e8d04d4ea938b6407d402d10dbfa576fd60f26f8..3fba86a147e533315ace74fe6697398d4314e028 100644 (file)
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -12,7 +12,6 @@
 #include "config.h"
 #else
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index b2d905e873f2c855d112bd8fbd149dce7682bdf0..493cea98ce26f8d9cac24cdf9db4162560d20261 100644 (file)
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -11,7 +11,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index becd0bcadc24e5f4e23e5dce9880bc2367401f7f..5ecd79e350d4c0288370d0a918223327908f6a37 100644 (file)
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -18,7 +18,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index 4c69dcac942104d359f6c7e8dcaed20f6ba9243c..8bcd51b94e38886f88bd2b0f3a20e6f8da07e04c 100644 (file)
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -10,7 +10,6 @@
 #include "config.h"
 #else
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <math.h>

diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 6e765bd399139f2560426a69cb3b7472460131a0..6aacecc8256adcd7910193534168102d06398cd7 100644 (file)
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -20,7 +20,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Ecore.h>

diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index e82f31bca7e0adc1712b0e9054a8ca8f8e004a3a..6ca12837dc12961052260c4ba659b58e3341233e 100644 (file)
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -18,7 +18,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index f97c183bd05ac5023387ca0e0ba714fd6daa7ed6..4c93b54ec069686a72781077d96e076b522e1669 100644 (file)
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -11,7 +11,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 149217d95a515c2211afed91f01a3c341be92542..df8bdbdd4d9d3cd366eb8d9003b617be12bfd34f 100644 (file)
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -15,7 +15,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 91126fbfa044e36388b7957f346981dd1645c183..6bf668ba093f3d31983e9c7b711472e2e1e99e41 100644 (file)
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -19,7 +19,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index 1d2cc75263ff239fb92fcec82fca8f11d0e08d68..65d1880559bedf0ea5b4118e477868f797502150 100644 (file)
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -13,7 +13,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 20230d011243e0ff07a6a744acbcca1a1cd020e7..5ed8067dc33c50cea0fa8f403c3b977f9fbe799b 100644 (file)
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -15,7 +15,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <math.h>

diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 7769a4544262aae33a8d41c5f97ca4e6fb856dc3..ba0b912d0be79ef64ee30f433c8c79053de902f3 100644 (file)
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -16,7 +16,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 6445ee956426a306325e8a41e4210cff47dac6bb..1a671f811d4e3981bd39df179e400268225ea470 100644 (file)
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -12,7 +12,6 @@
 #include "config.h"
 #else
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <math.h>

diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 16733183f45e674f66054d9db934c95f14a40180..eaa2f02f551a11be78d864bfd7854155fcba5959 100644 (file)
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -31,7 +31,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index 92e3b1a1a9b0a911b69e544d31c22a8bde6f5612..3b08380f1cf871d20ca7f71bf6cc33b21e3c6143 100644 (file)
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -16,7 +16,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <Eo.h>

diff --git a/src/examples/evas/evas-map-aa-eo.c b/src/examples/evas/evas-map-aa-eo.c
index 30e8831c7beb2264aefd80fef7436992d2447975..b8156ad2b905d041f78d3dd18c422f14b440bd02 100644 (file)
--- a/src/examples/evas/evas-map-aa-eo.c
+++ b/src/examples/evas/evas-map-aa-eo.c
@@ -16,10 +16,6 @@
 # define EFL_BETA_API_SUPPORT
 #endif
 
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
-
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <stdlib.h>

diff --git a/src/examples/evas/evas-map-utils-eo.c b/src/examples/evas/evas-map-utils-eo.c
index 157b3af8473eac07ad3eb58863789effcddb1979..1ea812bed135a06e62b9543f935949b71bb7b69b 100644 (file)
--- a/src/examples/evas/evas-map-utils-eo.c
+++ b/src/examples/evas/evas-map-utils-eo.c
@@ -19,10 +19,6 @@
 # define EFL_BETA_API_SUPPORT
 #endif
 
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
-
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 

diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 4d4c37fa90dc3a67a05b4092bd15a372b7d88f0e..7ba391acc907f2829ddf9793660d99306b4a40d2 100644 (file)
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -14,7 +14,6 @@
 #include "config.h"
 #else
 #define PACKAGE_EXAMPLES_DIR "."
-#define EFL_EO_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
 #endif
 

diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c
index 650709f250ba8c93f1bf7febfb58f42363e6f0aa..8625366962e4e457eac7c5aeef910bd110702998 100644 (file)
--- a/src/examples/evas/evas-vg-batman.c
+++ b/src/examples/evas/evas-vg-batman.c
@@ -22,10 +22,6 @@
 #define EFL_BETA_API_SUPPORT
 #endif
 
-#ifndef EFL_EO_API_SUPPORT
-#define EFL_EO_API_SUPPORT
-#endif
-
 #include <Eo.h>
 #include <Efl.h>
 #include <Evas.h>

diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 36b8baaf559114f791a1fea6a7a56cb1e0db0d63..ef128d511e9d4d23d2c9f27be9aa7a4681934537 100644 (file)
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -43,10 +43,6 @@
 #define EFL_BETA_API_SUPPORT
 #endif
 
-#ifndef EFL_EO_API_SUPPORT
-#define EFL_EO_API_SUPPORT
-#endif
-
 #include <Eo.h>
 #include <Efl.h>
 #include <Evas.h>

diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.h b/src/examples/evas/shooter/evas-3d-shooter-header.h
index 13600ec121348326434b182896282525f3418786..aaa6ff389c679fcbc3e9d7f63f8336ddb60aa0d0 100644 (file)
--- a/src/examples/evas/shooter/evas-3d-shooter-header.h
+++ b/src/examples/evas/shooter/evas-3d-shooter-header.h
@@ -5,7 +5,6 @@
 #else
 #define PACKAGE_EXAMPLES_DIR "."
 #define EFL_BETA_API_SUPPORT
-#define EFL_EO_API_SUPPORT
 #endif
 
 #include <stdio.h>

diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index 0168522066298da378960d4dbfa5f38aff3c33c0..fca73af68f09bd1bd1d996fea0c2704b25c8c7b6 100644 (file)
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -274,11 +274,6 @@
 
 #include <Eina.h>
 #include <Eo.h>
-
-//TIZEN_ONLY(20190319): fix migration build erros related to beta APIs
-//#ifdef EFL_BETA_API_SUPPORT
-//#include <Efl.h>
-//#endif
 #include <Efl.h>
 
 #ifdef EAPI
@@ -335,9 +330,7 @@ extern "C" {
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Ecore_Legacy.h"
 #endif
-#ifdef EFL_EO_API_SUPPORT
 #include "Ecore_Eo.h"
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h
index 4d747fc9ea64973cec6c6fbe7952d9ed88812dfb..d8c32dc8c11e3f16833cd8e4d7018811ec44d355 100644 (file)
--- a/src/lib/edje/Edje.h
+++ b/src/lib/edje/Edje.h
@@ -253,9 +253,7 @@ extern "C" {
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Edje_Legacy.h"
 #endif
-#ifdef EFL_EO_API_SUPPORT
 #include "Edje_Eo.h"
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/src/lib/efl/Efl_Config.h.cmake b/src/lib/efl/Efl_Config.h.cmake
index 4f7a03ac1f93b649b5df344b84b676d1bdcb3b0e..5c7a420dae17bc4fd2a866a0eb19af2d835f9d13 100644 (file)
--- a/src/lib/efl/Efl_Config.h.cmake
+++ b/src/lib/efl/Efl_Config.h.cmake
@@ -3,16 +3,12 @@
 
 /* Add -DEFL_API_OVERRIDE ot your CFLAGS to override the default
  * installed api set and then fter that -DEFL_NOLEGACY_API_SUPPORT
- * and/or -DEFL_EO_API_SUPPORT as desired
+ * as desired
  */
 #ifndef EFL_API_OVERRIDE
 
 #cmakedefine EFL_API_LEGACY_DEF
 #cmakedefine EFL_BETA_API_SUPPORT
-/* You can't disable Eo API anymore as EFL use it everywhere internally
-   and we don't want to expose it publicly just yet, so keep it hidden
-   and require an explicit request to get it. */
-/* #define EFL_EO_API_SUPPORT */
 #endif
 
 #define EFL_VERSION_MAJOR @PROJECT_VERSION_MAJOR@

diff --git a/src/lib/efl/Efl_Config.h.in b/src/lib/efl/Efl_Config.h.in
index 25420d0c4ea435ae3eef6348c7f10cc38c44bbc6..1673cd04e9c280ca5e5110ec7e3ca52ab1171297 100644 (file)
--- a/src/lib/efl/Efl_Config.h.in
+++ b/src/lib/efl/Efl_Config.h.in
@@ -3,14 +3,10 @@
 
 /* Add -DEFL_API_OVERRIDE ot your CFLAGS to override the default
  * installed api set and then fter that -DEFL_NOLEGACY_API_SUPPORT
- * and/or -DEFL_EO_API_SUPPORT as desired
+ * as desired
  */
 #ifndef EFL_API_OVERRIDE 
 @EFL_API_LEGACY_DEF@
-/* You can't disable Eo API anymore as EFL use it everywhere internally
-   and we don't want to expose it publicly just yet, so keep it hidden
-   and require an explicit request to get it. */
-/* @EFL_API_EO_DEF@ */
 #endif
 
 #define EFL_VERSION_MAJOR @EFL_VERSION_MAJOR@

diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index cc986938ddb67bdb36d3681415288389d6a6d4c5..fb0fc64813b6e089ae96910f4f62ff1553057f0e 100644 (file)
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -76,9 +76,7 @@ typedef Eina_Bool (*Eio_Filter_Direct_Cb)(void *data, Eio_File *handler, const E
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Eio_Legacy.h"
 #endif
-#ifdef EFL_EO_API_SUPPORT
 #include "Eio_Eo.h"
-#endif
 
 /**
  * @brief get access time from a Eina_Stat

diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 6dc7e885cdbcc9dbbba3d5f15af2cf5dcdf8ecb4..f3a38e56954a28e95af594134ddc831f2e963cbe 100644 (file)
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -4,10 +4,6 @@
 #include <Efl_Config.h>
 #include <Elementary_Options.h>
 
-#ifndef EFL_EO_API_SUPPORT
-# define EFL_EO_API_SUPPORT
-#endif
-
 /* FIXME: wtf? */
 #ifndef EFL_UI_RADIO_EVENT_CHANGED
 # define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED

diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index d283898c11c3537d783a4eb77bb5aa0bb8a40d48..b79c8f6277069af438340ddd9f53659ebea95b04 100644 (file)
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -152,7 +152,6 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_config.h>
 #include <elm_focus.h>
 
-#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
 #include <Efl.h>
 /* FIXME: wtf? */
 #ifndef EFL_UI_RADIO_EVENT_CHANGED
@@ -166,7 +165,6 @@ typedef Eo Efl_Ui_Focus_Manager;
 
 # include <efl_ui_focus_object.eo.h>
 # include <efl_ui_focus_manager.eo.h>
-EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
 # include <efl_ui_focus_manager_window_root.eo.h>
 # include <efl_ui_focus_manager_calc.eo.h>
 # include <efl_ui_focus_manager_sub.eo.h>
@@ -175,6 +173,8 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
 # include <efl_ui_l10n.eo.h>
 # include <efl_ui_focus_composition.eo.h>
 # include <efl_ui_focus_layer.eo.h>
+
+#ifdef EFL_BETA_API_SUPPORT
 # include <elm_interface_scrollable.h>
 # include <elm_interface_scrollable.eo.h>
 #endif
@@ -295,7 +295,6 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
 #include <elm_web.h>
 #include <elm_win.h>
 
-#ifdef EFL_EO_API_SUPPORT
 # include <efl_ui_selection_types.eot.h>
 # include <efl_ui_theme.eo.h>
 # include <efl_config_global.eo.h>
@@ -388,7 +387,6 @@ typedef Eo Efl_Ui_Pager;
 # include <efl_ui_tab_page.eo.h>
 # include <efl_ui_tab_page_part_tab.eo.h>
 # include <efl_ui_tab_pager.eo.h>
-#endif
 
 /* include deprecated calls last of all */
 #include <elm_deprecated.h>

diff --git a/src/lib/elementary/Elementary.hh b/src/lib/elementary/Elementary.hh
index 36a31ef700870f01c7464f3b30885e1e35f6b977..e5e1036e0cc7bca1ef8ba7fa6cde15fa9eef45f2 100644 (file)
--- a/src/lib/elementary/Elementary.hh
+++ b/src/lib/elementary/Elementary.hh
@@ -7,9 +7,6 @@
 #ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
 #endif
-#ifndef EFL_EO_API_SUPPORT
-#define EFL_EO_API_SUPPORT
-#endif
 #ifndef ELM_INTERNAL_API_ARGESFSDFEFC
 #define ELM_INTERNAL_API_ARGESFSDFEFC
 #endif

diff --git a/src/lib/elementary/efl_access_object.h b/src/lib/elementary/efl_access_object.h
index b71306f48b16dc87d936cd7c334e7d6918de430f..29c61e6e523008dad30639cb3de1797831801aac 100644 (file)
--- a/src/lib/elementary/efl_access_object.h
+++ b/src/lib/elementary/efl_access_object.h
@@ -22,14 +22,7 @@ typedef Eina_Bool (*Efl_Access_Gesture_Cb)(void *data, Efl_Access_Gesture_Info g
 #define TIZEN_ONLY
 #include "efl_access_legacy.h"
 //
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_access_object.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#ifndef TIZEN_ONLY
-#include "efl_access_object.eo.legacy.h"
-#endif
-#endif
 
 // TIZEN_ONLY(20171114): atspi: expose highlight information on atspi
 /*
@@ -112,8 +105,6 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela
 EAPI void
 efl_access_attribute_free(Efl_Access_Attribute *attr);
 
-#ifdef EFL_EO_API_SUPPORT
-
 /**
  * Emits Accessible 'StateChanged' signal.
  */
@@ -237,9 +228,8 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
 */
 //
 
-#endif
 
-#endif
 // TIZEN_ONLY(20171114): Add accessibility highlight for toolbar items I7892c9433d675d9ba6618991ae46488060752c3c
 //#endif
 //
+#endif

diff --git a/src/lib/elementary/efl_access_text.h b/src/lib/elementary/efl_access_text.h
index 2fff16b7aa3e4de6e52cc0ff4104d3fcfff6a15c..ac8cad8b38324eb11e4e5897733612c2d20edcb7 100644 (file)
--- a/src/lib/elementary/efl_access_text.h
+++ b/src/lib/elementary/efl_access_text.h
@@ -5,12 +5,7 @@
 //#ifdef EFL_BETA_API_SUPPORT
 //
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_access_text.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "efl_access_text.eo.legacy.h"
-#endif
 
 /**
  * @brief Free Efl_Access_Text_Attribute structure
@@ -25,4 +20,4 @@ EAPI void elm_atspi_text_text_range_free(Efl_Access_Text_Range *range);
 #endif
 // TIZEN_ONLY(20171114): Add accessibility highlight for toolbar items I7892c9433d675d9ba6618991ae46488060752c3c
 //#endif
-//
\ No newline at end of file
+//

diff --git a/src/lib/elementary/efl_access_widget_action.h b/src/lib/elementary/efl_access_widget_action.h
index 77c7f154e8cbc7c0808169a8ddc62dd1df3a0298..4cda99cd46ed4ced29dbffa5f9cef1966a8826cd 100644 (file)
--- a/src/lib/elementary/efl_access_widget_action.h
+++ b/src/lib/elementary/efl_access_widget_action.h
@@ -15,12 +15,7 @@ struct _Efl_Access_Action_Data
 
 typedef struct _Efl_Access_Action_Data Efl_Access_Action_Data;
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_access_widget_action.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "efl_access_widget_action.eo.legacy.h"
-#endif
 
 #endif
 // TIZEN_ONLY(20171114): Add accessibility highlight for toolbar items I7892c9433d675d9ba6618991ae46488060752c3c

diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index 609d1065ee401ec8499b1e24800948fdb345265a..15d92b41c4eedfd1ad91447af86ba2436837bfac 100644 (file)
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -4,13 +4,8 @@
 // TIZEN_ONLY(20171114): Add accessibility highlight for toolbar items I7892c9433d675d9ba6618991ae46488060752c3c
 //#ifdef EFL_BETA_API_SUPPORT
 //
-#ifdef EFL_EO_API_SUPPORT
 
 #include "efl_access_window.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "efl_access_window.eo.legacy.h"
-#endif
 
 /**
  * Emits 'Window:Activated' accessible signal.

diff --git a/src/lib/elementary/efl_ui_calendar.h b/src/lib/elementary/efl_ui_calendar.h
index f80dce28d575887933ab8f998058d22caa06b83f..c3c8f6ae897a21217db1d503953a2da86adfc993 100644 (file)
--- a/src/lib/elementary/efl_ui_calendar.h
+++ b/src/lib/elementary/efl_ui_calendar.h
@@ -48,9 +48,8 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_ui_calendar.eo.h"
-#endif
+
 /**
  * @}
  */

diff --git a/src/lib/elementary/efl_ui_clock.h b/src/lib/elementary/efl_ui_clock.h
index b882cd77a5d8603ee6b9be8d47f1b634c6e36259..1115faaf45d2273b29ab32a540ca9833f2e09550 100644 (file)
--- a/src/lib/elementary/efl_ui_clock.h
+++ b/src/lib/elementary/efl_ui_clock.h
@@ -196,9 +196,8 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_ui_clock.eo.h"
-#endif
+
 /**
  * @}
  */

diff --git a/src/lib/elementary/efl_ui_nstate.h b/src/lib/elementary/efl_ui_nstate.h
index 5e69c19dcefeb3d779c131970ddc116c010ac4ce..1d16c1f1c4974a911ffc894114ca416335e2510f 100644 (file)
--- a/src/lib/elementary/efl_ui_nstate.h
+++ b/src/lib/elementary/efl_ui_nstate.h
@@ -21,6 +21,4 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_ui_nstate.eo.h"
-#endif

diff --git a/src/lib/elementary/efl_ui_video.h b/src/lib/elementary/efl_ui_video.h
index d015d1c0d728892bf23c3daffdf6bd84aa676b33..c4cfc55815109d52c62ff27bddd07b563a4244e2 100644 (file)
--- a/src/lib/elementary/efl_ui_video.h
+++ b/src/lib/elementary/efl_ui_video.h
@@ -54,9 +54,7 @@
  * ELM_PLAYER_CLASS
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_ui_video_eo.h"
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "efl_ui_video_legacy.h"
 #endif

diff --git a/src/lib/elementary/elc_fileselector_common.h b/src/lib/elementary/elc_fileselector_common.h
index c20e2a37c53db6fa1431f7a3738fb8c14d146305..df4f83126801b6ecdf3a016b62391a6d96f2e871 100644 (file)
--- a/src/lib/elementary/elc_fileselector_common.h
+++ b/src/lib/elementary/elc_fileselector_common.h
@@ -1,7 +1,6 @@
 typedef Eina_Bool (*Elm_Fileselector_Filter_Func)(const char *path, /**< File path */
                                                   Eina_Bool dir, /**< A flag to show if path is a directory or not. True if the path is a directory. */
                                                   void *data /**< A user data that was given by elm_fileselector_custom_filter_append. */);
-#ifdef EFL_EO_API_SUPPORT
+
 EAPI extern Eina_Error ELM_FILESELECTOR_ERROR_UNKNOWN;
 EAPI extern Eina_Error ELM_FILESELECTOR_ERROR_INVALID_MODEL;
-#endif

diff --git a/src/lib/elementary/elm_check.h b/src/lib/elementary/elm_check.h
index 056dee46a89679b223673216d8b4d0c940a689b5..492494a2f81c1aa0f09afd5386ef31515b1477ab 100644 (file)
--- a/src/lib/elementary/elm_check.h
+++ b/src/lib/elementary/elm_check.h
@@ -59,9 +59,8 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
 #define EFL_UI_CHECK_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
-#endif
+
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "elm_check_legacy.h"
 #endif

diff --git a/src/lib/elementary/elm_config.h b/src/lib/elementary/elm_config.h
index 0e18a7ccd8c678f6e976224a23b2beb2bd325603..352c424546fb56ff469bcc3659a660431714dcf1 100644 (file)
--- a/src/lib/elementary/elm_config.h
+++ b/src/lib/elementary/elm_config.h
@@ -2450,7 +2450,8 @@ EAPI void elm_config_drag_anim_duration_set(double set);
 
 /* new efl.config interface helpers in C */
 
-#ifdef EFL_EO_API_SUPPORT
+/* FIXME these depend on stuff from Efl.h but this is included before that */
+#ifdef EFL_BETA_API_SUPPORT
 
 static inline Eina_Bool
 efl_config_bool_set(Efl_Config *obj, const char * name, Eina_Bool val)

diff --git a/src/lib/elementary/elm_helper.h b/src/lib/elementary/elm_helper.h
index 2cc350e8695e26a59f321a5421cf720b2e486c4e..488372939aeed7b0458b697c8e7a1cac610db878 100644 (file)
--- a/src/lib/elementary/elm_helper.h
+++ b/src/lib/elementary/elm_helper.h
@@ -77,7 +77,7 @@ elm_validator_regexp_free(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1);
 EAPI Elm_Regexp_Status
 elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1);
 
-#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
+#if defined(EFL_BETA_API_SUPPORT)
 /**
  * @brief The regex validator. Used as callback to validate event.
  *

diff --git a/src/lib/elementary/elm_interface_scrollable.h b/src/lib/elementary/elm_interface_scrollable.h
index d56f3f13e93a9b169e1add8eeac8ea918bf472c8..84cf2168732d316ecdda93d280c3e7c1367b6a1a 100644 (file)
--- a/src/lib/elementary/elm_interface_scrollable.h
+++ b/src/lib/elementary/elm_interface_scrollable.h
@@ -59,12 +59,7 @@ typedef void      (*Elm_Interface_Scrollable_Resize_Cb)(Evas_Object *obj, Evas_C
 typedef struct _Elm_Scrollable_Smart_Interface_Data
   Elm_Scrollable_Smart_Interface_Data;
 
-#ifdef EFL_EO_API_SUPPORT
 #include "elm_interface_scrollable.eo.h"
-#endif
-#ifndef EFL_NOLEGACY_API_SUPPORT
-#include "elm_interface_scrollable.eo.legacy.h"
-#endif
 
 struct _Elm_Scrollable_Smart_Interface_Data
 {
@@ -272,7 +267,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
        return __VA_ARGS__;                                                   \
     }
 
-#if defined(EFL_EO_API_SUPPORT) && defined(EFL_BETA_API_SUPPORT)
+#ifdef EFL_BETA_API_SUPPORT
 EAPI void elm_pan_gravity_set(Elm_Pan *, double x, double) EINA_DEPRECATED;
 EAPI void elm_pan_gravity_get(const Elm_Pan *, double *, double *) EINA_DEPRECATED;
 #endif

diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h
index 2bb3f46b725dfd1fde5ddbc7c674a6498563b440..dac74d8189a2eaf5c58da22870764d6e6c38b3e0 100644 (file)
--- a/src/lib/elementary/elm_interfaces.h
+++ b/src/lib/elementary/elm_interfaces.h
@@ -3,44 +3,15 @@
 #include "efl_access_widget_action.h"
 #include "efl_access_window.h"
 
-// FIXME FIXME FIXME -- Still required because of photocam
-#ifdef EFL_EO_API_SUPPORT
-# include "elm_interface_scrollable.h"
-#endif
-
 // TIZEN_ONLY(20171114): Add accessibility highlight for toolbar items I7892c9433d675d9ba6618991ae46488060752c3c
 //#ifdef EFL_BETA_API_SUPPORT
 //
-#ifdef EFL_EO_API_SUPPORT
 #include "efl_access_action.eo.h"
 #include "efl_access_component.eo.h"
 #include "efl_access_editable_text.eo.h"
 #include "efl_access_selection.eo.h"
 #include "efl_access_value.eo.h"
 #include "efl_ui_legacy.eo.h"
-#endif
-// TIZEN_ONLY(20171114): Add accessibility highlight for toolbar items I7892c9433d675d9ba6618991ae46488060752c3c
-//#endif
-//
-#ifndef EFL_NOLEGACY_API_SUPPORT
-// TIZEN_ONLY(20171114): Add accessibility highlight for toolbar items I7892c9433d675d9ba6618991ae46488060752c3c
-//#ifdef EFL_BETA_API_SUPPORT
-//
-#include "efl_access_action.eo.legacy.h"
-/**
- * @defgroup Elm_Interface_Atspi_Component Atspi Component
- * @ingroup elm_accessibility_group
- * @{
- */
-#include "efl_access_component.eo.legacy.h"
-/**
- * @}
- */
-#include "efl_access_editable_text.eo.legacy.h"
-#include "efl_access_selection.eo.legacy.h"
-#include "efl_access_value.eo.legacy.h"
-#include "efl_ui_legacy.eo.legacy.h"
-#endif
 // TIZEN_ONLY(20171114): Add accessibility highlight for toolbar items I7892c9433d675d9ba6618991ae46488060752c3c
 //#endif
 //

diff --git a/src/lib/elementary/elm_view_form.h b/src/lib/elementary/elm_view_form.h
index e97ca6c6e7cafda61cdc8dc6be8677640dd788fd..fc35e4864469f6d1de1f3d49d41f95cea2bbdad7 100644 (file)
--- a/src/lib/elementary/elm_view_form.h
+++ b/src/lib/elementary/elm_view_form.h
@@ -1,5 +1,5 @@
 
-#ifdef EFL_EO_API_SUPPORT
+#ifdef EFL_BETA_API_SUPPORT
 #ifndef ELM_VIEW_FORM_H
 #define ELM_VIEW_FORM_H
 

diff --git a/src/lib/elementary/elm_view_list.h b/src/lib/elementary/elm_view_list.h
index 4ad048e106dc2c3644c49cd18ca8200a1493564c..7f7ef5a55320514fcb12a8aa27ebac21b478a9fd 100644 (file)
--- a/src/lib/elementary/elm_view_list.h
+++ b/src/lib/elementary/elm_view_list.h
@@ -1,5 +1,5 @@
 
-#ifdef EFL_EO_API_SUPPORT
+#ifdef EFL_BETA_API_SUPPORT
 #ifndef ELM_VIEW_LIST_H
 #define ELM_VIEW_LIST_H
 

diff --git a/src/lib/elementary/elm_win_eo.h b/src/lib/elementary/elm_win_eo.h
index 51eaee90104b124fade6a9a379f090f8b2cf5d32..39ec8eb4b15aca0f77d67ca0d4ea969696f0cc8d 100644 (file)
--- a/src/lib/elementary/elm_win_eo.h
+++ b/src/lib/elementary/elm_win_eo.h
@@ -11,7 +11,7 @@
 
 EAPI void elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel);
 EAPI Eina_Bool elm_win_autodel_get(const Evas_Object *obj);
-#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
+#ifdef EFL_BETA_API_SUPPORT
 /**
  * @brief Set the window's autodel state.
  *

diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h
index d7eef3c090029ea933b9e1058bc78b3539b0afc7..d8eb052f93d93f3732694282d58e32baea9099da 100644 (file)
--- a/src/lib/emotion/Emotion.h
+++ b/src/lib/emotion/Emotion.h
@@ -127,9 +127,7 @@ extern "C" {
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Emotion_Legacy.h"
 #endif
-#ifdef EFL_EO_API_SUPPORT
 #include "Emotion_Eo.h"
-#endif
 
 /**
  * @file Emotion.h

diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index d1fb585b1d1dbc7973b4a6749d5451272a4d2d67..d3f8e5c95e85a59eb9fc6c62e17720b932afdcf8 100644 (file)
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -169,13 +169,8 @@
 #include <Eina.h>
 
 #include <Eo.h>
-//TIZEN_ONLY(20190318): fix migration build errors related to beta APIs
-//#ifdef EFL_BETA_API_SUPPORT
-///* This include has been added to support Eo in Evas */
-//#include <Efl.h>
-//#endif
+/* This include has been added to support Eo in Evas */
 #include <Efl.h>
-//
 
 #include <Evas_Loader.h>
 

diff --git a/src/lib/evas/Evas.hh b/src/lib/evas/Evas.hh
index 064d8c184e4da46e2f46248baec3582563e3c618..ac9b6509ed3cdff37c13ed015b1bd5ef5937028a 100644 (file)
--- a/src/lib/evas/Evas.hh
+++ b/src/lib/evas/Evas.hh
@@ -8,9 +8,6 @@
 #ifndef EFL_BETA_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
 #endif
-#ifndef EFL_EO_API_SUPPORT
-#define EFL_EO_API_SUPPORT
-#endif
 
 #include <Efl.hh>
 

diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 25ac5b8648557df9fc8abb7001fb3b191caa6ef9..779c30f2e96573d9b1defe8160aa9cad3398094a 100644 (file)
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -89,7 +89,7 @@ EAPI extern Evas_Version * evas_version;
  * @since 1.1
  */
 // Support not having eo available
-#if defined (EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
+#ifdef EFL_BETA_API_SUPPORT
 typedef Efl_Callback_Priority Evas_Callback_Priority;
 #else
 typedef short Evas_Callback_Priority;
@@ -3507,21 +3507,9 @@ typedef Eo Efl_Input_Device;
 
 #endif
 
-#ifndef _EFL_H
-#define _EFL_H
-typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
-typedef struct tm Efl_Time;
-#endif
-
 #ifndef _EFL_TEXT_CURSOR_EO_H_
 #define _EFL_TEXT_CURSOR_EO_H_
 
-#ifndef _EFL_TEXT_CURSOR_EO_CLASS_TYPE
-#define _EFL_TEXT_CURSOR_EO_CLASS_TYPE
-#endif
-typedef Eo Efl_Text_Cursor;
-typedef Eo Efl_Text_Cursor_Cursor;
-
 #endif
 #ifndef _EFL_GFX_ENTITY_EO_H_
 #define _EFL_GFX_ENTITY_EO_H_

diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index a2c3e5c9e6b6a4439e5a6ba25706ef28a16d32cb..a4f611e201c5da58d70cdb7866ce356cda17b02b 100644 (file)
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -2,8 +2,6 @@
 # error You shall not include this header directly
 #endif
 
-#ifdef EFL_EO_API_SUPPORT
-
 #ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
 #define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
 
@@ -200,11 +198,6 @@ struct _Efl_Canvas_Object_Animation_Event
 #include "canvas/efl_canvas_animation_group_parallel.eo.h"
 #include "canvas/efl_canvas_animation_group_sequential.eo.h"
 #include "canvas/efl_canvas_animation_player.eo.h"
-
-#endif /* EFL_EO_API_SUPPORT */
-
-#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
-
 #include "canvas/efl_canvas_event_grabber.eo.h"
 
  /**
@@ -418,17 +411,13 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
 #include "canvas/evas_canvas3d_scene.eo.h"
 
 #include "canvas/efl_canvas_scene3d.eo.h"
-#endif /* EFL_BETA_API_SUPPORT */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "canvas/efl_canvas_image_internal.eo.h"
 #include "canvas/efl_canvas_image.eo.h"
 #include "canvas/efl_canvas_snapshot.eo.h"
 #include "canvas/efl_canvas_proxy.eo.h"
 #include "canvas/efl_gfx_mapping.eo.h"
-#endif /* EFL_EO_API_SUPPORT */
 
-#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
 /**
  * @ingroup Evas_Object_VG
  *
@@ -445,9 +434,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
 #include "canvas/efl_canvas_vg_gradient.eo.h"
 #include "canvas/efl_canvas_vg_gradient_linear.eo.h"
 #include "canvas/efl_canvas_vg_gradient_radial.eo.h"
-#endif /* EFL_BETA_API_SUPPORT */
 
-#ifdef EFL_EO_API_SUPPORT
 #include "canvas/efl_input_state.eo.h"
 #include "canvas/efl_input_event.eo.h"
 #include "canvas/efl_input_pointer.eo.h"
@@ -455,9 +442,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
 #include "canvas/efl_input_hold.eo.h"
 #include "canvas/efl_input_interface.eo.h"
 #include "canvas/efl_input_focus.eo.h"
-#endif /* EFL_EO_API_SUPPORT */
 
-#ifdef EFL_EO_API_SUPPORT
 # include "gesture/efl_canvas_gesture_types.eot.h"
 # include "gesture/efl_canvas_gesture_touch.eo.h"
 # include "gesture/efl_canvas_gesture.eo.h"
@@ -465,4 +450,3 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
 # include "gesture/efl_canvas_gesture_long_tap.eo.h"
 # include "gesture/efl_canvas_gesture_recognizer.eo.h"
 # include "gesture/efl_canvas_gesture_manager.eo.h"
-#endif /* EFL_EO_API_SUPPORT */

diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c
index b80b33b8e5cc5a0093a8d51245d4fb7cf864647d..bc343df802a0c4794af68bf2f5fccdf6d7ce7423 100644 (file)
--- a/src/modules/ethumb/emotion/emotion.c
+++ b/src/modules/ethumb/emotion/emotion.c
@@ -1,7 +1,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#define EFL_EO_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
 #endif
 

diff --git a/src/tests/elementary/efl_ui_compile_test.c b/src/tests/elementary/efl_ui_compile_test.c
index 651295da0340dabfd9813eeb61e41424c16d029e..4234502659d9b5829ddb933753057b73f62995b5 100644 (file)
--- a/src/tests/elementary/efl_ui_compile_test.c
+++ b/src/tests/elementary/efl_ui_compile_test.c
@@ -1,5 +1,4 @@
 #undef EFL_BETA_API_SUPPORT
-#undef EFL_EO_API_SUPPORT
 #define EFL_NOLEGACY_API_SUPPORT
 
 #include <Efl_Ui.h>

diff --git a/src/tests/elementary/elm_suite_build.c b/src/tests/elementary/elm_suite_build.c
index 614f7816da49ea680899e99fd01b99f7a02e48de..7ff098adecd994d269d7397379a706e7d2bb4ac8 100644 (file)
--- a/src/tests/elementary/elm_suite_build.c
+++ b/src/tests/elementary/elm_suite_build.c
@@ -1,3 +1,2 @@
 #undef EFL_BETA_API_SUPPORT
-#undef EFL_EO_API_SUPPORT
 #include <Elementary.h>

diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 8304979cf27bd27db0e3caa83685b6e30cdad15e..2ddfb272cab038d3fe04c39601e5ec19363b7b42 100644 (file)
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -1,7 +1,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#define EFL_EO_API_SUPPORT
 #define EFL_BETA_API_SUPPORT
 #endif