summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorDaniel Kolesa <daniel@octaforge.org>2019-03-18 12:13:41 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-03-18 12:13:59 +0100
commit58b8a3d1636160a752b8792f1037b8d9f3067a48 (patch)
tree5f7ab0b0289941f756beac99c63453f80cf59fc1 /src/lib
parent3fa8bb7bad584533311753fb447321e9f333591e (diff)
efl: remove EFL_EO_API_SUPPORT macro
Summary: Since we're now going to be shipping some eo classes as stable, there is no point in keeping the eo api behind a macro, and it should be enabled by default. Another case is beta classes, but those are behind the EFL_BETA_API_SUPPORT guard. This also changes includes around the place where things are clearly broken (such as an included header needing something from another header but that other header being guarded, notably efl_ui_widget.h needing focus manager but focus manager being behind beta in Elementary.h) Reviewers: zmike, cedric, bu5hm4n, stefan_schmidt, segfaultxavi Reviewed By: cedric, segfaultxavi Subscribers: segfaultxavi, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8322
Diffstat (limited to 'src/lib')
-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
32 files changed, 16 insertions, 135 deletions
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 */