summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-25 19:12:08 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-29 10:49:16 +0900
commit71678f301ad609219a72b5d517837f21b69d85e3 (patch)
tree03e91c7903a01a7359f4fc3a0e7a4ccae52f2b4c
parent356ad74377d11c06fa99dff4be47d330da288044 (diff)
ecore: Remove ecore_types.eot
This moves one enum from EO to legacy only (Ecore_Pos_Map). Ideally the type should be in Ecore_Legacy and no Common, that can be done later. Ref T5522
-rw-r--r--src/Makefile_Ecore.am9
-rw-r--r--src/lib/ecore/Ecore_Common.h34
-rw-r--r--src/lib/ecore/ecore_poller.eo2
-rw-r--r--src/lib/ecore/ecore_types.eot29
-rw-r--r--src/lib/ecore/efl_loop_timer.eo2
-rw-r--r--src/lib/elementary/elm_box.eo1
-rw-r--r--src/lib/elementary/elm_gengrid.eo4
-rw-r--r--src/tests/eolian_cxx/callback.eo2
8 files changed, 39 insertions, 44 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 97b91f0c89..4d08930a89 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -33,21 +33,16 @@ ecore_eolian_files = \
33 lib/ecore/efl_model_composite_boolean_children.eo \ 33 lib/ecore/efl_model_composite_boolean_children.eo \
34 $(ecore_eolian_files_legacy) 34 $(ecore_eolian_files_legacy)
35 35
36ecore_eolian_type_files = \
37 lib/ecore/ecore_types.eot
38
39ecore_eolian_c = $(ecore_eolian_files:%.eo=%.eo.c) 36ecore_eolian_c = $(ecore_eolian_files:%.eo=%.eo.c)
40ecore_eolian_h = $(ecore_eolian_files:%.eo=%.eo.h) \ 37ecore_eolian_h = $(ecore_eolian_files:%.eo=%.eo.h) \
41 $(ecore_eolian_files_legacy:%.eo=%.eo.legacy.h) \ 38 $(ecore_eolian_files_legacy:%.eo=%.eo.legacy.h)
42 $(ecore_eolian_type_files:%.eot=%.eot.h)
43 39
44BUILT_SOURCES += \ 40BUILT_SOURCES += \
45 $(ecore_eolian_c) \ 41 $(ecore_eolian_c) \
46 $(ecore_eolian_h) 42 $(ecore_eolian_h)
47 43
48ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ 44ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
49ecoreeolianfiles_DATA = $(ecore_eolian_files) \ 45ecoreeolianfiles_DATA = $(ecore_eolian_files)
50 $(ecore_eolian_type_files)
51 46
52EXTRA_DIST2 += ${ecoreeolianfiles_DATA} 47EXTRA_DIST2 += ${ecoreeolianfiles_DATA}
53 48
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 49e7e1ce1d..74b931c0d1 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -2703,6 +2703,40 @@ typedef enum _Ecore_Animator_Source Ecore_Animator_Source;
2703 */ 2703 */
2704typedef Eina_Bool (*Ecore_Timeline_Cb)(void *data, double pos); 2704typedef Eina_Bool (*Ecore_Timeline_Cb)(void *data, double pos);
2705 2705
2706/** Defines the position mappings for the animation. */
2707typedef enum
2708{
2709 ECORE_POS_MAP_LINEAR = 0, /**< Linear 0.0 -> 1.0 */
2710 ECORE_POS_MAP_ACCELERATE, /**< Start slow then speed up */
2711 ECORE_POS_MAP_DECELERATE, /**< Start fast then slow down */
2712 ECORE_POS_MAP_SINUSOIDAL, /**< Start slow, speed up then slow down at end */
2713 ECORE_POS_MAP_ACCELERATE_FACTOR, /**< Start slow then speed up, v1 being a
2714 * power factor, 0.0 being linear, 1.0 being
2715 * normal accelerate, 2.0 being much more
2716 * pronounced accelerate (squared), 3.0
2717 * being cubed, etc. */
2718 ECORE_POS_MAP_DECELERATE_FACTOR, /**< Start fast then slow down, v1 being a
2719 * power factor, 0.0 being linear, 1.0 being
2720 * normal decelerate, 2.0 being much more
2721 * pronounced decelerate (squared), 3.0
2722 * being cubed, etc. */
2723 ECORE_POS_MAP_SINUSOIDAL_FACTOR, /**< Start slow, speed up then slow down at
2724 * end, v1 being a power factor, 0.0 being
2725 * linear, 1.0 being normal sinusoidal, 2.0
2726 * being much more pronounced sinusoidal
2727 * (squared), 3.0 being cubed, etc. */
2728 ECORE_POS_MAP_DIVISOR_INTERP, /**< Start at gradient * v1, interpolated via
2729 * power of v2 curve */
2730 ECORE_POS_MAP_BOUNCE, /**< Start at 0.0 then "drop" like a ball bouncing to
2731 * the ground at 1.0, and bounce v2 times, with decay
2732 * factor of v1 */
2733 ECORE_POS_MAP_SPRING, /**< Start at 0.0 then "wobble" like a spring rest
2734 * position 1.0, and wobble v2 times, with decay factor
2735 * of v1 */
2736 ECORE_POS_MAP_CUBIC_BEZIER /**< Follow the cubic-bezier curve calculated with
2737 * the control points (x1, y1), (x2, y2) */
2738} Ecore_Pos_Map;
2739
2706/* 2740/*
2707 * @since 1.8 2741 * @since 1.8
2708 */ 2742 */
diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo
index d1703e987b..c5ef3d76f5 100644
--- a/src/lib/ecore/ecore_poller.eo
+++ b/src/lib/ecore/ecore_poller.eo
@@ -1,4 +1,4 @@
1import ecore_types; 1type @extern Ecore_Task_Cb: __undefined_type; [[Ecore task callback type]]
2 2
3enum Ecore.Poller_Type 3enum Ecore.Poller_Type
4{ 4{
diff --git a/src/lib/ecore/ecore_types.eot b/src/lib/ecore/ecore_types.eot
deleted file mode 100644
index 3bd094769b..0000000000
--- a/src/lib/ecore/ecore_types.eot
+++ /dev/null
@@ -1,29 +0,0 @@
1type @extern Ecore_Task_Cb: __undefined_type; [[Ecore task callback type]]
2
3enum Ecore.Pos_Map
4{
5 [[Defines the position mappings for the animation.]]
6 linear, [[Linear 0.0 -> 1.0]]
7 accelerate, [[Start slow then speed up]]
8 decelerate, [[Start fast then slow down]]
9 sinusoidal, [[Start slow, speed up then slow down at end]]
10 accelerate_factor, [[Start slow then speed up, v1 being a power factor,
11 0.0 being linear, 1.0 being normal accelerate,
12 2.0 being much more pronounced accelerate (squared),
13 3.0 being cubed, etc.]]
14 decelerate_factor, [[Start fast then slow down, v1 being a power factor,
15 0.0 being linear, 1.0 being normal decelerate,
16 2.0 being much more pronounced decelerate (squared),
17 3.0 being cubed, etc.]]
18 sinusoidal_factor, [[Start slow, speed up then slow down at end,
19 v1 being a power factor, 0.0 being linear,
20 1.0 being normal sinusoidal, 2.0 being much more
21 pronounced sinusoidal (squared), 3.0 being cubed, etc.]]
22 divisor_interp, [[Start at gradient * v1, interpolated via power of v2 curve]]
23 bounce, [[Start at 0.0 then "drop" like a ball bouncing to the ground at 1.0,
24 and bounce v2 times, with decay factor of v1]]
25 spring, [[Start at 0.0 then "wobble" like a spring rest position 1.0,
26 and wobble v2 times, with decay factor of v1]]
27 cubic_bezier, [[Follow the cubic-bezier curve calculated with the control
28 points (x1, y1), (x2, y2)]]
29}
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index 11fb81f64b..61b0fab405 100644
--- a/src/lib/ecore/efl_loop_timer.eo
+++ b/src/lib/ecore/efl_loop_timer.eo
@@ -1,5 +1,3 @@
1import ecore_types;
2
3class Efl.Loop.Timer (Efl.Loop_User) 1class Efl.Loop.Timer (Efl.Loop_User)
4{ 2{
5 [[Timers are objects that will call a given callback at some point 3 [[Timers are objects that will call a given callback at some point
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index 1686fae22e..7463045ba7 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -1,5 +1,4 @@
1import evas_box; 1import evas_box;
2import ecore_types;
3 2
4class Elm.Box (Elm.Widget) 3class Elm.Box (Elm.Widget)
5{ 4{
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 4f042ebe33..756f2dbbb2 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -1,8 +1,8 @@
1import elm_general; 1import elm_general;
2import ecore_types;
3import elm_gengrid_item; 2import elm_gengrid_item;
4 3
5type @extern Elm.Glob.Match_Flags: __undefined_type; 4type @extern Elm.Glob.Match_Flags: __undefined_type;
5type @extern Ecore_Pos_Map: __undefined_type;
6 6
7enum Elm.Gengrid.Reorder_Type 7enum Elm.Gengrid.Reorder_Type
8{ 8{
@@ -532,7 +532,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
532 @since 1.10 532 @since 1.10
533 ]] 533 ]]
534 params { 534 params {
535 @in tween_mode: Ecore.Pos_Map; [[ Position mappings for animation ]] 535 @in tween_mode: Ecore_Pos_Map; [[ Position mappings for animation ]]
536 } 536 }
537 } 537 }
538 reorder_mode_stop { 538 reorder_mode_stop {
diff --git a/src/tests/eolian_cxx/callback.eo b/src/tests/eolian_cxx/callback.eo
index 959c65530d..2e528d5f56 100644
--- a/src/tests/eolian_cxx/callback.eo
+++ b/src/tests/eolian_cxx/callback.eo
@@ -1,5 +1,3 @@
1import ecore_types;
2
3struct Callback_Event 1struct Callback_Event
4{ 2{
5 field1: int; 3 field1: int;