summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac10
-rw-r--r--meson.build2
-rw-r--r--src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c1
-rw-r--r--src/bin/efl/efl_debugd.c1
-rw-r--r--src/examples/ecore/ecore_evas_vnc_example.c1
-rw-r--r--src/examples/ecore/ecore_evas_wayland_multiseat_example.c1
-rw-r--r--src/examples/ecore/efl_exe.c1
-rw-r--r--src/examples/ecore/efl_net_ip_address_example.c1
-rw-r--r--src/examples/ecore/efl_thread.c1
-rw-r--r--src/examples/elementary/efl_canvas_layout_text.c1
-rw-r--r--src/examples/elementary/efl_ui_grid_example_1.c1
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c1
-rw-r--r--src/examples/elementary/efl_ui_list_view_example_1.c1
-rw-r--r--src/examples/elementary/efl_ui_list_view_example_2.c1
-rw-r--r--src/examples/elementary/efl_ui_list_view_example_3.c1
-rw-r--r--src/examples/elementary/efl_ui_relative_layout_example_01.c1
-rw-r--r--src/examples/elementary/efl_ui_relative_layout_example_02.c1
-rw-r--r--src/examples/elementary/efl_ui_scroller_example.c1
-rw-r--r--src/examples/elementary/efl_ui_theme_example_01.c1
-rw-r--r--src/examples/elementary/efl_ui_theme_example_02.c1
-rw-r--r--src/examples/elementary/evas3d_map_example.c3
-rw-r--r--src/examples/elementary/evas3d_object_on_button_example.c3
-rw-r--r--src/examples/elementary/evas3d_scene_on_button_example.c3
-rw-r--r--src/examples/elementary/filemvc.c1
-rw-r--r--src/examples/elementary/fileviewlist.c1
-rw-r--r--src/examples/elementary/layout_property_bind.c1
-rw-r--r--src/examples/elementary/location_example_01.c3
-rw-r--r--src/examples/elementary/performance/graphical.c3
-rw-r--r--src/examples/elementary/performance/performance.c3
-rw-r--r--src/examples/elementary/performance/tools_private.h3
-rw-r--r--src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c3
-rw-r--r--src/examples/emotion/emotion_basic_example.c3
-rw-r--r--src/examples/emotion/emotion_border_example.c3
-rw-r--r--src/examples/emotion/emotion_generic_example.c3
-rw-r--r--src/examples/emotion/emotion_generic_subtitle_example.c3
-rw-r--r--src/examples/emotion/emotion_signals_example.c3
-rw-r--r--src/examples/evas/evas-3d-aabb.c1
-rw-r--r--src/examples/evas/evas-3d-blending.c1
-rw-r--r--src/examples/evas/evas-3d-colorpick.c1
-rw-r--r--src/examples/evas/evas-3d-cube-rotate.c1
-rw-r--r--src/examples/evas/evas-3d-cube.c1
-rw-r--r--src/examples/evas/evas-3d-cube2.c1
-rw-r--r--src/examples/evas/evas-3d-eet.c1
-rw-r--r--src/examples/evas/evas-3d-fog.c1
-rw-r--r--src/examples/evas/evas-3d-frustum.c1
-rw-r--r--src/examples/evas/evas-3d-hull.c1
-rw-r--r--src/examples/evas/evas-3d-md2.c1
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c1
-rw-r--r--src/examples/evas/evas-3d-obj.c1
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c1
-rw-r--r--src/examples/evas/evas-3d-pick.c1
-rw-r--r--src/examples/evas/evas-3d-ply.c1
-rw-r--r--src/examples/evas/evas-3d-proxy.c1
-rw-r--r--src/examples/evas/evas-3d-shadows.c1
-rw-r--r--src/examples/evas/evas-3d-static-lod.c1
-rw-r--r--src/examples/evas/evas-map-aa-eo.c4
-rw-r--r--src/examples/evas/evas-map-utils-eo.c4
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c1
-rw-r--r--src/examples/evas/evas-vg-batman.c4
-rw-r--r--src/examples/evas/evas-vg-simple.c4
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-header.h1
-rw-r--r--src/lib/ecore/Ecore.h5
-rw-r--r--src/lib/edje/Edje.h2
-rw-r--r--src/lib/efl/Efl_Config.h.cmake6
-rw-r--r--src/lib/efl/Efl_Config.h.in6
-rw-r--r--src/lib/eio/Eio.h2
-rw-r--r--src/lib/elementary/Efl_Ui.h4
-rw-r--r--src/lib/elementary/Elementary.h6
-rw-r--r--src/lib/elementary/Elementary.hh3
-rw-r--r--src/lib/elementary/efl_access_object.h10
-rw-r--r--src/lib/elementary/efl_access_text.h6
-rw-r--r--src/lib/elementary/efl_access_widget_action.h5
-rw-r--r--src/lib/elementary/efl_access_window.h6
-rw-r--r--src/lib/elementary/efl_ui_calendar.h3
-rw-r--r--src/lib/elementary/efl_ui_clock.h3
-rw-r--r--src/lib/elementary/efl_ui_nstate.h2
-rw-r--r--src/lib/elementary/efl_ui_video.h2
-rw-r--r--src/lib/elementary/elc_fileselector_common.h3
-rw-r--r--src/lib/elementary/elm_atspi_app_object.h2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.h2
-rw-r--r--src/lib/elementary/elm_check.h3
-rw-r--r--src/lib/elementary/elm_config.h3
-rw-r--r--src/lib/elementary/elm_helper.h2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.h7
-rw-r--r--src/lib/elementary/elm_interfaces.h15
-rw-r--r--src/lib/elementary/elm_view_form.h2
-rw-r--r--src/lib/elementary/elm_view_list.h2
-rw-r--r--src/lib/elementary/elm_win_eo.h2
-rw-r--r--src/lib/emotion/Emotion.h2
-rw-r--r--src/lib/evas/Evas.h2
-rw-r--r--src/lib/evas/Evas.hh3
-rw-r--r--src/lib/evas/Evas_Common.h14
-rw-r--r--src/lib/evas/Evas_Eo.h16
-rw-r--r--src/modules/ethumb/emotion/emotion.c1
-rw-r--r--src/tests/elementary/efl_ui_compile_test.c1
-rw-r--r--src/tests/elementary/elm_suite_build.c1
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c1
97 files changed, 17 insertions, 247 deletions
diff --git a/configure.ac b/configure.ac
index 765a640..f0277af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,6 @@ CXXFLAGS="${CXXFLAGS} -Wno-shadow" # No shadow warnings
28#### Apply configuring with legacy api's only, eo api's or both. 28#### Apply configuring with legacy api's only, eo api's or both.
29 29
30EFL_API_LEGACY_DEF="#define EFL_NOLEGACY_API_SUPPORT" 30EFL_API_LEGACY_DEF="#define EFL_NOLEGACY_API_SUPPORT"
31EFL_API_EO_DEF="#define EFL_EO_API_SUPPORT"
32efl_api="both" 31efl_api="both"
33 32
34#### For the moment the Eo EFL API is not ready you need to explicitly optin. 33#### For the moment the Eo EFL API is not ready you need to explicitly optin.
@@ -43,22 +42,15 @@ AC_ARG_WITH([api],
43case "$efl_api" in 42case "$efl_api" in
44 eo) 43 eo)
45 EFL_API_LEGACY_DEF="#define EFL_NOLEGACY_API_SUPPORT" 44 EFL_API_LEGACY_DEF="#define EFL_NOLEGACY_API_SUPPORT"
46 EFL_API_EO_DEF="#define EFL_EO_API_SUPPORT"
47 CFOPT_WARNING="xyes" 45 CFOPT_WARNING="xyes"
48 ;; 46 ;;
49 legacy) 47 legacy|both)
50 EFL_API_LEGACY_DEF="" 48 EFL_API_LEGACY_DEF=""
51 EFL_API_EO_DEF=""
52 ;;
53 both)
54 EFL_API_LEGACY_DEF=""
55 EFL_API_EO_DEF="#define EFL_EO_API_SUPPORT"
56 ;; 49 ;;
57 *) AC_MSG_ERROR([Invalid api (${efl_api}): must be eo, legacy or both]) ;; 50 *) AC_MSG_ERROR([Invalid api (${efl_api}): must be eo, legacy or both]) ;;
58esac 51esac
59 52
60AC_SUBST(EFL_API_LEGACY_DEF) 53AC_SUBST(EFL_API_LEGACY_DEF)
61AC_SUBST(EFL_API_EO_DEF)
62 54
63#### Additional options to configure 55#### Additional options to configure
64 56
diff --git a/meson.build b/meson.build
index 061cd62..ed7c9ea 100644
--- a/meson.build
+++ b/meson.build
@@ -97,7 +97,6 @@ add_global_arguments(dev_cflags, language: 'cpp')
97foreach lang : ['c', 'objc', 'cpp'] 97foreach lang : ['c', 'objc', 'cpp']
98 add_global_arguments('-DHAVE_CONFIG_H=1', language: lang) 98 add_global_arguments('-DHAVE_CONFIG_H=1', language: lang)
99 add_global_arguments('-D_GNU_SOURCE=1', language: lang) 99 add_global_arguments('-D_GNU_SOURCE=1', language: lang)
100 add_global_arguments('-DEFL_EO_API_SUPPORT=1', language: lang)
101 add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang) 100 add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang)
102 add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang) 101 add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang)
103 add_global_arguments('-DEFL_BUILD=1', language: lang) 102 add_global_arguments('-DEFL_BUILD=1', language: lang)
@@ -470,7 +469,6 @@ efl_config_h.set('EFL_VERSION_MICRO', version_micro)
470efl_config_h.set('EFL_BUILD_ID', get_option('build-id')) 469efl_config_h.set('EFL_BUILD_ID', get_option('build-id'))
471 470
472#FIXME placeholder 471#FIXME placeholder
473efl_config_h.set('EFL_API_EO_DEF', '#define EFL_API_EO_DEF "FIXME NOT IMPLEMENTED"')
474efl_config_h.set('EFL_API_LEGACY_DEF', '#define EFL_API_LEGACY_DEF "FIXME NOT IMPLEMENTED"') 472efl_config_h.set('EFL_API_LEGACY_DEF', '#define EFL_API_LEGACY_DEF "FIXME NOT IMPLEMENTED"')
475 473
476configure_file( 474configure_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 02d22ec..526a376 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 @@
3#endif 3#endif
4 4
5#define EFL_BETA_API_SUPPORT 1 5#define EFL_BETA_API_SUPPORT 1
6#define EFL_EO_API_SUPPORT 1
7#include <Eet.h> 6#include <Eet.h>
8#include <Ecore.h> 7#include <Ecore.h>
9#include <Ecore_Con.h> 8#include <Ecore_Con.h>
diff --git a/src/bin/efl/efl_debugd.c b/src/bin/efl/efl_debugd.c
index 7baffd4..3962aa6 100644
--- a/src/bin/efl/efl_debugd.c
+++ b/src/bin/efl/efl_debugd.c
@@ -21,7 +21,6 @@
21#endif 21#endif
22 22
23#define EFL_BETA_API_SUPPORT 1 23#define EFL_BETA_API_SUPPORT 1
24#define EFL_EO_API_SUPPORT 1
25 24
26#include <fcntl.h> 25#include <fcntl.h>
27#include "eina_debug_private.h" 26#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 c3d1ac7..2796771 100644
--- a/src/examples/ecore/ecore_evas_vnc_example.c
+++ b/src/examples/ecore/ecore_evas_vnc_example.c
@@ -1,4 +1,3 @@
1#define EFL_EO_API_SUPPORT
2#define EFL_BETA_API_SUPPORT 1#define EFL_BETA_API_SUPPORT
3 2
4#include <Efl.h> 3#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 3aec0fa..dc1d537 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 @@
1#define EFL_EO_API_SUPPORT
2#define EFL_BETA_API_SUPPORT 1#define EFL_BETA_API_SUPPORT
3 2
4#include <Efl.h> 3#include <Efl.h>
diff --git a/src/examples/ecore/efl_exe.c b/src/examples/ecore/efl_exe.c
index e50d495..f435bcad 100644
--- a/src/examples/ecore/efl_exe.c
+++ b/src/examples/ecore/efl_exe.c
@@ -1,5 +1,4 @@
1#define EFL_BETA_API_SUPPORT 1#define EFL_BETA_API_SUPPORT
2#define EFL_EO_API_SUPPORT
3 2
4#include <stdio.h> 3#include <stdio.h>
5#include <string.h> 4#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 0097c2a..b2bc9c6 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 @@
1#define EFL_BETA_API_SUPPORT 1 1#define EFL_BETA_API_SUPPORT 1
2#define EFL_EO_API_SUPPORT 1
3#ifdef HAVE_CONFIG_H 2#ifdef HAVE_CONFIG_H
4# include "config.h" 3# include "config.h"
5#endif 4#endif
diff --git a/src/examples/ecore/efl_thread.c b/src/examples/ecore/efl_thread.c
index a0b1a3a..0298be1 100644
--- a/src/examples/ecore/efl_thread.c
+++ b/src/examples/ecore/efl_thread.c
@@ -1,5 +1,4 @@
1#define EFL_BETA_API_SUPPORT 1#define EFL_BETA_API_SUPPORT
2#define EFL_EO_API_SUPPORT
3 2
4#include <stdio.h> 3#include <stdio.h>
5#include <string.h> 4#include <string.h>
diff --git a/src/examples/elementary/efl_canvas_layout_text.c b/src/examples/elementary/efl_canvas_layout_text.c
index da0e089..bb4fa7b 100644
--- a/src/examples/elementary/efl_canvas_layout_text.c
+++ b/src/examples/elementary/efl_canvas_layout_text.c
@@ -6,7 +6,6 @@
6# include "elementary_config.h" 6# include "elementary_config.h"
7#else 7#else
8# define EFL_BETA_API_SUPPORT 1 8# define EFL_BETA_API_SUPPORT 1
9# define EFL_EO_API_SUPPORT 1
10#endif 9#endif
11 10
12#include <Efl.h> 11#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 92379fe..6fe455c 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 @@
4#include "elementary_config.h" 4#include "elementary_config.h"
5#else 5#else
6#define EFL_BETA_API_SUPPORT 1 6#define EFL_BETA_API_SUPPORT 1
7#define EFL_EO_API_SUPPORT 1
8#endif 7#endif
9 8
10#include <Efl_Ui.h> 9#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 cad8e11..071eb32 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 @@
5# include "elementary_config.h" 5# include "elementary_config.h"
6#else 6#else
7# define EFL_BETA_API_SUPPORT 1 7# define EFL_BETA_API_SUPPORT 1
8# define EFL_EO_API_SUPPORT 1
9#endif 8#endif
10 9
11#include <Efl_Ui.h> 10#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 3943a77..04ae147 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 @@
4# include "elementary_config.h" 4# include "elementary_config.h"
5#else 5#else
6# define EFL_BETA_API_SUPPORT 1 6# define EFL_BETA_API_SUPPORT 1
7# define EFL_EO_API_SUPPORT 1
8#endif 7#endif
9 8
10#include <Efl_Ui.h> 9#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 8e47d92..a843f6e 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 @@
4# include "config.h" 4# include "config.h"
5#else 5#else
6# define EFL_BETA_API_SUPPORT 1 6# define EFL_BETA_API_SUPPORT 1
7# define EFL_EO_API_SUPPORT 1
8#endif 7#endif
9 8
10#include <Efl_Ui.h> 9#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 9cc4c8e..c027856 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 @@
4# include "config.h" 4# include "config.h"
5#else 5#else
6# define EFL_BETA_API_SUPPORT 1 6# define EFL_BETA_API_SUPPORT 1
7# define EFL_EO_API_SUPPORT 1
8#endif 7#endif
9 8
10#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED 9#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 7ccec35..e2d2af7 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 @@
4#include "elementary_config.h" 4#include "elementary_config.h"
5#else 5#else
6#define EFL_BETA_API_SUPPORT 1 6#define EFL_BETA_API_SUPPORT 1
7#define EFL_EO_API_SUPPORT 1
8#endif 7#endif
9 8
10#include <Efl_Ui.h> 9#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 14af786..fe25463 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 @@
4#include "elementary_config.h" 4#include "elementary_config.h"
5#else 5#else
6#define EFL_BETA_API_SUPPORT 1 6#define EFL_BETA_API_SUPPORT 1
7#define EFL_EO_API_SUPPORT 1
8#endif 7#endif
9 8
10#include <Efl_Ui.h> 9#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 e76254d..90e6f55 100644
--- a/src/examples/elementary/efl_ui_scroller_example.c
+++ b/src/examples/elementary/efl_ui_scroller_example.c
@@ -2,7 +2,6 @@
2//gcc -g efl_ui_scroller_example.c -o efl_ui_scroller_example `pkg-config --cflags --libs elementary` 2//gcc -g efl_ui_scroller_example.c -o efl_ui_scroller_example `pkg-config --cflags --libs elementary`
3 3
4#define EFL_BETA_API_SUPPORT 4#define EFL_BETA_API_SUPPORT
5#define EFL_EO_API_SUPPORT
6 5
7#include <Efl_Ui.h> 6#include <Efl_Ui.h>
8#include <Elementary.h> 7#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 29614c8..15e1017 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 @@
3 * gcc -o efl_ui_theme_example_01 efl_ui_theme_example_01.c `pkg-config --cflags --libs elementary` 3 * gcc -o efl_ui_theme_example_01 efl_ui_theme_example_01.c `pkg-config --cflags --libs elementary`
4 */ 4 */
5#define EFL_BETA_API_SUPPORT 1 5#define EFL_BETA_API_SUPPORT 1
6#define EFL_EO_API_SUPPORT 1
7 6
8#define EFL_UI_WIDGET_PROTECTED 7#define EFL_UI_WIDGET_PROTECTED
9#include <Efl_Ui.h> 8#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 b78dc73..0d0390b 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 @@
3 * gcc -o efl_ui_theme_example_02 efl_ui_theme_example_02.c `pkg-config --cflags --libs elementary` 3 * gcc -o efl_ui_theme_example_02 efl_ui_theme_example_02.c `pkg-config --cflags --libs elementary`
4 */ 4 */
5#define EFL_BETA_API_SUPPORT 1 5#define EFL_BETA_API_SUPPORT 1
6#define EFL_EO_API_SUPPORT 1
7 6
8#define EFL_UI_WIDGET_PROTECTED 7#define EFL_UI_WIDGET_PROTECTED
9#include <Efl_Ui.h> 8#include <Efl_Ui.h>
diff --git a/src/examples/elementary/evas3d_map_example.c b/src/examples/elementary/evas3d_map_example.c
index 6ce5329..f0859e3 100644
--- a/src/examples/elementary/evas3d_map_example.c
+++ b/src/examples/elementary/evas3d_map_example.c
@@ -1,6 +1,3 @@
1#ifndef EFL_EO_API_SUPPORT
2# define EFL_EO_API_SUPPORT
3#endif
4#ifndef EFL_BETA_API_SUPPORT 1#ifndef EFL_BETA_API_SUPPORT
5# define EFL_BETA_API_SUPPORT 2# define EFL_BETA_API_SUPPORT
6#endif 3#endif
diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c
index 8b6724a..fe458eb 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 @@
8#ifndef EFL_BETA_API_SUPPORT 8#ifndef EFL_BETA_API_SUPPORT
9# define EFL_BETA_API_SUPPORT 9# define EFL_BETA_API_SUPPORT
10#endif 10#endif
11#ifndef EFL_EO_API_SUPPORT
12# define EFL_EO_API_SUPPORT
13#endif
14 11
15#include <Eo.h> 12#include <Eo.h>
16#include <Evas.h> 13#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 0581799..267e45b 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 @@
5* Compile with: 5* Compile with:
6* gcc -o evas3d_scene_on_button_example evas3d_scene_on_button_example.c -g `pkg-config --libs --cflags evas ecore eo elementary` 6* gcc -o evas3d_scene_on_button_example evas3d_scene_on_button_example.c -g `pkg-config --libs --cflags evas ecore eo elementary`
7*/ 7*/
8#ifndef EFL_EO_API_SUPPORT
9# define EFL_EO_API_SUPPORT
10#endif
11#ifndef EFL_BETA_API_SUPPORT 8#ifndef EFL_BETA_API_SUPPORT
12# define EFL_BETA_API_SUPPORT 9# define EFL_BETA_API_SUPPORT
13#endif 10#endif
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index 2aa0a54..dfe73c8 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -4,7 +4,6 @@
4# include "config.h" 4# include "config.h"
5#else 5#else
6# define EFL_BETA_API_SUPPORT 1 6# define EFL_BETA_API_SUPPORT 1
7# define EFL_EO_API_SUPPORT 1
8#endif 7#endif
9 8
10#include <Elementary.h> 9#include <Elementary.h>
diff --git a/src/examples/elementary/fileviewlist.c b/src/examples/elementary/fileviewlist.c
index 4f7ff60..ffbaca5 100644
--- a/src/examples/elementary/fileviewlist.c
+++ b/src/examples/elementary/fileviewlist.c
@@ -5,7 +5,6 @@
5# include "config.h" 5# include "config.h"
6#else 6#else
7# define EFL_BETA_API_SUPPORT 1 7# define EFL_BETA_API_SUPPORT 1
8# define EFL_EO_API_SUPPORT 1
9#endif 8#endif
10 9
11#include <Elementary.h> 10#include <Elementary.h>
diff --git a/src/examples/elementary/layout_property_bind.c b/src/examples/elementary/layout_property_bind.c
index 3277288..2b91101 100644
--- a/src/examples/elementary/layout_property_bind.c
+++ b/src/examples/elementary/layout_property_bind.c
@@ -4,7 +4,6 @@
4# include "config.h" 4# include "config.h"
5#else 5#else
6# define EFL_BETA_API_SUPPORT 1 6# define EFL_BETA_API_SUPPORT 1
7# define EFL_EO_API_SUPPORT 1
8#endif 7#endif
9 8
10#include <Efl_Ui.h> 9#include <Efl_Ui.h>
diff --git a/src/examples/elementary/location_example_01.c b/src/examples/elementary/location_example_01.c
index b98371d..7b8ad6f 100644
--- a/src/examples/elementary/location_example_01.c
+++ b/src/examples/elementary/location_example_01.c
@@ -1,8 +1,5 @@
1//Compile with: 1//Compile with:
2//gcc -o location_example_01 location_example_01.c -g `pkg-config --cflags --libs elementary elocation` 2//gcc -o location_example_01 location_example_01.c -g `pkg-config --cflags --libs elementary elocation`
3#ifndef EFL_EO_API_SUPPORT
4# define EFL_EO_API_SUPPORT
5#endif
6#ifndef EFL_BETA_API_SUPPORT 3#ifndef EFL_BETA_API_SUPPORT
7# define EFL_BETA_API_SUPPORT 4# define EFL_BETA_API_SUPPORT
8#endif 5#endif
diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 3c7caa2..c3a8768 100644
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -1,6 +1,3 @@
1#ifndef EFL_EO_API_SUPPORT
2# define EFL_EO_API_SUPPORT
3#endif
4#ifndef EFL_BETA_API_SUPPORT 1#ifndef EFL_BETA_API_SUPPORT
5# define EFL_BETA_API_SUPPORT 2# define EFL_BETA_API_SUPPORT
6#endif 3#endif
diff --git a/src/examples/elementary/performance/performance.c b/src/examples/elementary/performance/performance.c
index cced019..d6e9ac5 100644
--- a/src/examples/elementary/performance/performance.c
+++ b/src/examples/elementary/performance/performance.c
@@ -30,9 +30,6 @@
30#include <stdio.h> 30#include <stdio.h>
31#include <stdlib.h> 31#include <stdlib.h>
32 32
33#ifndef EFL_EO_API_SUPPORT
34# define EFL_EO_API_SUPPORT
35#endif
36#ifndef EFL_BETA_API_SUPPORT 33#ifndef EFL_BETA_API_SUPPORT
37# define EFL_BETA_API_SUPPORT 34# define EFL_BETA_API_SUPPORT
38#endif 35#endif
diff --git a/src/examples/elementary/performance/tools_private.h b/src/examples/elementary/performance/tools_private.h
index 20aa80d..40d6f12 100644
--- a/src/examples/elementary/performance/tools_private.h
+++ b/src/examples/elementary/performance/tools_private.h
@@ -1,6 +1,3 @@
1#ifndef EFL_EO_API_SUPPORT
2# define EFL_EO_API_SUPPORT
3#endif
4#ifndef EFL_BETA_API_SUPPORT 1#ifndef EFL_BETA_API_SUPPORT
5# define EFL_BETA_API_SUPPORT 2# define EFL_BETA_API_SUPPORT
6#endif 3#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 7b78974..5120154 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 @@
14* edje_cc sphere_hunter.edc 14* edje_cc sphere_hunter.edc
15* gcc -o evas_3d_sphere_hunter evas_3d_sphere_hunter.c -g `pkg-config --libs --cflags evas ecore elementary eina eo` -lm 15* gcc -o evas_3d_sphere_hunter evas_3d_sphere_hunter.c -g `pkg-config --libs --cflags evas ecore elementary eina eo` -lm
16*/ 16*/
17#ifndef EFL_EO_API_SUPPORT
18# define EFL_EO_API_SUPPORT
19#endif
20#ifndef EFL_BETA_API_SUPPORT 17#ifndef EFL_BETA_API_SUPPORT
21# define EFL_BETA_API_SUPPORT 18# define EFL_BETA_API_SUPPORT
22#endif 19#endif
diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c
index 8f47004..04df0e8 100644
--- a/src/examples/emotion/emotion_basic_example.c
+++ b/src/examples/emotion/emotion_basic_example.c
@@ -1,9 +1,6 @@
1//Compile with: 1//Compile with:
2// gcc -o emotion_basic_example emotion_basic_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eo` 2// gcc -o emotion_basic_example emotion_basic_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eo`
3 3
4#ifndef EFL_EO_API_SUPPORT
5# define EFL_EO_API_SUPPORT
6#endif
7#ifndef EFL_BETA_API_SUPPORT 4#ifndef EFL_BETA_API_SUPPORT
8# define EFL_BETA_API_SUPPORT 5# define EFL_BETA_API_SUPPORT
9#endif 6#endif
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index 7a24b8d..8ece2d2 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -1,8 +1,5 @@
1//Compile with: 1//Compile with:
2// gcc -o emotion_border_example emotion_border_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eina eo` 2// gcc -o emotion_border_example emotion_border_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eina eo`
3#ifndef EFL_EO_API_SUPPORT
4# define EFL_EO_API_SUPPORT
5#endif
6#ifndef EFL_BETA_API_SUPPORT 3#ifndef EFL_BETA_API_SUPPORT
7# define EFL_BETA_API_SUPPORT 4# define EFL_BETA_API_SUPPORT
8#endif 5#endif
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index 0bd722a..4ac996f 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -1,8 +1,5 @@
1//Compile with: 1//Compile with:
2// gcc -o emotion_generic_example emotion_generic_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eina eo` 2// gcc -o emotion_generic_example emotion_generic_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eina eo`
3#ifndef EFL_EO_API_SUPPORT
4# define EFL_EO_API_SUPPORT
5#endif
6#ifndef EFL_BETA_API_SUPPORT 3#ifndef EFL_BETA_API_SUPPORT
7# define EFL_BETA_API_SUPPORT 4# define EFL_BETA_API_SUPPORT
8#endif 5#endif
diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c
index 07c8973..40543f4 100644
--- a/src/examples/emotion/emotion_generic_subtitle_example.c
+++ b/src/examples/emotion/emotion_generic_subtitle_example.c
@@ -1,9 +1,6 @@
1//Compile with: 1//Compile with:
2// gcc -o emotion_generic_subtitle_example emotion_generic_subtitle_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eo` 2// gcc -o emotion_generic_subtitle_example emotion_generic_subtitle_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eo`
3 3
4#ifndef EFL_EO_API_SUPPORT
5# define EFL_EO_API_SUPPORT
6#endif
7#ifndef EFL_BETA_API_SUPPORT 4#ifndef EFL_BETA_API_SUPPORT
8# define EFL_BETA_API_SUPPORT 5# define EFL_BETA_API_SUPPORT
9#endif 6#endif
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index b5dc625..dbc7a5b 100644
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -1,9 +1,6 @@
1//Compile with: 1//Compile with:
2// gcc -o emotion_signals_example emotion_signals_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eo` 2// gcc -o emotion_signals_example emotion_signals_example.c `pkg-config --libs --cflags emotion evas ecore ecore-evas eo`
3 3
4#ifndef EFL_EO_API_SUPPORT
5# define EFL_EO_API_SUPPORT
6#endif
7#ifndef EFL_BETA_API_SUPPORT 4#ifndef EFL_BETA_API_SUPPORT
8# define EFL_BETA_API_SUPPORT 5# define EFL_BETA_API_SUPPORT
9#endif 6#endif
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index fdb8a45..99e3b98 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -14,7 +14,6 @@
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15#define PACKAGE_EXAMPLES_DIR "."
16#define EFL_BETA_API_SUPPORT 16#define EFL_BETA_API_SUPPORT
17#define EFL_EO_API_SUPPORT
18#endif 17#endif
19 18
20#include <Eo.h> 19#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 667b671..47271ff 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -14,7 +14,6 @@
14#include "config.h" 14#include "config.h"
15#else 15#else
16#define EFL_BETA_API_SUPPORT 16#define EFL_BETA_API_SUPPORT
17#define EFL_EO_API_SUPPORT
18#endif 17#endif
19 18
20#include <Eo.h> 19#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index 7b894cd..138ceb0 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -19,7 +19,6 @@
19#else 19#else
20#define PACKAGE_EXAMPLES_DIR "." 20#define PACKAGE_EXAMPLES_DIR "."
21#define EFL_BETA_API_SUPPORT 21#define EFL_BETA_API_SUPPORT
22#define EFL_EO_API_SUPPORT
23#endif 22#endif
24 23
25#include <Eo.h> 24#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index 2588902..d5b89b3 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -16,7 +16,6 @@
16#include "config.h" 16#include "config.h"
17#else 17#else
18#define EFL_BETA_API_SUPPORT 18#define EFL_BETA_API_SUPPORT
19#define EFL_EO_API_SUPPORT
20#endif 19#endif
21 20
22#include <Ecore.h> 21#include <Ecore.h>
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index e8d04d4..3fba86a 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -12,7 +12,6 @@
12#include "config.h" 12#include "config.h"
13#else 13#else
14#define EFL_BETA_API_SUPPORT 14#define EFL_BETA_API_SUPPORT
15#define EFL_EO_API_SUPPORT
16#endif 15#endif
17 16
18#include <Eo.h> 17#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index b2d905e..493cea9 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -11,7 +11,6 @@
11#else 11#else
12#define PACKAGE_EXAMPLES_DIR "." 12#define PACKAGE_EXAMPLES_DIR "."
13#define EFL_BETA_API_SUPPORT 13#define EFL_BETA_API_SUPPORT
14#define EFL_EO_API_SUPPORT
15#endif 14#endif
16 15
17#include <Eo.h> 16#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index becd0bc..5ecd79e 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -18,7 +18,6 @@
18#else 18#else
19#define PACKAGE_EXAMPLES_DIR "." 19#define PACKAGE_EXAMPLES_DIR "."
20#define EFL_BETA_API_SUPPORT 20#define EFL_BETA_API_SUPPORT
21#define EFL_EO_API_SUPPORT
22#endif 21#endif
23 22
24#include <Eo.h> 23#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index 4c69dca..8bcd51b 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -10,7 +10,6 @@
10#include "config.h" 10#include "config.h"
11#else 11#else
12#define EFL_BETA_API_SUPPORT 12#define EFL_BETA_API_SUPPORT
13#define EFL_EO_API_SUPPORT
14#endif 13#endif
15 14
16#include <math.h> 15#include <math.h>
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 6e765bd..6aacecc 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -20,7 +20,6 @@
20#else 20#else
21#define PACKAGE_EXAMPLES_DIR "." 21#define PACKAGE_EXAMPLES_DIR "."
22#define EFL_BETA_API_SUPPORT 22#define EFL_BETA_API_SUPPORT
23#define EFL_EO_API_SUPPORT
24#endif 23#endif
25 24
26#include <Ecore.h> 25#include <Ecore.h>
diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c
index e82f31b..6ca1283 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -18,7 +18,6 @@
18#else 18#else
19#define PACKAGE_EXAMPLES_DIR "." 19#define PACKAGE_EXAMPLES_DIR "."
20#define EFL_BETA_API_SUPPORT 20#define EFL_BETA_API_SUPPORT
21#define EFL_EO_API_SUPPORT
22#endif 21#endif
23 22
24#include <Eo.h> 23#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index f97c183..4c93b54 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -11,7 +11,6 @@
11#else 11#else
12#define PACKAGE_EXAMPLES_DIR "." 12#define PACKAGE_EXAMPLES_DIR "."
13#define EFL_BETA_API_SUPPORT 13#define EFL_BETA_API_SUPPORT
14#define EFL_EO_API_SUPPORT
15#endif 14#endif
16 15
17#include <Eo.h> 16#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 149217d..df8bdbd 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -15,7 +15,6 @@
15#else 15#else
16#define PACKAGE_EXAMPLES_DIR "." 16#define PACKAGE_EXAMPLES_DIR "."
17#define EFL_BETA_API_SUPPORT 17#define EFL_BETA_API_SUPPORT
18#define EFL_EO_API_SUPPORT
19#endif 18#endif
20 19
21#include <Eo.h> 20#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 91126fb..6bf668b 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -19,7 +19,6 @@
19#else 19#else
20#define PACKAGE_EXAMPLES_DIR "." 20#define PACKAGE_EXAMPLES_DIR "."
21#define EFL_BETA_API_SUPPORT 21#define EFL_BETA_API_SUPPORT
22#define EFL_EO_API_SUPPORT
23#endif 22#endif
24 23
25#include <Eo.h> 24#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index 1d2cc75..65d1880 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -13,7 +13,6 @@
13#else 13#else
14#define PACKAGE_EXAMPLES_DIR "." 14#define PACKAGE_EXAMPLES_DIR "."
15#define EFL_BETA_API_SUPPORT 15#define EFL_BETA_API_SUPPORT
16#define EFL_EO_API_SUPPORT
17#endif 16#endif
18 17
19#include <Eo.h> 18#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 20230d0..5ed8067 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -15,7 +15,6 @@
15#else 15#else
16#define PACKAGE_EXAMPLES_DIR "." 16#define PACKAGE_EXAMPLES_DIR "."
17#define EFL_BETA_API_SUPPORT 17#define EFL_BETA_API_SUPPORT
18#define EFL_EO_API_SUPPORT
19#endif 18#endif
20 19
21#include <math.h> 20#include <math.h>
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 7769a45..ba0b912 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -16,7 +16,6 @@
16#else 16#else
17#define PACKAGE_EXAMPLES_DIR "." 17#define PACKAGE_EXAMPLES_DIR "."
18#define EFL_BETA_API_SUPPORT 18#define EFL_BETA_API_SUPPORT
19#define EFL_EO_API_SUPPORT
20#endif 19#endif
21 20
22#include <Eo.h> 21#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 6445ee9..1a671f8 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -12,7 +12,6 @@
12#include "config.h" 12#include "config.h"
13#else 13#else
14#define EFL_BETA_API_SUPPORT 14#define EFL_BETA_API_SUPPORT
15#define EFL_EO_API_SUPPORT
16#endif 15#endif
17 16
18#include <math.h> 17#include <math.h>
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 1673318..eaa2f02 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -31,7 +31,6 @@
31#else 31#else
32#define PACKAGE_EXAMPLES_DIR "." 32#define PACKAGE_EXAMPLES_DIR "."
33#define EFL_BETA_API_SUPPORT 33#define EFL_BETA_API_SUPPORT
34#define EFL_EO_API_SUPPORT
35#endif 34#endif
36 35
37#include <Eo.h> 36#include <Eo.h>
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index 92e3b1a..3b08380 100644
--- a/src/examples/evas/evas-3d-static-lod.c
+++ b/src/examples/evas/evas-3d-static-lod.c
@@ -16,7 +16,6 @@
16#else 16#else
17#define PACKAGE_EXAMPLES_DIR "." 17#define PACKAGE_EXAMPLES_DIR "."
18#define EFL_BETA_API_SUPPORT 18#define EFL_BETA_API_SUPPORT
19#define EFL_EO_API_SUPPORT
20#endif 19#endif
21 20
22#include <Eo.h> 21#include <Eo.h>
diff --git a/src/examples/evas/evas-map-aa-eo.c b/src/examples/evas/evas-map-aa-eo.c
index 30e8831..b8156ad 100644
--- a/src/examples/evas/evas-map-aa-eo.c
+++ b/src/examples/evas/evas-map-aa-eo.c
@@ -16,10 +16,6 @@
16# define EFL_BETA_API_SUPPORT 16# define EFL_BETA_API_SUPPORT
17#endif 17#endif
18 18
19#ifndef EFL_EO_API_SUPPORT
20# define EFL_EO_API_SUPPORT
21#endif
22
23#include <Ecore.h> 19#include <Ecore.h>
24#include <Ecore_Evas.h> 20#include <Ecore_Evas.h>
25#include <stdlib.h> 21#include <stdlib.h>
diff --git a/src/examples/evas/evas-map-utils-eo.c b/src/examples/evas/evas-map-utils-eo.c
index 157b3af..1ea812b 100644
--- a/src/examples/evas/evas-map-utils-eo.c
+++ b/src/examples/evas/evas-map-utils-eo.c
@@ -19,10 +19,6 @@
19# define EFL_BETA_API_SUPPORT 19# define EFL_BETA_API_SUPPORT
20#endif 20#endif
21 21
22#ifndef EFL_EO_API_SUPPORT
23# define EFL_EO_API_SUPPORT
24#endif
25
26#include <Ecore.h> 22#include <Ecore.h>
27#include <Ecore_Evas.h> 23#include <Ecore_Evas.h>
28 24
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 4d4c37f..7ba391a 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -14,7 +14,6 @@
14#include "config.h" 14#include "config.h"
15#else 15#else
16#define PACKAGE_EXAMPLES_DIR "." 16#define PACKAGE_EXAMPLES_DIR "."
17#define EFL_EO_API_SUPPORT
18#define EFL_BETA_API_SUPPORT 17#define EFL_BETA_API_SUPPORT
19#endif 18#endif
20 19
diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c
index 650709f..8625366 100644
--- a/src/examples/evas/evas-vg-batman.c
+++ b/src/examples/evas/evas-vg-batman.c
@@ -22,10 +22,6 @@
22#define EFL_BETA_API_SUPPORT 22#define EFL_BETA_API_SUPPORT
23#endif 23#endif
24 24
25#ifndef EFL_EO_API_SUPPORT
26#define EFL_EO_API_SUPPORT
27#endif
28
29#include <Eo.h> 25#include <Eo.h>
30#include <Efl.h> 26#include <Efl.h>
31#include <Evas.h> 27#include <Evas.h>
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 36b8baa..ef128d5 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -43,10 +43,6 @@
43#define EFL_BETA_API_SUPPORT 43#define EFL_BETA_API_SUPPORT
44#endif 44#endif
45 45
46#ifndef EFL_EO_API_SUPPORT
47#define EFL_EO_API_SUPPORT
48#endif
49
50#include <Eo.h> 46#include <Eo.h>
51#include <Efl.h> 47#include <Efl.h>
52#include <Evas.h> 48#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 13600ec..aaa6ff3 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 @@
5#else 5#else
6#define PACKAGE_EXAMPLES_DIR "." 6#define PACKAGE_EXAMPLES_DIR "."
7#define EFL_BETA_API_SUPPORT 7#define EFL_BETA_API_SUPPORT
8#define EFL_EO_API_SUPPORT
9#endif 8#endif
10 9
11#include <stdio.h> 10#include <stdio.h>
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index 28b7af2..cfc6dd7 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -274,10 +274,7 @@
274 274
275#include <Eina.h> 275#include <Eina.h>
276#include <Eo.h> 276#include <Eo.h>
277
278#ifdef EFL_BETA_API_SUPPORT
279#include <Efl.h> 277#include <Efl.h>
280#endif
281 278
282#ifdef EAPI 279#ifdef EAPI
283# undef EAPI 280# undef EAPI
@@ -333,9 +330,7 @@ extern "C" {
333#ifndef EFL_NOLEGACY_API_SUPPORT 330#ifndef EFL_NOLEGACY_API_SUPPORT
334#include "Ecore_Legacy.h" 331#include "Ecore_Legacy.h"
335#endif 332#endif
336#ifdef EFL_EO_API_SUPPORT
337#include "Ecore_Eo.h" 333#include "Ecore_Eo.h"
338#endif
339 334
340#ifdef __cplusplus 335#ifdef __cplusplus
341} 336}
diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h
index 4d747fc..d8c32dc 100644
--- a/src/lib/edje/Edje.h
+++ b/src/lib/edje/Edje.h
@@ -253,9 +253,7 @@ extern "C" {
253#ifndef EFL_NOLEGACY_API_SUPPORT 253#ifndef EFL_NOLEGACY_API_SUPPORT
254#include "Edje_Legacy.h" 254#include "Edje_Legacy.h"
255#endif 255#endif
256#ifdef EFL_EO_API_SUPPORT
257#include "Edje_Eo.h" 256#include "Edje_Eo.h"
258#endif
259 257
260#ifdef __cplusplus 258#ifdef __cplusplus
261} 259}
diff --git a/src/lib/efl/Efl_Config.h.cmake b/src/lib/efl/Efl_Config.h.cmake
index 4f7a03a..5c7a420 100644
--- a/src/lib/efl/Efl_Config.h.cmake
+++ b/src/lib/efl/Efl_Config.h.cmake
@@ -3,16 +3,12 @@
3 3
4/* Add -DEFL_API_OVERRIDE ot your CFLAGS to override the default 4/* Add -DEFL_API_OVERRIDE ot your CFLAGS to override the default
5 * installed api set and then fter that -DEFL_NOLEGACY_API_SUPPORT 5 * installed api set and then fter that -DEFL_NOLEGACY_API_SUPPORT
6 * and/or -DEFL_EO_API_SUPPORT as desired 6 * as desired
7 */ 7 */
8#ifndef EFL_API_OVERRIDE 8#ifndef EFL_API_OVERRIDE
9 9
10#cmakedefine EFL_API_LEGACY_DEF 10#cmakedefine EFL_API_LEGACY_DEF
11#cmakedefine EFL_BETA_API_SUPPORT 11#cmakedefine EFL_BETA_API_SUPPORT
12/* You can't disable Eo API anymore as EFL use it everywhere internally
13 and we don't want to expose it publicly just yet, so keep it hidden
14 and require an explicit request to get it. */
15/* #define EFL_EO_API_SUPPORT */
16#endif 12#endif
17 13
18#define EFL_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ 14#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 25420d0..1673cd0 100644
--- a/src/lib/efl/Efl_Config.h.in
+++ b/src/lib/efl/Efl_Config.h.in
@@ -3,14 +3,10 @@
3 3
4/* Add -DEFL_API_OVERRIDE ot your CFLAGS to override the default 4/* Add -DEFL_API_OVERRIDE ot your CFLAGS to override the default
5 * installed api set and then fter that -DEFL_NOLEGACY_API_SUPPORT 5 * installed api set and then fter that -DEFL_NOLEGACY_API_SUPPORT
6 * and/or -DEFL_EO_API_SUPPORT as desired 6 * as desired
7 */ 7 */
8#ifndef EFL_API_OVERRIDE 8#ifndef EFL_API_OVERRIDE
9@EFL_API_LEGACY_DEF@ 9@EFL_API_LEGACY_DEF@
10/* You can't disable Eo API anymore as EFL use it everywhere internally
11 and we don't want to expose it publicly just yet, so keep it hidden
12 and require an explicit request to get it. */
13/* @EFL_API_EO_DEF@ */
14#endif 10#endif
15 11
16#define EFL_VERSION_MAJOR @EFL_VERSION_MAJOR@ 12#define EFL_VERSION_MAJOR @EFL_VERSION_MAJOR@
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index cc98693..fb0fc64 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
76#ifndef EFL_NOLEGACY_API_SUPPORT 76#ifndef EFL_NOLEGACY_API_SUPPORT
77#include "Eio_Legacy.h" 77#include "Eio_Legacy.h"
78#endif 78#endif
79#ifdef EFL_EO_API_SUPPORT
80#include "Eio_Eo.h" 79#include "Eio_Eo.h"
81#endif
82 80
83/** 81/**
84 * @brief get access time from a Eina_Stat 82 * @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 9dee04c..22e446a 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -4,10 +4,6 @@
4#include <Efl_Config.h> 4#include <Efl_Config.h>
5#include <Elementary_Options.h> 5#include <Elementary_Options.h>
6 6
7#ifndef EFL_EO_API_SUPPORT
8# define EFL_EO_API_SUPPORT
9#endif
10
11/* FIXME: wtf? */ 7/* FIXME: wtf? */
12#ifndef EFL_UI_RADIO_EVENT_CHANGED 8#ifndef EFL_UI_RADIO_EVENT_CHANGED
13# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED 9# 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 c494bf4..119a3ed 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -146,7 +146,6 @@ EAPI extern Elm_Version *elm_version;
146#include <elm_config.h> 146#include <elm_config.h>
147#include <elm_focus.h> 147#include <elm_focus.h>
148 148
149#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
150#include <Efl.h> 149#include <Efl.h>
151/* FIXME: wtf? */ 150/* FIXME: wtf? */
152#ifndef EFL_UI_RADIO_EVENT_CHANGED 151#ifndef EFL_UI_RADIO_EVENT_CHANGED
@@ -160,7 +159,6 @@ typedef Eo Efl_Ui_Focus_Manager;
160 159
161# include <efl_ui_focus_object.eo.h> 160# include <efl_ui_focus_object.eo.h>
162# include <efl_ui_focus_manager.eo.h> 161# include <efl_ui_focus_manager.eo.h>
163EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
164# include <efl_ui_focus_manager_window_root.eo.h> 162# include <efl_ui_focus_manager_window_root.eo.h>
165# include <efl_ui_focus_manager_calc.eo.h> 163# include <efl_ui_focus_manager_calc.eo.h>
166# include <efl_ui_focus_manager_sub.eo.h> 164# include <efl_ui_focus_manager_sub.eo.h>
@@ -169,6 +167,8 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
169# include <efl_ui_l10n.eo.h> 167# include <efl_ui_l10n.eo.h>
170# include <efl_ui_focus_composition.eo.h> 168# include <efl_ui_focus_composition.eo.h>
171# include <efl_ui_focus_layer.eo.h> 169# include <efl_ui_focus_layer.eo.h>
170
171#ifdef EFL_BETA_API_SUPPORT
172# include <elm_interface_scrollable.h> 172# include <elm_interface_scrollable.h>
173# include <elm_interface_scrollable.eo.h> 173# include <elm_interface_scrollable.eo.h>
174#endif 174#endif
@@ -284,7 +284,6 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
284#include <elm_web.h> 284#include <elm_web.h>
285#include <elm_win.h> 285#include <elm_win.h>
286 286
287#ifdef EFL_EO_API_SUPPORT
288# include <efl_ui_selection_types.eot.h> 287# include <efl_ui_selection_types.eot.h>
289# include <efl_ui_theme.eo.h> 288# include <efl_ui_theme.eo.h>
290# include <efl_config_global.eo.h> 289# include <efl_config_global.eo.h>
@@ -375,7 +374,6 @@ typedef Eo Efl_Ui_Pager;
375# include <efl_ui_tab_page.eo.h> 374# include <efl_ui_tab_page.eo.h>
376# include <efl_ui_tab_page_part_tab.eo.h> 375# include <efl_ui_tab_page_part_tab.eo.h>
377# include <efl_ui_tab_pager.eo.h> 376# include <efl_ui_tab_pager.eo.h>
378#endif
379 377
380/* include deprecated calls last of all */ 378/* include deprecated calls last of all */
381#include <elm_deprecated.h> 379#include <elm_deprecated.h>
diff --git a/src/lib/elementary/Elementary.hh b/src/lib/elementary/Elementary.hh
index 36a31ef..e5e1036 100644
--- a/src/lib/elementary/Elementary.hh
+++ b/src/lib/elementary/Elementary.hh
@@ -7,9 +7,6 @@
7#ifndef EFL_BETA_API_SUPPORT 7#ifndef EFL_BETA_API_SUPPORT
8#define EFL_BETA_API_SUPPORT 8#define EFL_BETA_API_SUPPORT
9#endif 9#endif
10#ifndef EFL_EO_API_SUPPORT
11#define EFL_EO_API_SUPPORT
12#endif
13#ifndef ELM_INTERNAL_API_ARGESFSDFEFC 10#ifndef ELM_INTERNAL_API_ARGESFSDFEFC
14#define ELM_INTERNAL_API_ARGESFSDFEFC 11#define ELM_INTERNAL_API_ARGESFSDFEFC
15#endif 12#endif
diff --git a/src/lib/elementary/efl_access_object.h b/src/lib/elementary/efl_access_object.h
index b42db31..4ad1ede 100644
--- a/src/lib/elementary/efl_access_object.h
+++ b/src/lib/elementary/efl_access_object.h
@@ -2,13 +2,7 @@
2#define EFL_ACCESS_H 2#define EFL_ACCESS_H
3 3
4#ifdef EFL_BETA_API_SUPPORT 4#ifdef EFL_BETA_API_SUPPORT
5
6#ifdef EFL_EO_API_SUPPORT
7#include "efl_access_object.eo.h" 5#include "efl_access_object.eo.h"
8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "efl_access_object.eo.legacy.h"
11#endif
12 6
13/* 7/*
14 * Sets a particilar state type for given state set. 8 * Sets a particilar state type for given state set.
@@ -36,8 +30,6 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
36EAPI void 30EAPI void
37efl_access_attribute_free(Efl_Access_Attribute *attr); 31efl_access_attribute_free(Efl_Access_Attribute *attr);
38 32
39#ifdef EFL_EO_API_SUPPORT
40
41/** 33/**
42 * Emits Accessible 'StateChanged' signal. 34 * Emits Accessible 'StateChanged' signal.
43 */ 35 */
@@ -131,6 +123,4 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
131 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL); 123 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
132 124
133#endif 125#endif
134
135#endif
136#endif 126#endif
diff --git a/src/lib/elementary/efl_access_text.h b/src/lib/elementary/efl_access_text.h
index f5cecc0..a1dfec0 100644
--- a/src/lib/elementary/efl_access_text.h
+++ b/src/lib/elementary/efl_access_text.h
@@ -2,13 +2,7 @@
2#define ELM_INTERFACE_ATSPI_TEXT_H 2#define ELM_INTERFACE_ATSPI_TEXT_H
3 3
4#ifdef EFL_BETA_API_SUPPORT 4#ifdef EFL_BETA_API_SUPPORT
5
6#ifdef EFL_EO_API_SUPPORT
7#include "efl_access_text.eo.h" 5#include "efl_access_text.eo.h"
8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "efl_access_text.eo.legacy.h"
11#endif
12 6
13/** 7/**
14 * @brief Free Efl_Access_Text_Attribute structure 8 * @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 62caf4f..86df79c 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
13 13
14typedef struct _Efl_Access_Action_Data Efl_Access_Action_Data; 14typedef struct _Efl_Access_Action_Data Efl_Access_Action_Data;
15 15
16#ifdef EFL_EO_API_SUPPORT
17#include "efl_access_widget_action.eo.h" 16#include "efl_access_widget_action.eo.h"
18#endif
19#ifndef EFL_NOLEGACY_API_SUPPORT
20#include "efl_access_widget_action.eo.legacy.h"
21#endif
22 17
23#endif 18#endif
24#endif 19#endif
diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index c4b3d3c..739d9f0 100644
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -2,13 +2,7 @@
2#define EFL_ACCESS_WINDOW_H 2#define EFL_ACCESS_WINDOW_H
3 3
4#ifdef EFL_BETA_API_SUPPORT 4#ifdef EFL_BETA_API_SUPPORT
5#ifdef EFL_EO_API_SUPPORT
6
7#include "efl_access_window.eo.h" 5#include "efl_access_window.eo.h"
8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "efl_access_window.eo.legacy.h"
11#endif
12 6
13/** 7/**
14 * Emits 'Window:Activated' accessible signal. 8 * Emits 'Window:Activated' accessible signal.
diff --git a/src/lib/elementary/efl_ui_calendar.h b/src/lib/elementary/efl_ui_calendar.h
index f80dce2..c3c8f6a 100644
--- a/src/lib/elementary/efl_ui_calendar.h
+++ b/src/lib/elementary/efl_ui_calendar.h
@@ -48,9 +48,8 @@
48 * @{ 48 * @{
49 */ 49 */
50 50
51#ifdef EFL_EO_API_SUPPORT
52#include "efl_ui_calendar.eo.h" 51#include "efl_ui_calendar.eo.h"
53#endif 52
54/** 53/**
55 * @} 54 * @}
56 */ 55 */
diff --git a/src/lib/elementary/efl_ui_clock.h b/src/lib/elementary/efl_ui_clock.h
index b882cd7..1115faa 100644
--- a/src/lib/elementary/efl_ui_clock.h
+++ b/src/lib/elementary/efl_ui_clock.h
@@ -196,9 +196,8 @@
196 * @{ 196 * @{
197 */ 197 */
198 198
199#ifdef EFL_EO_API_SUPPORT
200#include "efl_ui_clock.eo.h" 199#include "efl_ui_clock.eo.h"
201#endif 200
202/** 201/**
203 * @} 202 * @}
204 */ 203 */
diff --git a/src/lib/elementary/efl_ui_nstate.h b/src/lib/elementary/efl_ui_nstate.h
index 5e69c19..1d16c1f 100644
--- a/src/lib/elementary/efl_ui_nstate.h
+++ b/src/lib/elementary/efl_ui_nstate.h
@@ -21,6 +21,4 @@
21 * @{ 21 * @{
22 */ 22 */
23 23
24#ifdef EFL_EO_API_SUPPORT
25#include "efl_ui_nstate.eo.h" 24#include "efl_ui_nstate.eo.h"
26#endif
diff --git a/src/lib/elementary/efl_ui_video.h b/src/lib/elementary/efl_ui_video.h
index d015d1c..c4cfc55 100644
--- a/src/lib/elementary/efl_ui_video.h
+++ b/src/lib/elementary/efl_ui_video.h
@@ -54,9 +54,7 @@
54 * ELM_PLAYER_CLASS 54 * ELM_PLAYER_CLASS
55 */ 55 */
56 56
57#ifdef EFL_EO_API_SUPPORT
58#include "efl_ui_video_eo.h" 57#include "efl_ui_video_eo.h"
59#endif
60#ifndef EFL_NOLEGACY_API_SUPPORT 58#ifndef EFL_NOLEGACY_API_SUPPORT
61#include "efl_ui_video_legacy.h" 59#include "efl_ui_video_legacy.h"
62#endif 60#endif
diff --git a/src/lib/elementary/elc_fileselector_common.h b/src/lib/elementary/elc_fileselector_common.h
index c20e2a3..df4f831 100644
--- a/src/lib/elementary/elc_fileselector_common.h
+++ b/src/lib/elementary/elc_fileselector_common.h
@@ -1,7 +1,6 @@
1typedef Eina_Bool (*Elm_Fileselector_Filter_Func)(const char *path, /**< File path */ 1typedef Eina_Bool (*Elm_Fileselector_Filter_Func)(const char *path, /**< File path */
2 Eina_Bool dir, /**< A flag to show if path is a directory or not. True if the path is a directory. */ 2 Eina_Bool dir, /**< A flag to show if path is a directory or not. True if the path is a directory. */
3 void *data /**< A user data that was given by elm_fileselector_custom_filter_append. */); 3 void *data /**< A user data that was given by elm_fileselector_custom_filter_append. */);
4#ifdef EFL_EO_API_SUPPORT 4
5EAPI extern Eina_Error ELM_FILESELECTOR_ERROR_UNKNOWN; 5EAPI extern Eina_Error ELM_FILESELECTOR_ERROR_UNKNOWN;
6EAPI extern Eina_Error ELM_FILESELECTOR_ERROR_INVALID_MODEL; 6EAPI extern Eina_Error ELM_FILESELECTOR_ERROR_INVALID_MODEL;
7#endif
diff --git a/src/lib/elementary/elm_atspi_app_object.h b/src/lib/elementary/elm_atspi_app_object.h
index 3d66198..f460ffd 100644
--- a/src/lib/elementary/elm_atspi_app_object.h
+++ b/src/lib/elementary/elm_atspi_app_object.h
@@ -1,3 +1 @@
1#ifdef EFL_EO_API_SUPPORT
2#include "elm_atspi_app_object.eo.h" #include "elm_atspi_app_object.eo.h"
3#endif
diff --git a/src/lib/elementary/elm_atspi_bridge.h b/src/lib/elementary/elm_atspi_bridge.h
index 80a476d..5e5673b 100644
--- a/src/lib/elementary/elm_atspi_bridge.h
+++ b/src/lib/elementary/elm_atspi_bridge.h
@@ -1,5 +1,3 @@
1#ifdef EFL_BETA_API_SUPPORT 1#ifdef EFL_BETA_API_SUPPORT
2#ifdef EFL_EO_API_SUPPORT
3#include "elm_atspi_bridge.eo.h" 2#include "elm_atspi_bridge.eo.h"
4#endif 3#endif
5#endif
diff --git a/src/lib/elementary/elm_check.h b/src/lib/elementary/elm_check.h
index 056dee4..492494a 100644
--- a/src/lib/elementary/elm_check.h
+++ b/src/lib/elementary/elm_check.h
@@ -59,9 +59,8 @@
59 * @{ 59 * @{
60 */ 60 */
61 61
62#ifdef EFL_EO_API_SUPPORT
63#define EFL_UI_CHECK_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED 62#define EFL_UI_CHECK_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
64#endif 63
65#ifndef EFL_NOLEGACY_API_SUPPORT 64#ifndef EFL_NOLEGACY_API_SUPPORT
66#include "elm_check_legacy.h" 65#include "elm_check_legacy.h"
67#endif 66#endif
diff --git a/src/lib/elementary/elm_config.h b/src/lib/elementary/elm_config.h
index c9c65c5..260d1df 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);
2356 2356
2357/* new efl.config interface helpers in C */ 2357/* new efl.config interface helpers in C */
2358 2358
2359#ifdef EFL_EO_API_SUPPORT 2359/* FIXME these depend on stuff from Efl.h but this is included before that */
2360#ifdef EFL_BETA_API_SUPPORT
2360 2361
2361static inline Eina_Bool 2362static inline Eina_Bool
2362efl_config_bool_set(Efl_Config *obj, const char * name, Eina_Bool val) 2363efl_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 2cc350e..4883729 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);
77EAPI Elm_Regexp_Status 77EAPI Elm_Regexp_Status
78elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1); 78elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1);
79 79
80#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT) 80#if defined(EFL_BETA_API_SUPPORT)
81/** 81/**
82 * @brief The regex validator. Used as callback to validate event. 82 * @brief The regex validator. Used as callback to validate event.
83 * 83 *
diff --git a/src/lib/elementary/elm_interface_scrollable.h b/src/lib/elementary/elm_interface_scrollable.h
index 3f2a086..cf9806f 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
58typedef struct _Elm_Scrollable_Smart_Interface_Data 58typedef struct _Elm_Scrollable_Smart_Interface_Data
59 Elm_Scrollable_Smart_Interface_Data; 59 Elm_Scrollable_Smart_Interface_Data;
60 60
61#ifdef EFL_EO_API_SUPPORT
62#include "elm_interface_scrollable.eo.h" 61#include "elm_interface_scrollable.eo.h"
63#endif
64#ifndef EFL_NOLEGACY_API_SUPPORT
65#include "elm_interface_scrollable.eo.legacy.h"
66#endif
67 62
68struct _Elm_Scrollable_Smart_Interface_Data 63struct _Elm_Scrollable_Smart_Interface_Data
69{ 64{
@@ -247,7 +242,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
247 return __VA_ARGS__; \ 242 return __VA_ARGS__; \
248 } 243 }
249 244
250#if defined(EFL_EO_API_SUPPORT) && defined(EFL_BETA_API_SUPPORT) 245#ifdef EFL_BETA_API_SUPPORT
251EAPI void elm_pan_gravity_set(Elm_Pan *, double x, double) EINA_DEPRECATED; 246EAPI void elm_pan_gravity_set(Elm_Pan *, double x, double) EINA_DEPRECATED;
252EAPI void elm_pan_gravity_get(const Elm_Pan *, double *, double *) EINA_DEPRECATED; 247EAPI void elm_pan_gravity_get(const Elm_Pan *, double *, double *) EINA_DEPRECATED;
253#endif 248#endif
diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h
index bcbe8e6..2c0f33a 100644
--- a/src/lib/elementary/elm_interfaces.h
+++ b/src/lib/elementary/elm_interfaces.h
@@ -3,13 +3,7 @@
3#include "efl_access_widget_action.h" 3#include "efl_access_widget_action.h"
4#include "efl_access_window.h" 4#include "efl_access_window.h"
5 5
6// FIXME FIXME FIXME -- Still required because of photocam
7#ifdef EFL_EO_API_SUPPORT
8# include "elm_interface_scrollable.h"
9#endif
10
11#ifdef EFL_BETA_API_SUPPORT 6#ifdef EFL_BETA_API_SUPPORT
12#ifdef EFL_EO_API_SUPPORT
13#include "efl_access_action.eo.h" 7#include "efl_access_action.eo.h"
14#include "efl_access_component.eo.h" 8#include "efl_access_component.eo.h"
15#include "efl_access_editable_text.eo.h" 9#include "efl_access_editable_text.eo.h"
@@ -17,12 +11,3 @@
17#include "efl_access_value.eo.h" 11#include "efl_access_value.eo.h"
18#include "efl_ui_legacy.eo.h" 12#include "efl_ui_legacy.eo.h"
19#endif 13#endif
20#ifndef EFL_NOLEGACY_API_SUPPORT
21#include "efl_access_action.eo.legacy.h"
22#include "efl_access_component.eo.legacy.h"
23#include "efl_access_editable_text.eo.legacy.h"
24#include "efl_access_selection.eo.legacy.h"
25#include "efl_access_value.eo.legacy.h"
26#include "efl_ui_legacy.eo.legacy.h"
27#endif
28#endif
diff --git a/src/lib/elementary/elm_view_form.h b/src/lib/elementary/elm_view_form.h
index e97ca6c..fc35e486 100644
--- a/src/lib/elementary/elm_view_form.h
+++ b/src/lib/elementary/elm_view_form.h
@@ -1,5 +1,5 @@
1 1
2#ifdef EFL_EO_API_SUPPORT 2#ifdef EFL_BETA_API_SUPPORT
3#ifndef ELM_VIEW_FORM_H 3#ifndef ELM_VIEW_FORM_H
4#define ELM_VIEW_FORM_H 4#define ELM_VIEW_FORM_H
5 5
diff --git a/src/lib/elementary/elm_view_list.h b/src/lib/elementary/elm_view_list.h
index 4ad048e..7f7ef5a 100644
--- a/src/lib/elementary/elm_view_list.h
+++ b/src/lib/elementary/elm_view_list.h
@@ -1,5 +1,5 @@
1 1
2#ifdef EFL_EO_API_SUPPORT 2#ifdef EFL_BETA_API_SUPPORT
3#ifndef ELM_VIEW_LIST_H 3#ifndef ELM_VIEW_LIST_H
4#define ELM_VIEW_LIST_H 4#define ELM_VIEW_LIST_H
5 5
diff --git a/src/lib/elementary/elm_win_eo.h b/src/lib/elementary/elm_win_eo.h
index 51eaee9..39ec8eb 100644
--- a/src/lib/elementary/elm_win_eo.h
+++ b/src/lib/elementary/elm_win_eo.h
@@ -11,7 +11,7 @@
11 11
12EAPI void elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel); 12EAPI void elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel);
13EAPI Eina_Bool elm_win_autodel_get(const Evas_Object *obj); 13EAPI Eina_Bool elm_win_autodel_get(const Evas_Object *obj);
14#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT) 14#ifdef EFL_BETA_API_SUPPORT
15/** 15/**
16 * @brief Set the window's autodel state. 16 * @brief Set the window's autodel state.
17 * 17 *
diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h
index d7eef3c..d8eb052 100644
--- a/src/lib/emotion/Emotion.h
+++ b/src/lib/emotion/Emotion.h
@@ -127,9 +127,7 @@ extern "C" {
127#ifndef EFL_NOLEGACY_API_SUPPORT 127#ifndef EFL_NOLEGACY_API_SUPPORT
128#include "Emotion_Legacy.h" 128#include "Emotion_Legacy.h"
129#endif 129#endif
130#ifdef EFL_EO_API_SUPPORT
131#include "Emotion_Eo.h" 130#include "Emotion_Eo.h"
132#endif
133 131
134/** 132/**
135 * @file Emotion.h 133 * @file Emotion.h
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index 525ca7d..9044398 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -169,10 +169,8 @@
169#include <Eina.h> 169#include <Eina.h>
170 170
171#include <Eo.h> 171#include <Eo.h>
172#ifdef EFL_BETA_API_SUPPORT
173/* This include has been added to support Eo in Evas */ 172/* This include has been added to support Eo in Evas */
174#include <Efl.h> 173#include <Efl.h>
175#endif
176 174
177#include <Evas_Loader.h> 175#include <Evas_Loader.h>
178 176
diff --git a/src/lib/evas/Evas.hh b/src/lib/evas/Evas.hh
index 064d8c1..ac9b650 100644
--- a/src/lib/evas/Evas.hh
+++ b/src/lib/evas/Evas.hh
@@ -8,9 +8,6 @@
8#ifndef EFL_BETA_API_SUPPORT 8#ifndef EFL_BETA_API_SUPPORT
9#define EFL_BETA_API_SUPPORT 9#define EFL_BETA_API_SUPPORT
10#endif 10#endif
11#ifndef EFL_EO_API_SUPPORT
12#define EFL_EO_API_SUPPORT
13#endif
14 11
15#include <Efl.hh> 12#include <Efl.hh>
16 13
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index bb710a9..661d7f5 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;
89 * @since 1.1 89 * @since 1.1
90 */ 90 */
91// Support not having eo available 91// Support not having eo available
92#if defined (EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT) 92#ifdef EFL_BETA_API_SUPPORT
93typedef Efl_Callback_Priority Evas_Callback_Priority; 93typedef Efl_Callback_Priority Evas_Callback_Priority;
94#else 94#else
95typedef short Evas_Callback_Priority; 95typedef short Evas_Callback_Priority;
@@ -3490,21 +3490,9 @@ typedef unsigned int Efl_Input_Device_Type;
3490 3490
3491#endif 3491#endif
3492 3492
3493#ifndef _EFL_H
3494#define _EFL_H
3495typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
3496typedef struct tm Efl_Time;
3497#endif
3498
3499#ifndef _EFL_TEXT_CURSOR_EO_H_ 3493#ifndef _EFL_TEXT_CURSOR_EO_H_
3500#define _EFL_TEXT_CURSOR_EO_H_ 3494#define _EFL_TEXT_CURSOR_EO_H_
3501 3495
3502#ifndef _EFL_TEXT_CURSOR_EO_CLASS_TYPE
3503#define _EFL_TEXT_CURSOR_EO_CLASS_TYPE
3504#endif
3505typedef Eo Efl_Text_Cursor;
3506typedef Eo Efl_Text_Cursor_Cursor;
3507
3508#endif 3496#endif
3509#ifndef _EFL_GFX_ENTITY_EO_H_ 3497#ifndef _EFL_GFX_ENTITY_EO_H_
3510#define _EFL_GFX_ENTITY_EO_H_ 3498#define _EFL_GFX_ENTITY_EO_H_
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index a2c3e5c..a4f611e 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -2,8 +2,6 @@
2# error You shall not include this header directly 2# error You shall not include this header directly
3#endif 3#endif
4 4
5#ifdef EFL_EO_API_SUPPORT
6
7#ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE 5#ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
8#define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE 6#define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
9 7
@@ -200,11 +198,6 @@ struct _Efl_Canvas_Object_Animation_Event
200#include "canvas/efl_canvas_animation_group_parallel.eo.h" 198#include "canvas/efl_canvas_animation_group_parallel.eo.h"
201#include "canvas/efl_canvas_animation_group_sequential.eo.h" 199#include "canvas/efl_canvas_animation_group_sequential.eo.h"
202#include "canvas/efl_canvas_animation_player.eo.h" 200#include "canvas/efl_canvas_animation_player.eo.h"
203
204#endif /* EFL_EO_API_SUPPORT */
205
206#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
207
208#include "canvas/efl_canvas_event_grabber.eo.h" 201#include "canvas/efl_canvas_event_grabber.eo.h"
209 202
210 /** 203 /**
@@ -418,17 +411,13 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
418#include "canvas/evas_canvas3d_scene.eo.h" 411#include "canvas/evas_canvas3d_scene.eo.h"
419 412
420#include "canvas/efl_canvas_scene3d.eo.h" 413#include "canvas/efl_canvas_scene3d.eo.h"
421#endif /* EFL_BETA_API_SUPPORT */
422 414
423#ifdef EFL_EO_API_SUPPORT
424#include "canvas/efl_canvas_image_internal.eo.h" 415#include "canvas/efl_canvas_image_internal.eo.h"
425#include "canvas/efl_canvas_image.eo.h" 416#include "canvas/efl_canvas_image.eo.h"
426#include "canvas/efl_canvas_snapshot.eo.h" 417#include "canvas/efl_canvas_snapshot.eo.h"
427#include "canvas/efl_canvas_proxy.eo.h" 418#include "canvas/efl_canvas_proxy.eo.h"
428#include "canvas/efl_gfx_mapping.eo.h" 419#include "canvas/efl_gfx_mapping.eo.h"
429#endif /* EFL_EO_API_SUPPORT */
430 420
431#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
432/** 421/**
433 * @ingroup Evas_Object_VG 422 * @ingroup Evas_Object_VG
434 * 423 *
@@ -445,9 +434,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
445#include "canvas/efl_canvas_vg_gradient.eo.h" 434#include "canvas/efl_canvas_vg_gradient.eo.h"
446#include "canvas/efl_canvas_vg_gradient_linear.eo.h" 435#include "canvas/efl_canvas_vg_gradient_linear.eo.h"
447#include "canvas/efl_canvas_vg_gradient_radial.eo.h" 436#include "canvas/efl_canvas_vg_gradient_radial.eo.h"
448#endif /* EFL_BETA_API_SUPPORT */
449 437
450#ifdef EFL_EO_API_SUPPORT
451#include "canvas/efl_input_state.eo.h" 438#include "canvas/efl_input_state.eo.h"
452#include "canvas/efl_input_event.eo.h" 439#include "canvas/efl_input_event.eo.h"
453#include "canvas/efl_input_pointer.eo.h" 440#include "canvas/efl_input_pointer.eo.h"
@@ -455,9 +442,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
455#include "canvas/efl_input_hold.eo.h" 442#include "canvas/efl_input_hold.eo.h"
456#include "canvas/efl_input_interface.eo.h" 443#include "canvas/efl_input_interface.eo.h"
457#include "canvas/efl_input_focus.eo.h" 444#include "canvas/efl_input_focus.eo.h"
458#endif /* EFL_EO_API_SUPPORT */
459 445
460#ifdef EFL_EO_API_SUPPORT
461# include "gesture/efl_canvas_gesture_types.eot.h" 446# include "gesture/efl_canvas_gesture_types.eot.h"
462# include "gesture/efl_canvas_gesture_touch.eo.h" 447# include "gesture/efl_canvas_gesture_touch.eo.h"
463# include "gesture/efl_canvas_gesture.eo.h" 448# include "gesture/efl_canvas_gesture.eo.h"
@@ -465,4 +450,3 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
465# include "gesture/efl_canvas_gesture_long_tap.eo.h" 450# include "gesture/efl_canvas_gesture_long_tap.eo.h"
466# include "gesture/efl_canvas_gesture_recognizer.eo.h" 451# include "gesture/efl_canvas_gesture_recognizer.eo.h"
467# include "gesture/efl_canvas_gesture_manager.eo.h" 452# include "gesture/efl_canvas_gesture_manager.eo.h"
468#endif /* EFL_EO_API_SUPPORT */
diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c
index b80b33b..bc343df 100644
--- a/src/modules/ethumb/emotion/emotion.c
+++ b/src/modules/ethumb/emotion/emotion.c
@@ -1,7 +1,6 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2#include "config.h" 2#include "config.h"
3#else 3#else
4#define EFL_EO_API_SUPPORT
5#define EFL_BETA_API_SUPPORT 4#define EFL_BETA_API_SUPPORT
6#endif 5#endif
7 6
diff --git a/src/tests/elementary/efl_ui_compile_test.c b/src/tests/elementary/efl_ui_compile_test.c
index 651295d..4234502 100644
--- a/src/tests/elementary/efl_ui_compile_test.c
+++ b/src/tests/elementary/efl_ui_compile_test.c
@@ -1,5 +1,4 @@
1#undef EFL_BETA_API_SUPPORT 1#undef EFL_BETA_API_SUPPORT
2#undef EFL_EO_API_SUPPORT
3#define EFL_NOLEGACY_API_SUPPORT 2#define EFL_NOLEGACY_API_SUPPORT
4 3
5#include <Efl_Ui.h> 4#include <Efl_Ui.h>
diff --git a/src/tests/elementary/elm_suite_build.c b/src/tests/elementary/elm_suite_build.c
index 614f781..7ff098a 100644
--- a/src/tests/elementary/elm_suite_build.c
+++ b/src/tests/elementary/elm_suite_build.c
@@ -1,3 +1,2 @@
1#undef EFL_BETA_API_SUPPORT 1#undef EFL_BETA_API_SUPPORT
2#undef EFL_EO_API_SUPPORT
3#include <Elementary.h> 2#include <Elementary.h>
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 8304979..2ddfb27 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -1,7 +1,6 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2#include "config.h" 2#include "config.h"
3#else 3#else
4#define EFL_EO_API_SUPPORT
5#define EFL_BETA_API_SUPPORT 4#define EFL_BETA_API_SUPPORT
6#endif 5#endif
7 6