summaryrefslogtreecommitdiff
path: root/src/lib/elementary/Elementary.h
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/elementary/Elementary.h
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 '')
-rw-r--r--src/lib/elementary/Elementary.h6
-rw-r--r--src/lib/elementary/Elementary.hh3
2 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index c494bf4751..119a3edfaa 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -146,7 +146,6 @@ EAPI extern Elm_Version *elm_version;
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 36a31ef700..e5e1036e0c 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