bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ffccc27b1df07b5e0c52196facd5a9c63e60539a
commit ffccc27b1df07b5e0c52196facd5a9c63e60539a
Author: Marcel Hollerbach <m...@marcel-hollerbach.de>
Date: Fri Feb 14 17:06:29 2020 +0100
evas: stop handdefining eo types
that is just technical dept carrying arround.
Reviewed-by: Mike Blumenkrantz <michael.blumenkra...@gmail.com>
Differential Revision: https://phab.enlightenment.org/D11356
---
src/lib/evas/Evas_Common.h | 116 ---------------------------------------------
src/lib/evas/Evas_Eo.h | 115 +-------------------------------------------
2 files changed, 1 insertion(+), 230 deletions(-)
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 7122e0b194..c70b183a2a 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -3365,122 +3365,6 @@ EAPI const Eina_List
*evas_font_path_global_list(void) EINA_WARN_UNUSED_R
*/
EAPI void evas_font_reinit(void);
-
-/* this is now public, non-beta api forever because someone didn't add a beta
- api guard.
- */
-#ifndef _EFL_ANIMATION_EO_CLASS_TYPE
-#define _EFL_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Animation;
-
-#endif
-
-#ifndef _EFL_ALPHA_ANIMATION_EO_CLASS_TYPE
-#define _EFL_ALPHA_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Alpha_Animation;
-
-#endif
-
-#ifndef _EFL_ROTATE_ANIMATION_EO_CLASS_TYPE
-#define _EFL_ROTATE_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Rotate_Animation;
-
-#endif
-
-#ifndef _EFL_SCALE_ANIMATION_EO_CLASS_TYPE
-#define _EFL_SCALE_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Scale_Animation;
-
-#endif
-
-#ifndef _EFL_TRANSLATE_ANIMATION_EO_CLASS_TYPE
-#define _EFL_TRANSLATE_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Translate_Animation;
-
-#endif
-
-#ifndef _EFL_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Group_Animation;
-
-#endif
-
-#ifndef _EFL_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Parallel_Group_Animation;
-
-#endif
-
-#ifndef _EFL_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Sequential_Group_Animation;
-
-#endif
-
-#ifndef _EFL_ANIMATION_PLAYER_EO_CLASS_TYPE
-#define _EFL_ANIMATION_PLAYER_EO_CLASS_TYPE
-
-typedef Eo Efl_Animation_Player;
-
-#endif
-
-#ifndef _EFL_ANIMATION_PLAYER_ALPHA_EO_CLASS_TYPE
-#define _EFL_ANIMATION_PLAYER_ALPHA_EO_CLASS_TYPE
-
-typedef Eo Efl_Animation_Player_Alpha;
-
-#endif
-
-#ifndef _EFL_ANIMATION_PLAYER_ROTATE_EO_CLASS_TYPE
-#define _EFL_ANIMATION_PLAYER_ROTATE_EO_CLASS_TYPE
-
-typedef Eo Efl_Animation_Player_Rotate;
-
-#endif
-
-#ifndef _EFL_ANIMATION_PLAYER_SCALE_EO_CLASS_TYPE
-#define _EFL_ANIMATION_PLAYER_SCALE_EO_CLASS_TYPE
-
-typedef Eo Efl_Animation_Player_Scale;
-
-#endif
-
-#ifndef _EFL_ANIMATION_PLAYER_TRANSLATE_EO_CLASS_TYPE
-#define _EFL_ANIMATION_PLAYER_TRANSLATE_EO_CLASS_TYPE
-
-typedef Eo Efl_Animation_Player_Translate;
-
-#endif
-
-#ifndef _EFL_ANIMATION_PLAYER_GROUP_EO_CLASS_TYPE
-#define _EFL_ANIMATION_PLAYER_GROUP_EO_CLASS_TYPE
-
-typedef Eo Efl_Animation_Player_Group;
-
-#endif
-
-#ifndef _EFL_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Parallel_Group_Animation;
-
-#endif
-
-#ifndef _EFL_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Sequential_Group_Animation;
-
-#endif
-
// The below type are necessary for legacy API and need to be manually kept in
sync with .eo file.
#ifndef _EFL_INPUT_DEVICE_EO_CLASS_TYPE
#define _EFL_INPUT_DEVICE_EO_CLASS_TYPE
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 68b65372c3..a06944787d 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -9,119 +9,6 @@ typedef Eo Efl_Canvas_Vg_Node;
#endif
-
-#ifndef _EFL_CANVAS_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Animation;
-
-#endif
-
-#ifndef _EFL_CANVAS_ALPHA_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_ALPHA_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Alpha_Animation;
-
-#endif
-
-#ifndef _EFL_CANVAS_ROTATE_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_ROTATE_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Rotate_Animation;
-
-#endif
-
-#ifndef _EFL_CANVAS_SCALE_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_SCALE_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Scale_Animation;
-
-#endif
-
-#ifndef _EFL_CANVAS_TRANSLATE_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_TRANSLATE_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Translate_Animation;
-
-#endif
-
-#ifndef _EFL_CANVAS_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Group_Animation;
-
-#endif
-
-#ifndef _EFL_CANVAS_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Parallel_Group_Animation;
-
-#endif
-
-#ifndef _EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Sequential_Group_Animation;
-
-#endif
-
-#ifndef _EFL_CANVAS_ANIMATION_PLAYER_EO_CLASS_TYPE
-#define _EFL_CANVAS_ANIMATION_PLAYER_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Animation_Player;
-
-#endif
-
-#ifndef _EFL_CANVAS_ANIMATION_PLAYER_ALPHA_EO_CLASS_TYPE
-#define _EFL_CANVAS_ANIMATION_PLAYER_ALPHA_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Animation_Player_Alpha;
-
-#endif
-
-#ifndef _EFL_CANVAS_ANIMATION_PLAYER_ROTATE_EO_CLASS_TYPE
-#define _EFL_CANVAS_ANIMATION_PLAYER_ROTATE_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Animation_Player_Rotate;
-
-#endif
-
-#ifndef _EFL_CANVAS_ANIMATION_PLAYER_SCALE_EO_CLASS_TYPE
-#define _EFL_CANVAS_ANIMATION_PLAYER_SCALE_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Animation_Player_Scale;
-
-#endif
-
-#ifndef _EFL_CANVAS_ANIMATION_PLAYER_TRANSLATE_EO_CLASS_TYPE
-#define _EFL_CANVAS_ANIMATION_PLAYER_TRANSLATE_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Animation_Player_Translate;
-
-#endif
-
-#ifndef _EFL_CANVAS_ANIMATION_PLAYER_GROUP_EO_CLASS_TYPE
-#define _EFL_CANVAS_ANIMATION_PLAYER_GROUP_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Animation_Player_Group;
-
-#endif
-
-#ifndef _EFL_CANVAS_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Parallel_Group_Animation;
-
-#endif
-
-#ifndef _EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE
-#define _EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE
-
-typedef Eo Efl_Canvas_Sequential_Group_Animation;
-
-#endif
-
struct _Efl_Canvas_Animation_Player_Event_Running
{
double progress;
@@ -219,7 +106,6 @@ struct _Efl_Canvas_Object_Animation_Event
#include "gesture/efl_canvas_gesture_events.eo.h"
#include "canvas/efl_canvas_object.eo.h"
-#include "canvas/efl_canvas_object_animation.eo.h"
#include "canvas/efl_canvas_animation.eo.h"
#include "canvas/efl_canvas_alpha_animation.eo.h"
#include "canvas/efl_canvas_rotate_animation.eo.h"
@@ -228,6 +114,7 @@ struct _Efl_Canvas_Object_Animation_Event
#include "canvas/efl_canvas_group_animation.eo.h"
#include "canvas/efl_canvas_parallel_group_animation.eo.h"
#include "canvas/efl_canvas_sequential_group_animation.eo.h"
+#include "canvas/efl_canvas_object_animation.eo.h"
#include "canvas/efl_canvas_event_grabber.eo.h"
/**
--
