diff options
author | Daniel Kolesa <daniel@octaforge.org> | 2019-03-18 12:13:41 +0100 |
---|---|---|
committer | Xavi Artigas <xavierartigas@yahoo.es> | 2019-03-18 12:13:59 +0100 |
commit | 58b8a3d1636160a752b8792f1037b8d9f3067a48 (patch) | |
tree | 5f7ab0b0289941f756beac99c63453f80cf59fc1 /src/lib/evas/Evas_Eo.h | |
parent | 3fa8bb7bad584533311753fb447321e9f333591e (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/evas/Evas_Eo.h')
-rw-r--r-- | src/lib/evas/Evas_Eo.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index a2c3e5c9e6..a4f611e201 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h | |||
@@ -2,8 +2,6 @@ | |||
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 */ | ||