diff options
97 files changed, 17 insertions, 247 deletions
diff --git a/configure.ac b/configure.ac index 765a640da3..f0277af90a 100644 --- 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 061cd623c1..ed7c9ea81f 100644 --- 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) @@ -470,7 +469,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 02d22ecdb6..526a3761f6 100644 --- 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 7baffd464d..3962aa6a80 100644 --- 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 c3d1ac7cfd..2796771a9c 100644 --- 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 3aec0fa524..dc1d537478 100644 --- 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 e50d49588c..f435bcadd2 100644 --- 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 0097c2ac72..b2bc9c6675 100644 --- 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 a0b1a3a4eb..0298be15d0 100644 --- 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 da0e089c01..bb4fa7b97c 100644 --- 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 92379fe6e4..6fe455c904 100644 --- 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 cad8e112ad..071eb32963 100644 --- 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 3943a7793b..04ae147f2a 100644 --- 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 8e47d9222a..a843f6ed9c 100644 --- 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 9cc4c8efde..c027856df7 100644 --- 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 7ccec35651..e2d2af7948 100644 --- 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 14af786cd6..fe254633bb 100644 --- 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 e76254d8aa..90e6f55941 100644 --- 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 29614c8f3b..15e1017e50 100644 --- 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 b78dc73f0b..0d0390b82c 100644 --- 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 6ce53290e3..f0859e30ac 100644 --- 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 8b6724aacd..fe458eb454 100644 --- 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 05817990ad..267e45b7e9 100644 --- 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 2aa0a54e85..dfe73c8b2b 100644 --- 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 4f7ff608c5..ffbaca57b5 100644 --- 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 3277288c16..2b911018ef 100644 --- 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 b98371de36..7b8ad6f897 100644 --- 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 3c7caa20fc..c3a87683b7 100644 --- 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 cced019c4a..d6e9ac5f97 100644 --- 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 20aa80d073..40d6f12afc 100644 --- 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 7b789740e3..5120154715 100644 --- 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 8f470041a7..04df0e802c 100644 --- 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 7a24b8dae5..8ece2d298a 100644 --- 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 0bd722a0cd..4ac996f33a 100644 --- 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 07c8973641..40543f44b2 100644 --- 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 b5dc6257c7..dbc7a5b969 100644 --- 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 fdb8a45278..99e3b98cce 100644 --- 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 667b671197..47271ff460 100644 --- 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 7b894cd23e..138ceb089a 100644 --- 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 25889024d1..d5b89b3037 100644 --- 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 e8d04d4ea9..3fba86a147 100644 --- 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 b2d905e873..493cea98ce 100644 --- 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 becd0bcadc..5ecd79e350 100644 --- 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 4c69dcac94..8bcd51b94e 100644 --- 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 6e765bd399..6aacecc825 100644 --- 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 e82f31bca7..6ca12837dc 100644 --- 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 f97c183bd0..4c93b54ec0 100644 --- 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 149217d95a..df8bdbdd4d 100644 --- 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 91126fbfa0..6bf668ba09 100644 --- 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 1d2cc75263..65d1880559 100644 --- 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 20230d0112..5ed8067dc3 100644 --- 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 7769a45442..ba0b912d0b 100644 --- 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 6445ee9564..1a671f811d 100644 --- 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 16733183f4..eaa2f02f55 100644 --- 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 92e3b1a1a9..3b08380f1c 100644 --- 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 30e8831c7b..b8156ad2b9 100644 --- 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 157b3af847..1ea812bed1 100644 --- 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 4d4c37fa90..7ba391acc9 100644 --- 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 650709f250..8625366962 100644 --- 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 36b8baaf55..ef128d511e 100644 --- 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 13600ec121..aaa6ff389c 100644 --- 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 28b7af2d08..cfc6dd7660 100644 --- a/src/lib/ecore/Ecore.h +++ b/src/lib/ecore/Ecore.h @@ -274,10 +274,7 @@ #include <Eina.h> #include <Eo.h> - -#ifdef EFL_BETA_API_SUPPORT #include <Efl.h> -#endif #ifdef EAPI # undef EAPI @@ -333,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 4d747fc9ea..d8c32dc8c1 100644 --- 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 4f7a03ac1f..5c7a420dae 100644 --- 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 25420d0c4e..1673cd04e9 100644 --- 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 cc986938dd..fb0fc64813 100644 --- 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 9dee04cc75..22e446a998 100644 --- 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 c494bf4751..119a3edfaa 100644 --- a/src/lib/elementary/Elementary.h +++ b/src/lib/elementary/Elementary.h @@ -146,7 +146,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 @@ -160,7 +159,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> @@ -169,6 +167,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 @@ -284,7 +284,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> @@ -375,7 +374,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 36a31ef700..e5e1036e0c 100644 --- 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 b42db31f7f..4ad1ede4e5 100644 --- a/src/lib/elementary/efl_access_object.h +++ b/src/lib/elementary/efl_access_object.h @@ -2,13 +2,7 @@ #define EFL_ACCESS_H #ifdef EFL_BETA_API_SUPPORT - -#ifdef EFL_EO_API_SUPPORT #include "efl_access_object.eo.h" -#endif -#ifndef EFL_NOLEGACY_API_SUPPORT -#include "efl_access_object.eo.legacy.h" -#endif /* * Sets a particilar state type for given state set. @@ -36,8 +30,6 @@ EAPI void efl_access_attributes_list_free(Eina_List *list); EAPI void efl_access_attribute_free(Efl_Access_Attribute *attr); -#ifdef EFL_EO_API_SUPPORT - /** * Emits Accessible 'StateChanged' signal. */ @@ -131,6 +123,4 @@ efl_access_attribute_free(Efl_Access_Attribute *attr); efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL); #endif - -#endif #endif diff --git a/src/lib/elementary/efl_access_text.h b/src/lib/elementary/efl_access_text.h index f5cecc01bd..a1dfec0a0c 100644 --- a/src/lib/elementary/efl_access_text.h +++ b/src/lib/elementary/efl_access_text.h @@ -2,13 +2,7 @@ #define ELM_INTERFACE_ATSPI_TEXT_H #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 diff --git a/src/lib/elementary/efl_access_widget_action.h b/src/lib/elementary/efl_access_widget_action.h index 62caf4f5ae..86df79c8cc 100644 --- a/src/lib/elementary/efl_access_widget_action.h +++ b/src/lib/elementary/efl_access_widget_action.h @@ -13,12 +13,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 #endif diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h index c4b3d3c398..739d9f025d 100644 --- a/src/lib/elementary/efl_access_window.h +++ b/src/lib/elementary/efl_access_window.h @@ -2,13 +2,7 @@ #define EFL_ACCESS_WINDOW_H #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 f80dce28d5..c3c8f6ae89 100644 --- 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 b882cd77a5..1115faaf45 100644 --- 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 5e69c19dce..1d16c1f1c4 100644 --- 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 d015d1c0d7..c4cfc55815 100644 --- 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 c20e2a37c5..df4f831268 100644 --- 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_atspi_app_object.h b/src/lib/elementary/elm_atspi_app_object.h index 3d66198215..f460ffd83e 100644 --- a/src/lib/elementary/elm_atspi_app_object.h +++ b/src/lib/elementary/elm_atspi_app_object.h @@ -1,3 +1 @@ -#ifdef EFL_EO_API_SUPPORT #include "elm_atspi_app_object.eo.h" -#endif diff --git a/src/lib/elementary/elm_atspi_bridge.h b/src/lib/elementary/elm_atspi_bridge.h index 80a476df36..5e5673b2b0 100644 --- a/src/lib/elementary/elm_atspi_bridge.h +++ b/src/lib/elementary/elm_atspi_bridge.h @@ -1,5 +1,3 @@ #ifdef EFL_BETA_API_SUPPORT -#ifdef EFL_EO_API_SUPPORT #include "elm_atspi_bridge.eo.h" #endif -#endif diff --git a/src/lib/elementary/elm_check.h b/src/lib/elementary/elm_check.h index 056dee46a8..492494a2f8 100644 --- 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 c9c65c5db6..260d1dfa49 100644 --- a/src/lib/elementary/elm_config.h +++ b/src/lib/elementary/elm_config.h @@ -2356,7 +2356,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 2cc350e869..488372939a 100644 --- 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 3f2a0862a4..cf9806f501 100644 --- a/src/lib/elementary/elm_interface_scrollable.h +++ b/src/lib/elementary/elm_interface_scrollable.h @@ -58,12 +58,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 { @@ -247,7 +242,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 bcbe8e646f..2c0f33a260 100644 --- a/src/lib/elementary/elm_interfaces.h +++ b/src/lib/elementary/elm_interfaces.h @@ -3,13 +3,7 @@ #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 - #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" @@ -17,12 +11,3 @@ #include "efl_access_value.eo.h" #include "efl_ui_legacy.eo.h" #endif -#ifndef EFL_NOLEGACY_API_SUPPORT -#include "efl_access_action.eo.legacy.h" -#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 -#endif diff --git a/src/lib/elementary/elm_view_form.h b/src/lib/elementary/elm_view_form.h index e97ca6c6e7..fc35e48644 100644 --- 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 4ad048e106..7f7ef5a553 100644 --- 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 51eaee9010..39ec8eb4b1 100644 --- 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 d7eef3c090..d8eb052f93 100644 --- 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 525ca7d785..9044398971 100644 --- a/src/lib/evas/Evas.h +++ b/src/lib/evas/Evas.h @@ -169,10 +169,8 @@ #include <Eina.h> #include <Eo.h> -#ifdef EFL_BETA_API_SUPPORT /* This include has been added to support Eo in Evas */ #include <Efl.h> -#endif #include <Evas_Loader.h> diff --git a/src/lib/evas/Evas.hh b/src/lib/evas/Evas.hh index 064d8c184e..ac9b6509ed 100644 --- 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 bb710a9825..661d7f5c6b 100644 --- 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; @@ -3490,21 +3490,9 @@ typedef unsigned int Efl_Input_Device_Type; #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 a2c3e5c9e6..a4f611e201 100644 --- 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 b80b33b8e5..bc343df802 100644 --- 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 651295da03..4234502659 100644 --- 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 614f7816da..7ff098adec 100644 --- 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 8304979cf2..2ddfb272ca 100644 --- 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 |