Eolian: Eo header clean and legacy integration for:

  Elementary Background
  Elementary Box
  Elementary Bubble
  Elementary Button
  Elementary Calendar
  Elementary Check
  Elementary Clock
  Elementary Color Selector
  Elementary Ctxpopup

20 files changed, 38 insertions, 3057 deletions

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c47126a73..5f3589aab 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -564,24 +564,33 @@ BUILT_SOURCES = \
 		elm_atspi_app_object.eo.legacy.h \
 		elm_bg.eo.c \
 		elm_bg.eo.h \
+		elm_bg.eo.legacy.h \
 		elm_box.eo.c \
 		elm_box.eo.h \
+		elm_box.eo.legacy.h \
 		elm_bubble.eo.c \
 		elm_bubble.eo.h \
+		elm_bubble.eo.legacy.h \
 		elm_button.eo.c \
 		elm_button.eo.h \
+		elm_button.eo.legacy.h \
 		elm_calendar.eo.c \
 		elm_calendar.eo.h \
+		elm_calendar.eo.legacy.h \
 		elm_check.eo.c \
 		elm_check.eo.h \
+		elm_check.eo.legacy.h \
 		elm_clock.eo.c \
 		elm_clock.eo.h \
+		elm_clock.eo.legacy.h \
 		elm_colorselector.eo.c \
 		elm_colorselector.eo.h \
+		elm_colorselector.eo.legacy.h \
 		elm_conformant.eo.c \
 		elm_conformant.eo.h \
 		elc_ctxpopup.eo.c \
 		elc_ctxpopup.eo.h \
+		elc_ctxpopup.eo.legacy.h \
 		elm_datetime.eo.c \
 		elm_datetime.eo.h \
 		elm_dayselector.eo.c \
@@ -886,4 +895,13 @@ nodist_includesunstable_HEADERS = \
 				  elm_frame.eo.legacy.h \
 				  elm_hover.eo.legacy.h \
 				  elm_actionslider.eo.legacy.h \
-				  elm_atspi_app_object.eo.legacy.h
+				  elm_atspi_app_object.eo.legacy.h \
+				  elm_bg.eo.legacy.h \
+				  elm_box.eo.legacy.h \
+				  elm_bubble.eo.legacy.h \
+				  elm_button.eo.legacy.h \
+				  elm_calendar.eo.legacy.h \
+				  elm_check.eo.legacy.h \
+				  elm_clock.eo.legacy.h \
+				  elm_colorselector.eo.legacy.h \
+				  elc_ctxpopup.eo.legacy.h
diff --git a/src/lib/elc_ctxpopup_eo.h b/src/lib/elc_ctxpopup_eo.h
index d7a9fa18f..ab7088ddb 100644
--- a/src/lib/elc_ctxpopup_eo.h
+++ b/src/lib/elc_ctxpopup_eo.h
@@ -1,205 +1 @@
-#include "elc_ctxpopup.eo.h"
-
-#if 0
-#define ELM_OBJ_CTXPOPUP_CLASS elm_obj_ctxpopup_class_get()
-
-const Eo_Class *elm_obj_ctxpopup_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_CTXPOPUP_BASE_ID;
-
-enum
-{
-   ELM_OBJ_CTXPOPUP_SUB_ID_HOVER_PARENT_SET,
-   ELM_OBJ_CTXPOPUP_SUB_ID_HOVER_PARENT_GET,
-   ELM_OBJ_CTXPOPUP_SUB_ID_CLEAR,
-   ELM_OBJ_CTXPOPUP_SUB_ID_HORIZONTAL_SET,
-   ELM_OBJ_CTXPOPUP_SUB_ID_HORIZONTAL_GET,
-   ELM_OBJ_CTXPOPUP_SUB_ID_ITEM_APPEND,
-   ELM_OBJ_CTXPOPUP_SUB_ID_DIRECTION_PRIORITY_SET,
-   ELM_OBJ_CTXPOPUP_SUB_ID_DIRECTION_PRIORITY_GET,
-   ELM_OBJ_CTXPOPUP_SUB_ID_DIRECTION_GET,
-   ELM_OBJ_CTXPOPUP_SUB_ID_DISMISS,
-   ELM_OBJ_CTXPOPUP_SUB_ID_AUTO_HIDE_DISABLED_SET,
-   ELM_OBJ_CTXPOPUP_SUB_ID_AUTO_HIDE_DISABLED_GET,
-   ELM_OBJ_CTXPOPUP_SUB_ID_LAST
-};
-
-#define ELM_OBJ_CTXPOPUP_ID(sub_id) (ELM_OBJ_CTXPOPUP_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_ctxpopup_hover_parent_set
- * @since 1.8
- *
- * @brief Set the Ctxpopup's parent
- *
- * @param[in] parent
- *
- * @see elm_ctxpopup_hover_parent_set
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_hover_parent_set(parent) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_HOVER_PARENT_SET), EO_TYPECHECK(Evas_Object *, parent)
-
-/**
- * @def elm_obj_ctxpopup_hover_parent_get
- * @since 1.8
- *
- * @brief Get the Ctxpopup's parent
- *
- * @param[out] ret
- *
- * @see elm_ctxpopup_hover_parent_get
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_hover_parent_get(ret) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_HOVER_PARENT_GET), EO_TYPECHECK(Evas_Object **, ret)
-
-/**
- * @def elm_obj_ctxpopup_clear
- * @since 1.8
- *
- * @brief Clear all items in the given ctxpopup object.
- *
- *
- * @see elm_ctxpopup_clear
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_clear() ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_CLEAR)
-
-/**
- * @def elm_obj_ctxpopup_horizontal_set
- * @since 1.8
- *
- * @brief Change the ctxpopup's orientation to horizontal or vertical.
- *
- * @param[in] horizontal
- *
- * @see elm_ctxpopup_horizontal_set
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_horizontal_set(horizontal) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_HORIZONTAL_SET), EO_TYPECHECK(Eina_Bool, horizontal)
-
-/**
- * @def elm_obj_ctxpopup_horizontal_get
- * @since 1.8
- *
- * @brief Get the value of current ctxpopup object's orientation.
- *
- * @param[out] ret
- *
- * @see elm_ctxpopup_horizontal_get
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_horizontal_get(ret) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_HORIZONTAL_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_ctxpopup_item_append
- * @since 1.8
- *
- * @brief Add a new item to a ctxpopup object.
- *
- * @param[in] label
- * @param[in] icon
- * @param[in] func
- * @param[in] data
- * @param[out] ret
- *
- * @see elm_ctxpopup_item_append
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_item_append(label, icon, func, data, ret) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_ITEM_APPEND), EO_TYPECHECK(const char *, label), EO_TYPECHECK(Evas_Object *, icon), EO_TYPECHECK(Evas_Smart_Cb, func), EO_TYPECHECK(const void *, data), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_ctxpopup_direction_priority_set
- * @since 1.8
- *
- * @brief Set the direction priority of a ctxpopup.
- *
- * @param[in] first
- * @param[in] second
- * @param[in] third
- * @param[in] fourth
- *
- * @see elm_ctxpopup_direction_priority_set
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_direction_priority_set(first, second, third, fourth) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_DIRECTION_PRIORITY_SET), EO_TYPECHECK(Elm_Ctxpopup_Direction, first), EO_TYPECHECK(Elm_Ctxpopup_Direction, second), EO_TYPECHECK(Elm_Ctxpopup_Direction, third), EO_TYPECHECK(Elm_Ctxpopup_Direction, fourth)
-
-/**
- * @def elm_obj_ctxpopup_direction_priority_get
- * @since 1.8
- *
- * @brief Get the direction priority of a ctxpopup.
- *
- * @param[out] first
- * @param[out] second
- * @param[out] third
- * @param[out] fourth
- *
- * @see elm_ctxpopup_direction_priority_get
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_direction_priority_get(first, second, third, fourth) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_DIRECTION_PRIORITY_GET), EO_TYPECHECK(Elm_Ctxpopup_Direction *, first), EO_TYPECHECK(Elm_Ctxpopup_Direction *, second), EO_TYPECHECK(Elm_Ctxpopup_Direction *, third), EO_TYPECHECK(Elm_Ctxpopup_Direction *, fourth)
-
-/**
- * @def elm_obj_ctxpopup_direction_get
- * @since 1.8
- *
- * @brief Get the current direction of a ctxpopup.
- *
- * @param[out] ret
- *
- * @see elm_ctxpopup_direction_get
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_direction_get(ret) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_DIRECTION_GET), EO_TYPECHECK(Elm_Ctxpopup_Direction *, ret)
-
-/**
- * @def elm_obj_ctxpopup_dismiss
- * @since 1.8
- *
- * @brief Dismiss a ctxpopup object
- *
- *
- * @see elm_ctxpopup_dismiss
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_dismiss() ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_DISMISS)
-
-/**
- * @def elm_obj_ctxpopup_auto_hide_disabled_set
- * @since 1.9
- *
- * @brief Set whether ctxpopup hide automatically or not by ctxpopup policy
- *
- * @param[in] disabled
- *
- * @see elm_ctxpopup_auto_hide_disabled_get
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_auto_hide_disabled_set(disabled) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_AUTO_HIDE_DISABLED_SET), EO_TYPECHECK(Eina_Bool, disabled)
-
-/**
- * @def elm_obj_ctxpopup_auto_hide_disabled_get
- * @since 1.9
- *
- * @brief Get whether ctxpopup hide automatically or not by ctxpopup policy
- *
- * @param[out] ret
- *
- * @see elm_ctxpopup_auto_hide_disabled_set
- *
- * @ingroup Ctxpopup
- */
-#define elm_obj_ctxpopup_auto_hide_disabled_get(ret) ELM_OBJ_CTXPOPUP_ID(ELM_OBJ_CTXPOPUP_SUB_ID_AUTO_HIDE_DISABLED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-#endif
+#include "elc_ctxpopup.eo.h"
\ No newline at end of file
diff --git a/src/lib/elc_ctxpopup_legacy.h b/src/lib/elc_ctxpopup_legacy.h
index 05129933b..194f65adc 100644
--- a/src/lib/elc_ctxpopup_legacy.h
+++ b/src/lib/elc_ctxpopup_legacy.h
@@ -8,171 +8,4 @@
  */
 EAPI Evas_Object                 *elm_ctxpopup_add(Evas_Object *parent);
 
-/**
- * @brief Set the Ctxpopup's parent
- *
- * @param obj The ctxpopup object
- * @param parent The parent to use
- *
- * Set the parent object.
- *
- * @note elm_ctxpopup_add() will automatically call this function
- * with its @c parent argument.
- *
- * @see elm_ctxpopup_add()
- * @see elm_hover_parent_set()
- *
- * @ingroup Ctxpopup
- */
-EAPI void                         elm_ctxpopup_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-
-/**
- * @brief Get the Ctxpopup's parent
- *
- * @param obj The ctxpopup object
- *
- * @see elm_ctxpopup_hover_parent_set() for more information
- *
- * @ingroup Ctxpopup
- */
-EAPI Evas_Object                 *elm_ctxpopup_hover_parent_get(const Evas_Object *obj);
-
-/**
- * @brief Clear all items in the given ctxpopup object.
- *
- * @param obj Ctxpopup object
- *
- * @ingroup Ctxpopup
- */
-EAPI void                         elm_ctxpopup_clear(Evas_Object *obj);
-
-/**
- * @brief Change the ctxpopup's orientation to horizontal or vertical.
- *
- * @param obj Ctxpopup object
- * @param horizontal @c EINA_TRUE for horizontal mode, @c EINA_FALSE for vertical
- *
- * @ingroup Ctxpopup
- */
-EAPI void                         elm_ctxpopup_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-
-/**
- * @brief Get the value of current ctxpopup object's orientation.
- *
- * @param obj Ctxpopup object
- * @return @c EINA_TRUE for horizontal mode, @c EINA_FALSE for vertical mode (or errors)
- *
- * @see elm_ctxpopup_horizontal_set()
- *
- * @ingroup Ctxpopup
- */
-EAPI Eina_Bool                    elm_ctxpopup_horizontal_get(const Evas_Object *obj);
-
-/**
- * @brief Add a new item to a ctxpopup object.
- *
- * @param obj Ctxpopup object
- * @param icon Icon to be set on new item
- * @param label The Label of the new item
- * @param func Convenience function called when item selected
- * @param data Data passed to @p func
- * @return A handle to the item added or @c NULL, on errors
- *
- * @warning Ctxpopup can't hold both an item list and a content at the same
- * time. When an item is added, any previous content will be removed.
- *
- * @see elm_object_content_set()
- *
- * @ingroup Ctxpopup
- */
-EAPI Elm_Object_Item             *elm_ctxpopup_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data);
-
-/**
- * @brief Set the direction priority of a ctxpopup.
- *
- * @param obj Ctxpopup object
- * @param first 1st priority of direction
- * @param second 2nd priority of direction
- * @param third 3th priority of direction
- * @param fourth 4th priority of direction
- *
- * This functions gives a chance to user to set the priority of ctxpopup
- * showing direction. This doesn't guarantee the ctxpopup will appear in the
- * requested direction.
- *
- * @see Elm_Ctxpopup_Direction
- *
- * @ingroup Ctxpopup
- */
-EAPI void                         elm_ctxpopup_direction_priority_set(Evas_Object *obj, Elm_Ctxpopup_Direction first, Elm_Ctxpopup_Direction second, Elm_Ctxpopup_Direction third, Elm_Ctxpopup_Direction fourth);
-
-/**
- * @brief Get the direction priority of a ctxpopup.
- *
- * @param obj Ctxpopup object
- * @param first 1st priority of direction to be returned
- * @param second 2nd priority of direction to be returned
- * @param third 3th priority of direction to be returned
- * @param fourth 4th priority of direction to be returned
- *
- * @see elm_ctxpopup_direction_priority_set() for more information.
- *
- * @ingroup Ctxpopup
- */
-EAPI void                         elm_ctxpopup_direction_priority_get(const Evas_Object *obj, Elm_Ctxpopup_Direction *first, Elm_Ctxpopup_Direction *second, Elm_Ctxpopup_Direction *third, Elm_Ctxpopup_Direction *fourth);
-
-/**
- * @brief Get the current direction of a ctxpopup.
- *
- * @param obj Ctxpopup object
- * @return current direction of a ctxpopup
- *
- * @warning Once the ctxpopup showed up, the direction would be determined
- *
- * @ingroup Ctxpopup
- */
-EAPI Elm_Ctxpopup_Direction       elm_ctxpopup_direction_get(const Evas_Object *obj);
-
-/**
- * @brief Dismiss a ctxpopup object
- *
- * @param obj The ctxpopup object
- * Use this function to simulate clicking outside of the ctxpopup to dismiss it.
- * In this way, the ctxpopup will be hidden and the "clicked" signal will be
- * emitted.
- */
-EAPI void                         elm_ctxpopup_dismiss(Evas_Object *obj);
-
-/**
- * @brief Set ctxpopup auto hide mode triggered by ctxpopup policy.
- * @since 1.9
- *
- * @param obj The ctxpopup object
- * @param disabled auto hide enable/disable.
- *
- * Use this function when user wants ctxpopup not to hide automatically.
- * By default, ctxpopup is dismissed whenever mouse clicked its background area, language is changed,
- * and its parent geometry is updated(changed).
- * Not to hide ctxpopup automatically, disable auto hide function by calling this API,
- * then ctxpopup won't be dismissed in those scenarios.
- *
- * Default value of disabled is @c EINA_FALSE.
- *
- * @see elm_ctxpopup_auto_hide_disabled_get()
- *
- * @ingroup Ctxpopup
- */
-EAPI void                         elm_ctxpopup_auto_hide_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-
-/**
- * @brief Get ctxpopup auto hide mode triggered by ctxpopup policy.
- * @since 1.9
- *
- * @param obj The ctxpopup object
- * @return auto hide mode's state of a ctxpopup
- *
- * @see elm_ctxpopup_auto_hide_disabled_set() for more information.
- *
- * @ingroup Ctxpopup
- */
-EAPI Eina_Bool                         elm_ctxpopup_auto_hide_disabled_get(const Evas_Object *obj);
+#include "elc_ctxpopup.eo.legacy.h"
diff --git a/src/lib/elm_bg_eo.h b/src/lib/elm_bg_eo.h
index e44952677..3978bc187 100644
--- a/src/lib/elm_bg_eo.h
+++ b/src/lib/elm_bg_eo.h
@@ -1,134 +1 @@
-#include "elm_bg.eo.h"
-
-#if 0
-#define ELM_OBJ_BG_CLASS elm_obj_bg_class_get()
-
-const Eo_Class *elm_obj_bg_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_BG_BASE_ID;
-
-enum
-{
-   ELM_OBJ_BG_SUB_ID_FILE_SET,
-   ELM_OBJ_BG_SUB_ID_FILE_GET,
-   ELM_OBJ_BG_SUB_ID_OPTION_SET,
-   ELM_OBJ_BG_SUB_ID_OPTION_GET,
-   ELM_OBJ_BG_SUB_ID_COLOR_SET,
-   ELM_OBJ_BG_SUB_ID_COLOR_GET,
-   ELM_OBJ_BG_SUB_ID_LOAD_SIZE_SET,
-   ELM_OBJ_BG_SUB_ID_LAST
-};
-
-#define ELM_OBJ_BG_ID(sub_id) (ELM_OBJ_BG_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_bg_file_set
- * @since 1.8
- *
- * Set the file (image or edje collection) to give life for the
- * background
- *
- * @param[in] file
- * @param[in] group
- * @param[out] ret
- *
- * @see elm_bg_file_set
- *
- * @ingroup Bg
- */
-#define elm_obj_bg_file_set(file, group, ret) ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_FILE_SET), EO_TYPECHECK(const char *, file), EO_TYPECHECK(const char *, group), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_bg_file_get
- * @since 1.8
- *
- * Get the file (image or edje collection) set on a given background
- *
- * @param[out] file
- * @param[out] group
- *
- * @see elm_bg_file_get
- *
- * @ingroup Bg
- */
-#define elm_obj_bg_file_get(file, group) ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_FILE_GET), EO_TYPECHECK(const char **, file), EO_TYPECHECK(const char **, group)
-
-/**
- * @def elm_obj_bg_option_set
- * @since 1.8
- *
- * Set the mode of display for a given background widget's image
- *
- * @param[in] option
- *
- * @see elm_bg_option_set
- *
- * @ingroup Bg
- */
-#define elm_obj_bg_option_set(option) ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_OPTION_SET), EO_TYPECHECK(Elm_Bg_Option, option)
-
-/**
- * @def elm_obj_bg_option_get
- * @since 1.8
- *
- * Get the mode of display for a given background widget's image
- *
- * @param[out] ret
- *
- * @see elm_bg_option_get
- *
- * @ingroup Bg
- */
-#define elm_obj_bg_option_get(ret) ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_OPTION_GET), EO_TYPECHECK(Elm_Bg_Option *, ret)
-
-/**
- * @def elm_obj_bg_color_set
- * @since 1.8
- *
- * Set the color on a given background widget
- *
- * @param[in] r
- * @param[in] g
- * @param[in] b
- * @param[in] a
- *
- * @see elm_bg_color_set
- *
- * @ingroup Bg
- */
-#define elm_obj_bg_color_set(r, g, b, a) ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_COLOR_SET), EO_TYPECHECK(int, r), EO_TYPECHECK(int, g), EO_TYPECHECK(int, b), EO_TYPECHECK(int, a)
-
-/**
- * @def elm_obj_bg_color_get
- * @since 1.8
- *
- * Get the color set on a given background widget
- *
- * @param[out] r
- * @param[out] g
- * @param[out] b
- * @param[out] a
- *
- * @see elm_bg_color_get
- *
- * @ingroup Bg
- */
-#define elm_obj_bg_color_get(r, g, b, a) ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_COLOR_GET), EO_TYPECHECK(int *, r), EO_TYPECHECK(int *, g), EO_TYPECHECK(int *, b), EO_TYPECHECK(int *, a)
-
-/**
- * @def elm_obj_bg_load_size_set
- * @since 1.8
- *
- * Set the size of the pixmap representation of the image set on a
- * given background widget.
- *
- * @param[in] w
- * @param[in] h
- *
- * @see elm_bg_load_size_set
- *
- * @ingroup Bg
- */
-#define elm_obj_bg_load_size_set(w, h) ELM_OBJ_BG_ID(ELM_OBJ_BG_SUB_ID_LOAD_SIZE_SET), EO_TYPECHECK(Evas_Coord, w), EO_TYPECHECK(Evas_Coord, h)
-#endif
+#include "elm_bg.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_bg_legacy.h b/src/lib/elm_bg_legacy.h
index cf35f8336..6f1ccc3ba 100644
--- a/src/lib/elm_bg_legacy.h
+++ b/src/lib/elm_bg_legacy.h
@@ -9,81 +9,6 @@
 EAPI Evas_Object                 *elm_bg_add(Evas_Object *parent);
 
 /**
- * Set the file (image or edje collection) to give life for the
- * background
- *
- * @param obj The background object handle
- * @param file The file path
- * @param group Optional key (group in Edje) within the file
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
- *
- * This sets the image file used in the background object. If the
- * image comes from an Edje group, it will be stretched to completely
- * fill the background object. If it comes from a traditional image file, it
- * will by default be centered in this widget's are (thus retaining
- * its aspect), what could lead to some parts being not visible. You
- * may change the mode of exhibition for a real image file with
- * elm_bg_option_set().
- *
- * @note Once the image of @p obj is set, a previously set one will be
- * deleted, even if @p file is @c NULL.
- *
- * @note This will only affect the contents of one of the background's
- * swallow spots, namely @c "elm.swallow.background". If you want to
- * achieve the @c Layout's file setting behavior, you'll have to call
- * that method on this object.
- *
- * @ingroup Bg
- */
-EAPI Eina_Bool                    elm_bg_file_set(Evas_Object *obj, const char *file, const char *group);
-
-/**
- * Get the file (image or edje collection) set on a given background
- * widget
- *
- * @param obj The background object handle
- * @param file Where to store the requested file's path
- * @param group Where to store the optional key within @a file, @b if
- * it's an Edje file
- *
- * @note Use @c NULL pointers on the file components you're not
- * interested in: they'll be ignored by the function.
- *
- * @ingroup Bg
- */
-EAPI void                         elm_bg_file_get(const Evas_Object *obj, const char **file, const char **group);
-
-/**
- * Set the mode of display for a given background widget's image
- *
- * @param obj The background object handle
- * @param option The desired background option (see #Elm_Bg_Option)
- *
- * This sets how the background widget will display its image. This
- * will only work if the elm_bg_file_set() was previously called with
- * an image file on @a obj. The image can be display tiled, scaled,
- * centered or stretched.
- *
- * @see elm_bg_option_get()
- *
- * @ingroup Bg
- */
-EAPI void                         elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option);
-
-/**
- * Get the mode of display for a given background widget's image
- *
- * @param obj The background object handle
- * @return The image displaying mode in use for @a obj or #ELM_BG_OPTION_LAST,
- * on errors.
- *
- * @see elm_bg_option_set() for more details
- *
- * @ingroup Bg
- */
-EAPI Elm_Bg_Option                elm_bg_option_get(const Evas_Object *obj);
-
-/**
  * Set the color on a given background widget
  *
  * @param obj The background object handle
@@ -123,27 +48,4 @@ EAPI void                         elm_bg_color_set(Evas_Object *obj, int r, int
  */
 EAPI void                         elm_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b);
 
-/**
- * Set the size of the pixmap representation of the image set on a
- * given background widget.
- *
- * @param obj The background object handle
- * @param w The new width of the image pixmap representation.
- * @param h The new height of the image pixmap representation.
- *
- * @warning This function just makes sense if an image file was set on
- * @p obj, with elm_bg_file_set().
- *
- * This function sets a new size for pixmap representation of the
- * given bg image. It allows for the image to be loaded already in the
- * specified size, reducing the memory usage and load time (for
- * example, when loading a big image file with its load size set to a
- * smaller size)
- *
- * @note This is just a hint for the underlying system. The real size
- * of the pixmap may differ depending on the type of image being
- * loaded, being bigger than requested.
- *
- * @ingroup Bg
- */
-EAPI void                         elm_bg_load_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+#include "elm_bg.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_box_eo.h b/src/lib/elm_box_eo.h
index ebc7f134c..00ed1f715 100644
--- a/src/lib/elm_box_eo.h
+++ b/src/lib/elm_box_eo.h
@@ -1,293 +1 @@
-#include "elm_box.eo.h"
-
-#if 0
-#define ELM_OBJ_BOX_CLASS elm_obj_box_class_get()
-
-const Eo_Class *elm_obj_box_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_BOX_BASE_ID;
-
-enum
-{
-   ELM_OBJ_BOX_SUB_ID_HORIZONTAL_SET,
-   ELM_OBJ_BOX_SUB_ID_HORIZONTAL_GET,
-   ELM_OBJ_BOX_SUB_ID_HOMOGENEOUS_SET,
-   ELM_OBJ_BOX_SUB_ID_HOMOGENEOUS_GET,
-   ELM_OBJ_BOX_SUB_ID_PACK_START,
-   ELM_OBJ_BOX_SUB_ID_PACK_END,
-   ELM_OBJ_BOX_SUB_ID_PACK_BEFORE,
-   ELM_OBJ_BOX_SUB_ID_PACK_AFTER,
-   ELM_OBJ_BOX_SUB_ID_CLEAR,
-   ELM_OBJ_BOX_SUB_ID_UNPACK,
-   ELM_OBJ_BOX_SUB_ID_UNPACK_ALL,
-   ELM_OBJ_BOX_SUB_ID_LAYOUT_SET,
-   ELM_OBJ_BOX_SUB_ID_CHILDREN_GET,
-   ELM_OBJ_BOX_SUB_ID_PADDING_SET,
-   ELM_OBJ_BOX_SUB_ID_PADDING_GET,
-   ELM_OBJ_BOX_SUB_ID_ALIGN_SET,
-   ELM_OBJ_BOX_SUB_ID_ALIGN_GET,
-   ELM_OBJ_BOX_SUB_ID_RECALCULATE,
-   ELM_OBJ_BOX_SUB_ID_LAST
-};
-
-#define ELM_OBJ_BOX_ID(sub_id) (ELM_OBJ_BOX_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_box_horizontal_set
- * @since 1.8
- *
- * Set the horizontal orientation
- *
- * @param[in] horizontal
- *
- * @see elm_box_horizontal_set
- *
- * @ingroup Box
- */
-#define elm_obj_box_horizontal_set(horizontal) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_HORIZONTAL_SET), EO_TYPECHECK(Eina_Bool, horizontal)
-
-/**
- * @def elm_obj_box_horizontal_get
- * @since 1.8
- *
- * Get the horizontal orientation
- *
- * @param[out] ret
- *
- * @see elm_box_horizontal_get
- *
- * @ingroup Box
- */
-#define elm_obj_box_horizontal_get(ret) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_HORIZONTAL_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_box_homogeneous_set
- * @since 1.8
- *
- * Set the box to arrange its children homogeneously
- *
- * @param[in] homogeneous
- *
- * @see elm_box_homogeneous_set
- *
- * @ingroup Box
- */
-#define elm_obj_box_homogeneous_set(homogeneous) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_HOMOGENEOUS_SET), EO_TYPECHECK(Eina_Bool, homogeneous)
-
-/**
- * @def elm_obj_box_homogeneous_get
- * @since 1.8
- *
- * Get whether the box is using homogeneous mode or not
- *
- * @param[out] ret
- *
- * @see elm_box_homogeneous_get
- *
- * @ingroup Box
- */
-#define elm_obj_box_homogeneous_get(ret) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_HOMOGENEOUS_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_box_pack_start
- * @since 1.8
- *
- * Add an object to the beginning of the pack list
- *
- * @param[in] subobj
- *
- * @see elm_box_pack_start
- *
- * @ingroup Box
- */
-#define elm_obj_box_pack_start(subobj) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_PACK_START), EO_TYPECHECK(Evas_Object *, subobj)
-
-/**
- * @def elm_obj_box_pack_end
- * @since 1.8
- *
- * Add an object at the end of the pack list
- *
- * @param[in] subobj
- *
- * @see elm_box_pack_end
- *
- * @ingroup Box
- */
-#define elm_obj_box_pack_end(subobj) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_PACK_END), EO_TYPECHECK(Evas_Object *, subobj)
-
-/**
- * @def elm_obj_box_pack_before
- * @since 1.8
- *
- * Adds an object to the box before the indicated object
- *
- * @param[in] subobj
- * @param[in] before
- *
- * @see elm_box_pack_before
- *
- * @ingroup Box
- */
-#define elm_obj_box_pack_before(subobj, before) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_PACK_BEFORE), EO_TYPECHECK(Evas_Object *, subobj), EO_TYPECHECK(Evas_Object *, before)
-
-/**
- * @def elm_obj_box_pack_after
- * @since 1.8
- *
- * Adds an object to the box after the indicated object
- *
- * @param[in] subobj
- * @param[in] after
- *
- * @see elm_box_pack_after
- *
- * @ingroup Box
- */
-#define elm_obj_box_pack_after(subobj, after) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_PACK_AFTER), EO_TYPECHECK(Evas_Object *, subobj), EO_TYPECHECK(Evas_Object *, after)
-
-/**
- * @def elm_obj_box_clear
- * @since 1.8
- *
- * Clear the box of all children
- *
- *
- * @see elm_box_clear
- *
- * @ingroup Box
- */
-#define elm_obj_box_clear() ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_CLEAR)
-
-/**
- * @def elm_obj_box_unpack
- * @since 1.8
- *
- * Unpack a box item
- *
- * @param[in] subobj
- *
- * @see elm_box_unpack
- *
- * @ingroup Box
- */
-#define elm_obj_box_unpack(subobj) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_UNPACK), EO_TYPECHECK(Evas_Object *, subobj)
-
-/**
- * @def elm_obj_box_unpack_all
- * @since 1.8
- *
- * Remove all items from the box, without deleting them
- *
- *
- * @see elm_box_unpack_all
- *
- * @ingroup Box
- */
-#define elm_obj_box_unpack_all() ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_UNPACK_ALL)
-
-/**
- * @def elm_obj_box_layout_set
- * @since 1.8
- *
- * Set the layout defining function to be used by the box
- *
- * @param[in] cb
- * @param[in] data
- * @param[in] free_data
- *
- * @see elm_box_layout_set
- *
- * @ingroup Box
- */
-#define elm_obj_box_layout_set(cb, data, free_data) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_LAYOUT_SET), EO_TYPECHECK(Evas_Object_Box_Layout, cb), EO_TYPECHECK(const void *, data), EO_TYPECHECK(Ecore_Cb, free_data)
-
-/**
- * @def elm_obj_box_children_get
- * @since 1.8
- *
- * Retrieve a list of the objects packed into the box
- *
- * @param[out] ret
- *
- * @see elm_box_children_get
- *
- * @ingroup Box
- */
-#define elm_obj_box_children_get(ret) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_CHILDREN_GET), EO_TYPECHECK(Eina_List **, ret)
-
-/**
- * @def elm_obj_box_padding_set
- * @since 1.8
- *
- * Set the space (padding) between the box's elements.
- *
- * @param[in] horizontal
- * @param[in] vertical
- *
- * @see elm_box_padding_set
- *
- * @ingroup Box
- */
-#define elm_obj_box_padding_set(horizontal, vertical) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_PADDING_SET), EO_TYPECHECK(Evas_Coord, horizontal), EO_TYPECHECK(Evas_Coord, vertical)
-
-/**
- * @def elm_obj_box_padding_get
- * @since 1.8
- *
- * Get the space (padding) between the box's elements.
- *
- * @param[out] horizontal
- * @param[out] vertical
- *
- * @see elm_box_padding_get
- *
- * @ingroup Box
- */
-#define elm_obj_box_padding_get(horizontal, vertical) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_PADDING_GET), EO_TYPECHECK(Evas_Coord *, horizontal), EO_TYPECHECK(Evas_Coord *, vertical)
-
-/**
- * @def elm_obj_box_align_set
- * @since 1.8
- *
- * Set the alignment of the whole bounding box of contents.
- *
- * @param[in] horizontal
- * @param[in] vertical
- *
- * @see elm_box_align_set
- *
- * @ingroup Box
- */
-#define elm_obj_box_align_set(horizontal, vertical) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_ALIGN_SET), EO_TYPECHECK(double, horizontal), EO_TYPECHECK(double, vertical)
-
-/**
- * @def elm_obj_box_align_get
- * @since 1.8
- *
- * Get the alignment of the whole bounding box of contents.
- *
- * @param[out] horizontal
- * @param[out] vertical
- *
- * @see elm_box_align_get
- *
- * @ingroup Box
- */
-#define elm_obj_box_align_get(horizontal, vertical) ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_ALIGN_GET), EO_TYPECHECK(double *, horizontal), EO_TYPECHECK(double *, vertical)
-
-/**
- * @def elm_obj_box_recalculate
- * @since 1.8
- *
- * Force the box to recalculate its children packing.
- *
- *
- * @see elm_box_recalculate
- *
- * @ingroup Box
- */
-#define elm_obj_box_recalculate() ELM_OBJ_BOX_ID(ELM_OBJ_BOX_SUB_ID_RECALCULATE)
-#endif
-
+#include "elm_box.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_box_legacy.h b/src/lib/elm_box_legacy.h
index ccaa583db..c0fab7136 100644
--- a/src/lib/elm_box_legacy.h
+++ b/src/lib/elm_box_legacy.h
@@ -10,317 +10,4 @@
  */
 EAPI Evas_Object        *elm_box_add(Evas_Object *parent);
 
-/**
- * Set the horizontal orientation
- *
- * By default, box object arranges their contents vertically from top to
- * bottom.
- * By calling this function with @p horizontal as @c EINA_TRUE, the box will
- * become horizontal, arranging contents from left to right.
- *
- * @note This flag is ignored if a custom layout function is set.
- *
- * @param obj The box object
- * @param horizontal The horizontal flag (@c EINA_TRUE = horizontal,
- * @c EINA_FALSE = vertical)
- *
- * @ingroup Box
- */
-EAPI void                elm_box_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-
-/**
- * Get the horizontal orientation
- *
- * @param obj The box object
- * @return @c EINA_TRUE if the box is set to horizontal mode, @c EINA_FALSE otherwise
- */
-EAPI Eina_Bool           elm_box_horizontal_get(const Evas_Object *obj);
-
-/**
- * Set the box to arrange its children homogeneously
- *
- * If enabled, homogeneous layout makes all items the same size, according
- * to the size of the largest of its children.
- *
- * @note This flag is ignored if a custom layout function is set.
- *
- * @param obj The box object
- * @param homogeneous The homogeneous flag
- *
- * @ingroup Box
- */
-EAPI void                elm_box_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-
-/**
- * Get whether the box is using homogeneous mode or not
- *
- * @param obj The box object
- * @return @c EINA_TRUE if it's homogeneous, @c EINA_FALSE otherwise
- *
- * @ingroup Box
- */
-EAPI Eina_Bool           elm_box_homogeneous_get(const Evas_Object *obj);
-
-/**
- * Add an object to the beginning of the pack list
- *
- * Pack @p subobj into the box @p obj, placing it first in the list of
- * children objects. The actual position the object will get on screen
- * depends on the layout used. If no custom layout is set, it will be at
- * the top or left, depending if the box is vertical or horizontal,
- * respectively.
- *
- * @param obj The box object
- * @param subobj The object to add to the box
- *
- * @see elm_box_pack_end()
- * @see elm_box_pack_before()
- * @see elm_box_pack_after()
- * @see elm_box_unpack()
- * @see elm_box_unpack_all()
- * @see elm_box_clear()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_pack_start(Evas_Object *obj, Evas_Object *subobj);
-
-/**
- * Add an object at the end of the pack list
- *
- * Pack @p subobj into the box @p obj, placing it last in the list of
- * children objects. The actual position the object will get on screen
- * depends on the layout used. If no custom layout is set, it will be at
- * the bottom or right, depending if the box is vertical or horizontal,
- * respectively.
- *
- * @param obj The box object
- * @param subobj The object to add to the box
- *
- * @see elm_box_pack_start()
- * @see elm_box_pack_before()
- * @see elm_box_pack_after()
- * @see elm_box_unpack()
- * @see elm_box_unpack_all()
- * @see elm_box_clear()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_pack_end(Evas_Object *obj, Evas_Object *subobj);
-
-/**
- * Adds an object to the box before the indicated object
- *
- * This will add the @p subobj to the box indicated before the object
- * indicated with @p before. If @p before is not already in the box, results
- * are undefined. Before means either to the left of the indicated object or
- * above it depending on orientation.
- *
- * @param obj The box object
- * @param subobj The object to add to the box
- * @param before The object before which to add it
- *
- * @see elm_box_pack_start()
- * @see elm_box_pack_end()
- * @see elm_box_pack_after()
- * @see elm_box_unpack()
- * @see elm_box_unpack_all()
- * @see elm_box_clear()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_pack_before(Evas_Object *obj, Evas_Object *subobj, Evas_Object *before);
-
-/**
- * Adds an object to the box after the indicated object
- *
- * This will add the @p subobj to the box indicated after the object
- * indicated with @p after. If @p after is not already in the box, results
- * are undefined. After means either to the right of the indicated object or
- * below it depending on orientation.
- *
- * @param obj The box object
- * @param subobj The object to add to the box
- * @param after The object after which to add it
- *
- * @see elm_box_pack_start()
- * @see elm_box_pack_end()
- * @see elm_box_pack_before()
- * @see elm_box_unpack()
- * @see elm_box_unpack_all()
- * @see elm_box_clear()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_pack_after(Evas_Object *obj, Evas_Object *subobj, Evas_Object *after);
-
-/**
- * Clear the box of all children
- *
- * Remove all the elements contained by the box, deleting the respective
- * objects.
- *
- * @param obj The box object
- *
- * @see elm_box_unpack()
- * @see elm_box_unpack_all()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_clear(Evas_Object *obj);
-
-/**
- * Unpack a box item
- *
- * Remove the object given by @p subobj from the box @p obj without
- * deleting it.
- *
- * @param obj The box object
- * @param subobj The object to unpack
- *
- * @see elm_box_unpack_all()
- * @see elm_box_clear()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_unpack(Evas_Object *obj, Evas_Object *subobj);
-
-/**
- * Remove all items from the box, without deleting them
- *
- * Clear the box from all children, but don't delete the respective objects.
- * If no other references of the box children exist, the objects will never
- * be deleted, and thus the application will leak the memory. Make sure
- * when using this function that you hold a reference to all the objects
- * in the box @p obj.
- *
- * @param obj The box object
- *
- * @see elm_box_clear()
- * @see elm_box_unpack()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_unpack_all(Evas_Object *obj);
-
-/**
- * Set the layout defining function to be used by the box
- *
- * Whenever anything changes that requires the box in @p obj to recalculate
- * the size and position of its elements, the function @p cb will be called
- * to determine what the layout of the children will be.
- *
- * Once a custom function is set, everything about the children layout
- * is defined by it. The flags set by elm_box_horizontal_set() and
- * elm_box_homogeneous_set() no longer have any meaning, and the values
- * given by elm_box_padding_set() and elm_box_align_set() are up to this
- * layout function to decide if they are used and how. These last two
- * will be found in the @c priv parameter, of type @c Evas_Object_Box_Data,
- * passed to @p cb. The @c Evas_Object the function receives is not the
- * Elementary widget, but the internal Evas Box it uses, so none of the
- * functions described here can be used on it.
- *
- * Any of the layout functions in @c Evas can be used here, as well as the
- * special elm_box_layout_transition().
- *
- * The final @p data argument received by @p cb is the same @p data passed
- * here, and the @p free_data function will be called to free it
- * whenever the box is destroyed or another layout function is set.
- *
- * Setting @p cb to NULL will revert back to the default layout function.
- *
- * @param obj The box object
- * @param cb The callback function used for layout
- * @param data Data that will be passed to layout function
- * @param free_data Function called to free @p data
- *
- * @see elm_box_layout_transition()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, Ecore_Cb free_data);
-
-/**
- * Retrieve a list of the objects packed into the box
- *
- * Returns a new @c Eina_List with a pointer to @c Evas_Object in its nodes.
- * The order of the list corresponds to the packing order the box uses.
- *
- * You must free this list with eina_list_free() once you are done with it.
- *
- * @param obj The box object
- *
- * @ingroup Box
- */
-EAPI Eina_List    *elm_box_children_get(const Evas_Object *obj);
-
-/**
- * Set the space (padding) between the box's elements.
- *
- * Extra space in pixels that will be added between a box child and its
- * neighbors after its containing cell has been calculated. This padding
- * is set for all elements in the box, besides any possible padding that
- * individual elements may have through their size hints.
- *
- * @param obj The box object
- * @param horizontal The horizontal space between elements
- * @param vertical The vertical space between elements
- *
- * @ingroup Box
- */
-EAPI void                elm_box_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical);
-
-/**
- * Get the space (padding) between the box's elements.
- *
- * @param obj The box object
- * @param horizontal The horizontal space between elements
- * @param vertical The vertical space between elements
- *
- * @see elm_box_padding_set()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical);
-
-/**
- * Set the alignment of the whole bounding box of contents.
- *
- * Sets how the bounding box containing all the elements of the box, after
- * their sizes and position has been calculated, will be aligned within
- * the space given for the whole box widget.
- *
- * @param obj The box object
- * @param horizontal The horizontal alignment of elements
- * @param vertical The vertical alignment of elements
- *
- * @ingroup Box
- */
-EAPI void                elm_box_align_set(Evas_Object *obj, double horizontal, double vertical);
-
-/**
- * Get the alignment of the whole bounding box of contents.
- *
- * @param obj The box object
- * @param horizontal The horizontal alignment of elements
- * @param vertical The vertical alignment of elements
- *
- * @see elm_box_align_set()
- *
- * @ingroup Box
- */
-EAPI void                elm_box_align_get(const Evas_Object *obj, double *horizontal, double *vertical);
-
-/**
- * Force the box to recalculate its children packing.
- *
- * If any children was added or removed, box will not calculate the
- * values immediately rather leaving it to the next main loop
- * iteration. While this is great as it would save lots of
- * recalculation, whenever you need to get the position of a just
- * added item you must force recalculate before doing so.
- *
- * @param obj The box object.
- *
- * @ingroup Box
- */
-EAPI void                elm_box_recalculate(Evas_Object *obj);
+#include "elm_box.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_bubble_eo.h b/src/lib/elm_bubble_eo.h
index 1892cadb7..d4003f6c8 100644
--- a/src/lib/elm_bubble_eo.h
+++ b/src/lib/elm_bubble_eo.h
@@ -1,47 +1 @@
-#include "elm_bubble.eo.h"
-
-#if 0
-#define ELM_OBJ_BUBBLE_CLASS elm_obj_bubble_class_get()
-
-const Eo_Class *elm_obj_bubble_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_BUBBLE_BASE_ID;
-
-enum
-{
-   ELM_OBJ_BUBBLE_SUB_ID_POS_SET,
-   ELM_OBJ_BUBBLE_SUB_ID_POS_GET,
-   ELM_OBJ_BUBBLE_SUB_ID_LAST
-};
-
-#define ELM_OBJ_BUBBLE_ID(sub_id) (ELM_OBJ_BUBBLE_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_bubble_pos_set
- * @since 1.8
- *
- * Set the corner of the bubble
- *
- * @param[in] pos
- *
- * @see elm_bubble_pos_set
- *
- * @ingroup Bubble
- */
-#define elm_obj_bubble_pos_set(pos) ELM_OBJ_BUBBLE_ID(ELM_OBJ_BUBBLE_SUB_ID_POS_SET), EO_TYPECHECK(Elm_Bubble_Pos, pos)
-
-/**
- * @def elm_obj_bubble_pos_get
- * @since 1.8
- *
- * Get the corner of the bubble
- *
- * @param[out] ret
- *
- * @see elm_bubble_pos_get
- *
- * @ingroup Bubble
- */
-#define elm_obj_bubble_pos_get(ret) ELM_OBJ_BUBBLE_ID(ELM_OBJ_BUBBLE_SUB_ID_POS_GET), EO_TYPECHECK(Elm_Bubble_Pos *, ret)
-#endif
+#include "elm_bubble.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_bubble_legacy.h b/src/lib/elm_bubble_legacy.h
index 160a78d88..a0b3e368c 100644
--- a/src/lib/elm_bubble_legacy.h
+++ b/src/lib/elm_bubble_legacy.h
@@ -10,29 +10,4 @@
  */
 EAPI Evas_Object                 *elm_bubble_add(Evas_Object *parent);
 
-/**
- * Set the corner of the bubble
- *
- * @param obj The bubble object.
- * @param pos The given corner for the bubble.
- *
- * This function sets the corner of the bubble. The corner will be used to
- * determine where the arrow in the frame points to and where label, icon and
- * info are shown.
- *
- *
- * @ingroup Bubble
- */
-EAPI void  elm_bubble_pos_set(Evas_Object *obj, Elm_Bubble_Pos pos);
-
-/**
- * Get the corner of the bubble
- *
- * @param obj The bubble object.
- * @return The given corner for the bubble.
- *
- * This function gets the selected corner of the bubble.
- *
- * @ingroup Bubble
- */
-EAPI Elm_Bubble_Pos elm_bubble_pos_get(const Evas_Object *obj);
+#include "elm_bubble.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_button.eo b/src/lib/elm_button.eo
index 1325196d3..61106e827 100644
--- a/src/lib/elm_button.eo
+++ b/src/lib/elm_button.eo
@@ -89,6 +89,7 @@ class Elm_Button (Elm_Layout, Evas_Clickable_Interface,
       admits_autorepeat {
          get {
             /*@ No description supplied by the EAPI. */
+            legacy null;
          }
          values {
             Eina_Bool ret;
diff --git a/src/lib/elm_button_eo.h b/src/lib/elm_button_eo.h
index d9769987d..c77b17951 100644
--- a/src/lib/elm_button_eo.h
+++ b/src/lib/elm_button_eo.h
@@ -1,122 +1 @@
-#include "elm_button.eo.h"
-
-#if 0
-#define ELM_OBJ_BUTTON_CLASS elm_obj_button_class_get()
-
-const Eo_Class *elm_obj_button_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_BUTTON_BASE_ID;
-
-enum
-{
-   ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET,
-   ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_SET,
-   ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GET,
-   ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_INITIAL_TIMEOUT_SET,
-   ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_INITIAL_TIMEOUT_GET,
-   ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GAP_TIMEOUT_SET,
-   ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GAP_TIMEOUT_GET,
-   ELM_OBJ_BUTTON_SUB_ID_LAST
-};
-
-#define ELM_OBJ_BUTTON_ID(sub_id) (ELM_OBJ_BUTTON_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_button_admits_autorepeat_get
- * @since 1.8
- *
- * No description supplied by the EAPI.
- *
- * @param[out] ret
- *
- * @see elm_button_admits_autorepeat_get
- *
- * @ingroup Button
- */
-#define elm_obj_button_admits_autorepeat_get(ret) ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_button_autorepeat_set
- * @since 1.8
- *
- * Turn on/off the autorepeat event generated when the button is kept pressed
- *
- * @param[in] on
- *
- * @see elm_button_autorepeat_set
- *
- * @ingroup Button
- */
-#define elm_obj_button_autorepeat_set(on) ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_SET), EO_TYPECHECK(Eina_Bool, on)
-
-/**
- * @def elm_obj_button_autorepeat_get
- * @since 1.8
- *
- * Get whether the autorepeat feature is enabled
- *
- * @param[out] ret
- *
- * @see elm_button_autorepeat_get
- *
- * @ingroup Button
- */
-#define elm_obj_button_autorepeat_get(ret) ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_button_autorepeat_initial_timeout_set
- * @since 1.8
- *
- * Set the initial timeout before the autorepeat event is generated
- *
- * @param[in] t
- *
- * @see elm_button_autorepeat_initial_timeout_set
- *
- * @ingroup Button
- */
-#define elm_obj_button_autorepeat_initial_timeout_set(t) ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_INITIAL_TIMEOUT_SET), EO_TYPECHECK(double, t)
-
-/**
- * @def elm_obj_button_autorepeat_initial_timeout_get
- * @since 1.8
- *
- * Get the initial timeout before the autorepeat event is generated
- *
- * @param[out] ret
- *
- * @see elm_button_autorepeat_initial_timeout_get
- *
- * @ingroup Button
- */
-#define elm_obj_button_autorepeat_initial_timeout_get(ret) ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_INITIAL_TIMEOUT_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_button_autorepeat_gap_timeout_set
- * @since 1.8
- *
- * Set the interval between each generated autorepeat event
- *
- * @param[in] t
- *
- * @see elm_button_autorepeat_gap_timeout_set
- *
- * @ingroup Button
- */
-#define elm_obj_button_autorepeat_gap_timeout_set(t) ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GAP_TIMEOUT_SET), EO_TYPECHECK(double, t)
-
-/**
- * @def elm_obj_button_autorepeat_gap_timeout_get
- * @since 1.8
- *
- * Get the interval between each generated autorepeat event
- *
- * @param[out] ret
- *
- * @see elm_button_autorepeat_gap_timeout_get
- *
- * @ingroup Button
- */
-#define elm_obj_button_autorepeat_gap_timeout_get(ret) ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GAP_TIMEOUT_GET), EO_TYPECHECK(double *, ret)
-#endif
+#include "elm_button.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_button_legacy.h b/src/lib/elm_button_legacy.h
index 23a382893..b78a86831 100644
--- a/src/lib/elm_button_legacy.h
+++ b/src/lib/elm_button_legacy.h
@@ -8,88 +8,4 @@
  */
 EAPI Evas_Object                 *elm_button_add(Evas_Object *parent);
 
-/**
- * Turn on/off the autorepeat event generated when the button is kept pressed
- *
- * When off, no autorepeat is performed and buttons emit a normal @c clicked
- * signal when they are clicked.
- *
- * When on, keeping a button pressed will continuously emit a @c repeated
- * signal until the button is released. The time it takes until it starts
- * emitting the signal is given by
- * elm_button_autorepeat_initial_timeout_set(), and the time between each
- * new emission by elm_button_autorepeat_gap_timeout_set().
- *
- * @param obj The button object
- * @param on  A bool to turn on/off the event
- *
- * @ingroup Button
- */
-EAPI void                         elm_button_autorepeat_set(Evas_Object *obj, Eina_Bool on);
-
-/**
- * Get whether the autorepeat feature is enabled
- *
- * @param obj The button object
- * @return @c EINA_TRUE if autorepeat is on, @c EINA_FALSE otherwise
- *
- * @see elm_button_autorepeat_set()
- *
- * @ingroup Button
- */
-EAPI Eina_Bool                    elm_button_autorepeat_get(const Evas_Object *obj);
-
-/**
- * Set the initial timeout before the autorepeat event is generated
- *
- * Sets the timeout, in seconds, since the button is pressed until the
- * first @c repeated signal is emitted. If @p t is 0.0 or less, there
- * won't be any delay and the event will be fired the moment the button is
- * pressed.
- *
- * @param obj The button object
- * @param t   Timeout in seconds
- *
- * @see elm_button_autorepeat_set()
- * @see elm_button_autorepeat_gap_timeout_set()
- *
- * @ingroup Button
- */
-EAPI void                         elm_button_autorepeat_initial_timeout_set(Evas_Object *obj, double t);
-
-/**
- * Get the initial timeout before the autorepeat event is generated
- *
- * @param obj The button object
- * @return Timeout in seconds
- *
- * @see elm_button_autorepeat_initial_timeout_set()
- *
- * @ingroup Button
- */
-EAPI double                       elm_button_autorepeat_initial_timeout_get(const Evas_Object *obj);
-
-/**
- * Set the interval between each generated autorepeat event
- *
- * After the first @c repeated event is fired, all subsequent ones will
- * follow after a delay of @p t seconds for each.
- *
- * @param obj The button object
- * @param t   Interval in seconds
- *
- * @see elm_button_autorepeat_initial_timeout_set()
- *
- * @ingroup Button
- */
-EAPI void                         elm_button_autorepeat_gap_timeout_set(Evas_Object *obj, double t);
-
-/**
- * Get the interval between each generated autorepeat event
- *
- * @param obj The button object
- * @return Interval in seconds
- *
- * @ingroup Button
- */
-EAPI double                       elm_button_autorepeat_gap_timeout_get(const Evas_Object *obj);
+#include "elm_button.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_calendar_eo.h b/src/lib/elm_calendar_eo.h
index ec57bfa12..9d4bf0558 100644
--- a/src/lib/elm_calendar_eo.h
+++ b/src/lib/elm_calendar_eo.h
@@ -1,323 +1 @@
-#include "elm_calendar.eo.h"
-
-#if 0
-#define ELM_OBJ_CALENDAR_CLASS elm_obj_calendar_class_get()
-
-const Eo_Class *elm_obj_calendar_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_CALENDAR_BASE_ID;
-
-enum
-{
-   ELM_OBJ_CALENDAR_SUB_ID_WEEKDAYS_NAMES_SET,
-   ELM_OBJ_CALENDAR_SUB_ID_WEEKDAYS_NAMES_GET,
-   ELM_OBJ_CALENDAR_SUB_ID_INTERVAL_SET,
-   ELM_OBJ_CALENDAR_SUB_ID_INTERVAL_GET,
-   ELM_OBJ_CALENDAR_SUB_ID_MIN_MAX_YEAR_SET,
-   ELM_OBJ_CALENDAR_SUB_ID_MIN_MAX_YEAR_GET,
-   ELM_OBJ_CALENDAR_SUB_ID_SELECTED_TIME_SET,
-   ELM_OBJ_CALENDAR_SUB_ID_SELECTED_TIME_GET,
-   ELM_OBJ_CALENDAR_SUB_ID_FORMAT_FUNCTION_SET,
-   ELM_OBJ_CALENDAR_SUB_ID_MARK_ADD,
-   ELM_OBJ_CALENDAR_SUB_ID_MARKS_CLEAR,
-   ELM_OBJ_CALENDAR_SUB_ID_MARKS_GET,
-   ELM_OBJ_CALENDAR_SUB_ID_MARKS_DRAW,
-   ELM_OBJ_CALENDAR_SUB_ID_FIRST_DAY_OF_WEEK_SET,
-   ELM_OBJ_CALENDAR_SUB_ID_FIRST_DAY_OF_WEEK_GET,
-   ELM_OBJ_CALENDAR_SUB_ID_SELECT_MODE_SET,
-   ELM_OBJ_CALENDAR_SUB_ID_SELECT_MODE_GET,
-   ELM_OBJ_CALENDAR_SUB_ID_SELECTABLE_SET,
-   ELM_OBJ_CALENDAR_SUB_ID_SELECTABLE_GET,
-   ELM_OBJ_CALENDAR_SUB_ID_DISPLAYED_TIME_GET,
-   ELM_OBJ_CALENDAR_SUB_ID_LAST
-};
-
-#define ELM_OBJ_CALENDAR_ID(sub_id) (ELM_OBJ_CALENDAR_BASE_ID + sub_id)
-
-/**
- * @def elm_obj_calendar_weekdays_names_set
- * @since 1.8
- *
- * Set weekdays names to be displayed by the calendar.
- *
- * @param[in] weekdays
- *
- * @see elm_calendar_weekdays_names_set
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_weekdays_names_set(weekdays) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_WEEKDAYS_NAMES_SET), EO_TYPECHECK(const char **, weekdays)
-
-/**
- * @def elm_obj_calendar_weekdays_names_get
- * @since 1.8
- *
- * Get weekdays names displayed by the calendar.
- *
- * @param[out] ret
- *
- * @see elm_calendar_weekdays_names_get
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_weekdays_names_get(ret) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_WEEKDAYS_NAMES_GET), EO_TYPECHECK(const char ***, ret)
-
-/**
- * @def elm_obj_calendar_interval_set
- * @since 1.8
- *
- * Set the interval on time updates for an user mouse button hold
- *
- * @param[in] interval
- *
- * @see elm_calendar_interval_set
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_interval_set(interval) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_INTERVAL_SET), EO_TYPECHECK(double, interval)
-
-/**
- * @def elm_obj_calendar_interval_get
- * @since 1.8
- *
- * Get the interval on time updates for an user mouse button hold
- *
- * @param[out] ret
- *
- * @see elm_calendar_interval_get
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_interval_get(ret) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_INTERVAL_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_calendar_min_max_year_set
- * @since 1.8
- *
- * Set the minimum and maximum values for the year
- *
- * @param[in] min
- * @param[in] max
- *
- * @see elm_calendar_min_max_year_set
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_min_max_year_set(min, max) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_MIN_MAX_YEAR_SET), EO_TYPECHECK(int, min), EO_TYPECHECK(int, max)
-
-/**
- * @def elm_obj_calendar_min_max_year_get
- * @since 1.8
- *
- * Get the minimum and maximum values for the year
- *
- * @param[out] min
- * @param[out] max
- *
- * @see elm_calendar_min_max_year_get
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_min_max_year_get(min, max) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_MIN_MAX_YEAR_GET), EO_TYPECHECK(int *, min), EO_TYPECHECK(int *, max)
-
-/**
- * @def elm_obj_calendar_selected_time_set
- * @since 1.8
- *
- * Set selected date to be highlighted on calendar.
- *
- * @param[in] selected_time
- *
- * @see elm_calendar_selected_time_set
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_selected_time_set(selected_time) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_SELECTED_TIME_SET), EO_TYPECHECK(struct tm *, selected_time)
-
-/**
- * @def elm_obj_calendar_selected_time_get
- * @since 1.8
- *
- * Get selected date.
- *
- * @param[in,out] selected_time
- * @param[out] ret
- *
- * @see elm_calendar_selected_time_get
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_selected_time_get(selected_time, ret) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_SELECTED_TIME_GET), EO_TYPECHECK(struct tm *, selected_time), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_calendar_format_function_set
- * @since 1.8
- *
- * Set a function to format the string that will be used to display
- * to display month and year.
- *
- * @param[in] format_function
- *
- * @see elm_calendar_format_function_set
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_format_function_set(format_function) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_FORMAT_FUNCTION_SET), EO_TYPECHECK(Elm_Calendar_Format_Cb, format_function)
-
-/**
- * @def elm_obj_calendar_mark_add
- * @since 1.8
- *
- * Add a new mark to the calendar
- *
- * @param[in] mark_type
- * @param[in] mark_time
- * @param[in] repeat
- * @param[out] ret
- *
- * @see elm_calendar_mark_add
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_mark_add(mark_type, mark_time, repeat, ret) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_MARK_ADD), EO_TYPECHECK(const char *, mark_type), EO_TYPECHECK(struct tm *, mark_time), EO_TYPECHECK(Elm_Calendar_Mark_Repeat_Type, repeat), EO_TYPECHECK(Elm_Calendar_Mark **, ret)
-
-/**
- * @def elm_obj_calendar_marks_clear
- * @since 1.8
- *
- * Remove all calendar's marks
- *
- *
- * @see elm_calendar_marks_clear
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_marks_clear() ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_MARKS_CLEAR)
-
-/**
- * @def elm_obj_calendar_marks_get
- * @since 1.8
- *
- * Get a list of all the calendar marks.
- *
- * @param[out] ret
- *
- * @see elm_calendar_marks_get
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_marks_get(ret) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_MARKS_GET), EO_TYPECHECK(const Eina_List **, ret)
-
-/**
- * @def elm_obj_calendar_marks_draw
- * @since 1.8
- *
- * Draw calendar marks.
- *
- *
- * @see elm_calendar_marks_draw
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_marks_draw() ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_MARKS_DRAW)
-
-/**
- * @def elm_obj_calendar_first_day_of_week_set
- * @since 1.8
- *
- * Set the first day of week to use on calendar widgets'.
- *
- * @param[in] day
- *
- * @see elm_calendar_first_day_of_week_set
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_first_day_of_week_set(day) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_FIRST_DAY_OF_WEEK_SET), EO_TYPECHECK(Elm_Calendar_Weekday, day)
-
-/**
- * @def elm_obj_calendar_first_day_of_week_get
- * @since 1.8
- *
- * Get the first day of week, who are used on calendar widgets'.
- *
- * @param[out] ret
- *
- * @see elm_calendar_first_day_of_week_get
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_first_day_of_week_get(ret) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_FIRST_DAY_OF_WEEK_GET), EO_TYPECHECK(Elm_Calendar_Weekday *, ret)
-
-/**
- * @def elm_obj_calendar_select_mode_set
- * @since 1.8
- *
- * Set select day mode to use.
- *
- * @param[in] mode
- *
- * @see elm_calendar_select_mode_set
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_select_mode_set(mode) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_SELECT_MODE_SET), EO_TYPECHECK(Elm_Calendar_Select_Mode, mode)
-
-/**
- * @def elm_obj_calendar_select_mode_get
- * @since 1.8
- *
- * Get the select day mode used.
- *
- * @param[out] ret
- *
- * @see elm_calendar_select_mode_get
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_select_mode_get(ret) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_SELECT_MODE_GET), EO_TYPECHECK(Elm_Calendar_Select_Mode *, ret)
-
-/**
- * @def elm_obj_calendar_selectable_set
- * @since 1.8
- *
- * Define which fields of a tm struct will be taken into account, when
- * elm_calendar_selected_time_set() is invoked.
- *
- * @param[in] selectable
- *
- * @see elm_calendar_selectable_set
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_selectable_set(selectable) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_SELECTABLE_SET), EO_TYPECHECK(Elm_Calendar_Selectable, selectable)
-
-/**
- * @def elm_obj_calendar_selectable_get
- * @since 1.8
- *
- * Get how elm_calendar_selected_time_set manage a date
- *
- * @param[out] ret
- *
- * @see elm_calendar_selectable_get
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_selectable_get(ret) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_SELECTABLE_GET), EO_TYPECHECK(Elm_Calendar_Selectable *, ret)
-
-/**
- * @def elm_obj_calendar_displayed_time_get
- * @since 1.8
- *
- * Get the current time displayed in the widget
- *
- * @param[in,out] displayed_time
- * @param[out] ret
- *
- * @see elm_calendar_displayed_time_get
- *
- * @ingroup Calendar
- */
-#define elm_obj_calendar_displayed_time_get(displayed_time, ret) ELM_OBJ_CALENDAR_ID(ELM_OBJ_CALENDAR_SUB_ID_DISPLAYED_TIME_GET), EO_TYPECHECK(struct tm *, displayed_time), EO_TYPECHECK(Eina_Bool *, ret)
-#endif
+#include "elm_calendar.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_calendar_legacy.h b/src/lib/elm_calendar_legacy.h
index 1dad047b6..26a1669ff 100644
--- a/src/lib/elm_calendar_legacy.h
+++ b/src/lib/elm_calendar_legacy.h
@@ -13,364 +13,4 @@
  */
 EAPI Evas_Object         *elm_calendar_add(Evas_Object *parent);
 
-/**
- * Get weekdays names displayed by the calendar.
- *
- * @param obj The calendar object.
- * @return Array of seven strings to be used as weekday names.
- *
- * By default, weekdays abbreviations get from system are displayed:
- * E.g. for an en_US locale: "Sun, Mon, Tue, Wed, Thu, Fri, Sat"
- * The first string is related to Sunday, the second to Monday...
- *
- * @see elm_calendar_weekdays_name_set()
- *
- * @ref calendar_example_05
- *
- * @ingroup Calendar
- */
-EAPI const char         **elm_calendar_weekdays_names_get(const Evas_Object *obj);
-
-/**
- * Set the interval on time updates for an user mouse button hold
- * on calendar widgets' month/year selection.
- *
- * @param obj The calendar object
- * @param interval The (first) interval value in seconds
- *
- * This interval value is @b decreased while the user holds the
- * mouse pointer either selecting next or previous month/year.
- *
- * This helps the user to get to a given month distant from the
- * current one easier/faster, as it will start to change quicker and
- * quicker on mouse button holds.
- *
- * The calculation for the next change interval value, starting from
- * the one set with this call, is the previous interval divided by
- * 1.05, so it decreases a little bit.
- *
- * The default starting interval value for automatic changes is
- * @b 0.85 seconds.
- *
- * @see elm_calendar_interval_get()
- *
- * @ingroup Calendar
- */
-EAPI void                 elm_calendar_interval_set(Evas_Object *obj, double interval);
-
-/**
- * Get the interval on time updates for an user mouse button hold
- * on calendar widgets' month/year selection.
- *
- * @param obj The calendar object
- * @return The (first) interval value, in seconds, set on it
- *
- * @see elm_calendar_interval_set() for more details
- *
- * @ingroup Calendar
- */
-EAPI double               elm_calendar_interval_get(const Evas_Object *obj);
-
-/**
- * Set the minimum and maximum values for the year
- *
- * @param obj The calendar object
- * @param min The minimum year, greater than 1901;
- * @param max The maximum year;
- *
- * Maximum must be greater than minimum, except if you don't want to set
- * maximum year.
- * Default values are 1902 and -1.
- *
- * If the maximum year is a negative value, it will be limited depending
- * on the platform architecture (year 2037 for 32 bits);
- *
- * @see elm_calendar_min_max_year_get()
- *
- * @ref calendar_example_03
- *
- * @ingroup Calendar
- */
-EAPI void                 elm_calendar_min_max_year_set(Evas_Object *obj, int min, int max);
-
-/**
- * Get the minimum and maximum values for the year
- *
- * @param obj The calendar object.
- * @param min The minimum year.
- * @param max The maximum year.
- *
- * Default values are 1902 and -1.
- *
- * @see elm_calendar_min_max_year_set() for more details.
- *
- * @ref calendar_example_05
- *
- * @ingroup Calendar
- */
-EAPI void                 elm_calendar_min_max_year_get(const Evas_Object *obj, int *min, int *max);
-
-/**
- * Set selected date to be highlighted on calendar.
- *
- * @param obj The calendar object.
- * @param selected_time A @b tm struct to represent the selected date.
- *
- * Set the selected date, changing the displayed month if needed.
- * Selected date changes when the user goes to next/previous month or
- * select a day pressing over it on calendar.
- *
- * @see elm_calendar_selected_time_get()
- *
- * @ref calendar_example_04
- *
- * @ingroup Calendar
- */
-EAPI void                 elm_calendar_selected_time_set(Evas_Object *obj, struct tm *selected_time);
-
-/**
- * Get selected date.
- *
- * @param obj The calendar object
- * @param selected_time A @b tm struct to point to selected date
- * @return EINA_FALSE means an error occurred and returned time shouldn't
- * be considered.
- *
- * Get date selected by the user or set by function
- * elm_calendar_selected_time_set().
- * Selected date changes when the user goes to next/previous month or
- * select a day pressing over it on calendar.
- *
- * @see elm_calendar_selected_time_get()
- *
- * @ref calendar_example_05
- *
- * @ingroup Calendar
- */
-EAPI Eina_Bool            elm_calendar_selected_time_get(const Evas_Object *obj, struct tm *selected_time);
-
-/**
- * Set a function to format the string that will be used to display
- * month and year;
- *
- * @param obj The calendar object
- * @param format_func Function to set the month-year string given
- * the selected date
- *
- * By default it uses strftime with "%B %Y" format string.
- * It should allocate the memory that will be used by the string,
- * that will be freed by the widget after usage.
- * A pointer to the string and a pointer to the time struct will be provided.
- *
- * Example:
- * @code
- * static char *
- * _format_month_year(struct tm *selected_time)
- * {
- *    char buf[32];
- *    if (!strftime(buf, sizeof(buf), "%B %Y", selected_time)) return NULL;
- *    return strdup(buf);
- * }
- *
- * elm_calendar_format_function_set(calendar, _format_month_year);
- * @endcode
- *
- * @ref calendar_example_02
- *
- * @ingroup Calendar
- */
-EAPI void                 elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_func);
-
-/**
- * Add a new mark to the calendar
- *
- * @param obj The calendar object
- * @param mark_type A string used to define the type of mark. It will be
- * emitted to the theme, that should display a related modification on these
- * days representation.
- * @param mark_time A time struct to represent the date of inclusion of the
- * mark. For marks that repeats it will just be displayed after the inclusion
- * date in the calendar.
- * @param repeat Repeat the event following this periodicity. Can be a unique
- * mark (that don't repeat), daily, weekly, monthly or annually.
- * @return The created mark or @p NULL upon failure.
- *
- * Add a mark that will be drawn in the calendar respecting the insertion
- * time and periodicity. It will emit the type as signal to the widget theme.
- * Default theme supports "holiday" and "checked", but it can be extended.
- *
- * It won't immediately update the calendar, drawing the marks.
- * For this, call elm_calendar_marks_draw(). However, when user selects
- * next or previous month calendar forces marks drawn.
- *
- * Marks created with this method can be deleted with
- * elm_calendar_mark_del().
- *
- * Example
- * @code
- * struct tm selected_time;
- * time_t current_time;
- *
- * current_time = time(NULL) + 5 * (24 * 60 * 60);
- * localtime_r(&current_time, &selected_time);
- * elm_calendar_mark_add(cal, "holiday", selected_time,
- *     ELM_CALENDAR_ANNUALLY);
- *
- * current_time = time(NULL) + 1 * (24 * 60 * 60);
- * localtime_r(&current_time, &selected_time);
- * elm_calendar_mark_add(cal, "checked", selected_time, ELM_CALENDAR_UNIQUE);
- *
- * elm_calendar_marks_draw(cal);
- * @endcode
- *
- * @see elm_calendar_marks_draw()
- * @see elm_calendar_mark_del()
- *
- * @ref calendar_example_06
- *
- * @ingroup Calendar
- */
-EAPI Elm_Calendar_Mark   *elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat_Type repeat);
-
-/**
- * Remove all calendar's marks
- *
- * @param obj The calendar object.
- *
- * @see elm_calendar_mark_add()
- * @see elm_calendar_mark_del()
- *
- * @ingroup Calendar
- */
-EAPI void                 elm_calendar_marks_clear(Evas_Object *obj);
-
-/**
- * Get a list of all the calendar marks.
- *
- * @param obj The calendar object.
- * @return An @c Eina_List of calendar marks objects, or @c NULL on failure.
- *
- * @see elm_calendar_mark_add()
- * @see elm_calendar_mark_del()
- * @see elm_calendar_marks_clear()
- *
- * @ingroup Calendar
- */
-EAPI const Eina_List     *elm_calendar_marks_get(const Evas_Object *obj);
-
-/**
- * Draw calendar marks.
- *
- * @param obj The calendar object.
- *
- * Should be used after adding, removing or clearing marks.
- * It will go through the entire marks list updating the calendar.
- * If lots of marks will be added, add all the marks and then call
- * this function.
- *
- * When the month is changed, i.e. user selects next or previous month,
- * marks will be drawn.
- *
- * @see elm_calendar_mark_add()
- * @see elm_calendar_mark_del()
- * @see elm_calendar_marks_clear()
- *
- * @ref calendar_example_06
- *
- * @ingroup Calendar
- */
-EAPI void                 elm_calendar_marks_draw(Evas_Object *obj);
-
-/**
- * Set the first day of week to use on calendar widgets'.
- *
- * @param obj The calendar object
- * @param day An int which correspond to the first day of the week (Sunday = 0, Monday = 1,
- * ..., Saturday = 6)
- *
- * @ingroup Calendar
- */
-EAPI void                 elm_calendar_first_day_of_week_set(Evas_Object *obj, Elm_Calendar_Weekday day);
-
-/**
- * Get the first day of week, who are used on calendar widgets'.
- *
- * @param obj The calendar object
- * @return An int which correspond to the first day of the week (Sunday = 0, Monday = 1,
- * ..., Saturday = 6)
- *
- * @see elm_calendar_first_day_of_week_set() for more details
- *
- * @ingroup Calendar
- */
-EAPI Elm_Calendar_Weekday elm_calendar_first_day_of_week_get(const Evas_Object *obj);
-
-/**
- * Set select day mode to use.
- *
- * @param obj The calendar object.
- * @param mode The select mode to use.
- *
- * Set the day selection mode used.
- *
- * @ingroup Calendar
- */
-EAPI void                 elm_calendar_select_mode_set(Evas_Object *obj, Elm_Calendar_Select_Mode mode);
-
-/**
- * Get the select day mode used.
- *
- * @param obj The calendar object.
- *
- * @return the selected mode
- *
- * Get the day selection mode used.
- *
- * @see elm_calendar_select_mode_set() for more details
- *
- * @ingroup Calendar
- */
-EAPI Elm_Calendar_Select_Mode elm_calendar_select_mode_get(const Evas_Object *obj);
-
-/**
- * Define which fields of a @b tm struct will be taken into account, when
- * elm_calendar_selected_time_set() is invoked.
- *
- * @param obj The calendar object
- * @param selectable A bitmask of Elm_Calendar_Selectable
- *
- * By Default the bitmask is set to use all fields of a @b tm struct (year,
- * month and day of the month).
- *
- * @ingroup Calendar
- * @see elm_calendar_selected_time_set
- * @since 1.8
- */
-EAPI void                 elm_calendar_selectable_set(Evas_Object *obj, Elm_Calendar_Selectable selectable);
-
-
-/**
- * Get how elm_calendar_selected_time_set manage a date
- *
- * @param obj The calendar object
- * @return The flag used to manage a date with a elm_calendar_selected_time_set
- *
- * @ingroup Calendar
- * @see elm_calendar_selectable_set
- * @see elm_calendar_selected_time_set
- * @since 1.8
- */
-EAPI Elm_Calendar_Selectable elm_calendar_selectable_get(const Evas_Object *obj);
-
-/**
- * Get the current time displayed in the widget
- *
- * @param obj The calendar object
- * @param selected_time A @b tm struct to point to displayed date
- * @return EINA_FALSE means an error occurred. If it's an error the returned
- * time is zero filled.
- *
- * @ingroup Calendar
- * @since 1.8
- */
-EAPI Eina_Bool                    elm_calendar_displayed_time_get(const Evas_Object *obj, struct tm *displayed_time);
+#include "elm_calendar.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_check_eo.h b/src/lib/elm_check_eo.h
index 39987d06c..970ee4242 100644
--- a/src/lib/elm_check_eo.h
+++ b/src/lib/elm_check_eo.h
@@ -1,61 +1 @@
-#include "elm_check.eo.h"
-#if 0
-#define ELM_OBJ_CHECK_CLASS elm_obj_check_class_get()
-
-const Eo_Class *elm_obj_check_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_CHECK_BASE_ID;
-
-enum
-{
-      ELM_OBJ_CHECK_SUB_ID_STATE_SET,
-      ELM_OBJ_CHECK_SUB_ID_STATE_GET,
-      ELM_OBJ_CHECK_SUB_ID_STATE_POINTER_SET,
-      ELM_OBJ_CHECK_SUB_ID_LAST
-};
-
-#define ELM_OBJ_CHECK_ID(sub_id) (ELM_OBJ_CHECK_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_check_state_set
- * @since 1.8
- *
- * @brief Set the on/off state of the check object
- *
- * @param[in] state
- *
- * @see elm_check_state_set
- *
- * @ingroup Check
- */
-#define elm_obj_check_state_set(state) ELM_OBJ_CHECK_ID(ELM_OBJ_CHECK_SUB_ID_STATE_SET), EO_TYPECHECK(Eina_Bool, state)
-
-/**
- * @def elm_obj_check_state_get
- * @since 1.8
- *
- * @brief Get the state of the check object
- *
- * @param[out] ret
- *
- * @see elm_check_state_get
- *
- * @ingroup Check
- */
-#define elm_obj_check_state_get(ret) ELM_OBJ_CHECK_ID(ELM_OBJ_CHECK_SUB_ID_STATE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_check_state_pointer_set
- * @since 1.8
- *
- * @brief Set a convenience pointer to a boolean to change
- *
- * @param[in] statep
- *
- * @see elm_check_state_pointer_set
- *
- * @ingroup Check
- */
-#define elm_obj_check_state_pointer_set(statep) ELM_OBJ_CHECK_ID(ELM_OBJ_CHECK_SUB_ID_STATE_POINTER_SET), EO_TYPECHECK(Eina_Bool *, statep)
-#endif
+#include "elm_check.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_check_legacy.h b/src/lib/elm_check_legacy.h
index 6abbc9b2e..742881d98 100644
--- a/src/lib/elm_check_legacy.h
+++ b/src/lib/elm_check_legacy.h
@@ -8,43 +8,4 @@
  */
 EAPI Evas_Object *                elm_check_add(Evas_Object *parent);
 
-/**
- * @brief Set the on/off state of the check object
- *
- * @param obj The check object
- * @param state The state to use (1 == on, 0 == off)
- *
- * This sets the state of the check. If set with elm_check_state_pointer_set()
- * the state of that variable is also changed. Calling this @b doesn't cause
- * the "changed" signal to be emitted.
- *
- * @ingroup Check
- */
-EAPI void                         elm_check_state_set(Evas_Object *obj, Eina_Bool state);
-
-/**
- * @brief Get the state of the check object
- *
- * @param obj The check object
- * @return The boolean state
- *
- * @ingroup Check
- */
-EAPI Eina_Bool                    elm_check_state_get(const Evas_Object *obj);
-
-/**
- * @brief Set a convenience pointer to a boolean to change
- *
- * @param obj The check object
- * @param statep Pointer to the boolean to modify
- *
- * This sets a pointer to a boolean, that, in addition to the check objects
- * state will also be modified directly. To stop setting the object pointed
- * to simply use NULL as the @p statep parameter. If @p statep is not NULL,
- * then when this is called, the check objects state will also be modified to
- * reflect the value of the boolean @p statep points to, just like calling
- * elm_check_state_set().
- *
- * @ingroup Check
- */
-EAPI void                         elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep);
+#include "elm_check.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_clock_eo.h b/src/lib/elm_clock_eo.h
index 9b5de2ff1..2af6c1bf6 100644
--- a/src/lib/elm_clock_eo.h
+++ b/src/lib/elm_clock_eo.h
@@ -1,237 +1 @@
-#include "elm_clock.eo.h"
-
-#if 0
-#define ELM_OBJ_CLOCK_CLASS elm_obj_clock_class_get()
-
-const Eo_Class *elm_obj_clock_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_CLOCK_BASE_ID;
-
-enum
-{
-   ELM_OBJ_CLOCK_SUB_ID_TIME_SET,
-   ELM_OBJ_CLOCK_SUB_ID_TIME_GET,
-   ELM_OBJ_CLOCK_SUB_ID_EDIT_SET,
-   ELM_OBJ_CLOCK_SUB_ID_EDIT_GET,
-   ELM_OBJ_CLOCK_SUB_ID_EDIT_MODE_SET,
-   ELM_OBJ_CLOCK_SUB_ID_EDIT_MODE_GET,
-   ELM_OBJ_CLOCK_SUB_ID_SHOW_AM_PM_SET,
-   ELM_OBJ_CLOCK_SUB_ID_SHOW_AM_PM_GET,
-   ELM_OBJ_CLOCK_SUB_ID_SHOW_SECONDS_SET,
-   ELM_OBJ_CLOCK_SUB_ID_SHOW_SECONDS_GET,
-   ELM_OBJ_CLOCK_SUB_ID_FIRST_INTERVAL_SET,
-   ELM_OBJ_CLOCK_SUB_ID_FIRST_INTERVAL_GET,
-   ELM_OBJ_CLOCK_SUB_ID_PAUSE_SET,
-   ELM_OBJ_CLOCK_SUB_ID_PAUSE_GET,
-   ELM_OBJ_CLOCK_SUB_ID_LAST,
-};
-
-#define ELM_OBJ_CLOCK_ID(sub_id) (ELM_OBJ_CLOCK_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_clock_time_set
- * @since 1.8
- *
- * Set a clock widget's time, programmatically
- *
- * @param[in] hrs
- * @param[in] min
- * @param[in] sec
- *
- * @see elm_clock_time_set
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_time_set(hrs, min, sec) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_TIME_SET), EO_TYPECHECK(int, hrs), EO_TYPECHECK(int, min), EO_TYPECHECK(int, sec)
-
-/**
- * @def elm_obj_clock_time_get
- * @since 1.8
- *
- * Get a clock widget's time values
- *
- * @param[out] hrs
- * @param[out] min
- * @param[out] sec
- *
- * @see elm_clock_time_get
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_time_get(hrs, min, sec) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_TIME_GET), EO_TYPECHECK(int *, hrs), EO_TYPECHECK(int *, min), EO_TYPECHECK(int *, sec)
-
-/**
- * @def elm_obj_clock_edit_set
- * @since 1.8
- *
- * Set whether a given clock widget is under <b>edition mode</b> or
- * under (default) displaying-only mode.
- *
- * @param[in] edit
- *
- * @see elm_clock_edit_set
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_edit_set(edit) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_EDIT_SET), EO_TYPECHECK(Eina_Bool, edit)
-
-/**
- * @def elm_obj_clock_edit_get
- * @since 1.8
- *
- * Retrieve whether a given clock widget is under editing mode
- * under (default) displaying-only mode.
- *
- * @param[out] ret
- *
- * @see elm_clock_edit_get
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_edit_get(ret) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_EDIT_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_clock_edit_mode_set
- * @since 1.8
- *
- * Set what digits of the given clock widget should be editable
- *
- * @param[in] digedit
- *
- * @see elm_clock_edit_mode_set
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_edit_mode_set(digedit) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_EDIT_MODE_SET), EO_TYPECHECK(Elm_Clock_Edit_Mode, digedit)
-
-/**
- * @def elm_obj_clock_edit_mode_get
- * @since 1.8
- *
- * Retrieve what digits of the given clock widget should be
- * editable when in edition mode.
- *
- * @param[out] ret
- *
- * @see elm_clock_edit_mode_get
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_edit_mode_get(ret) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_EDIT_MODE_GET), EO_TYPECHECK(Elm_Clock_Edit_Mode *, ret)
-
-/**
- * @def elm_obj_clock_show_am_pm_set
- * @since 1.8
- *
- * Set if the given clock widget must show hours in military or
- * am/pm mode
- *
- * @param[in] am_pm
- *
- * @see elm_clock_show_am_pm_set
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_show_am_pm_set(am_pm) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_SHOW_AM_PM_SET), EO_TYPECHECK(Eina_Bool, am_pm)
-
-/**
- * @def elm_obj_clock_show_am_pm_get
- * @since 1.8
- *
- * Get if the given clock widget shows hours in military or am/pm
- * mode
- *
- * @param[out] ret
- *
- * @see elm_clock_show_am_pm_get
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_show_am_pm_get(ret) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_SHOW_AM_PM_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_clock_show_seconds_set
- * @since 1.8
- *
- * Set if the given clock widget must show time with seconds or not
- *
- * @param[in] seconds
- *
- * @see elm_clock_show_seconds_set
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_show_seconds_set(seconds) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_SHOW_SECONDS_SET), EO_TYPECHECK(Eina_Bool, seconds)
-
-/**
- * @def elm_obj_clock_show_seconds_get
- * @since 1.8
- *
- * Get whether the given clock widget is showing time with seconds
- *
- * @param[out] ret
- *
- * @see elm_clock_show_seconds_get
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_show_seconds_get(ret) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_SHOW_SECONDS_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_clock_first_interval_set
- * @since 1.8
- *
- * Set the first interval on time updates for a user mouse button hold
- *
- * @param[in] interval
- *
- * @see elm_clock_first_interval_set
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_first_interval_set(interval) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_FIRST_INTERVAL_SET), EO_TYPECHECK(double, interval)
-
-/**
- * @def elm_obj_clock_first_interval_get
- * @since 1.8
- *
- * Get the first interval on time updates for a user mouse button hold
- *
- * @param[out] ret
- *
- * @see elm_clock_first_interval_get
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_first_interval_get(ret) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_FIRST_INTERVAL_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_clock_pause_set
- * @since 1.9
- *
- * Set whether the given clock widget should be paused or not.
- *
- * @param[in] pause
- *
- * @see elm_clock_pause_set
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_pause_set(pause) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_PAUSE_SET), EO_TYPECHECK(Eina_Bool, pause)
-
-/**
- * @def elm_obj_clock_pause_get
- * @since 1.9
- *
- * Get whether the given clock widget is paused.
- *
- * @param[out] ret
- *
- * @see elm_clock_pause_get
- *
- * @ingroup Clock
- */
-#define elm_obj_clock_pause_get(ret) ELM_OBJ_CLOCK_ID(ELM_OBJ_CLOCK_SUB_ID_PAUSE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-#endif
-
+#include "elm_clock.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_clock_legacy.h b/src/lib/elm_clock_legacy.h
index 5e310c825..914ecbdb9 100644
--- a/src/lib/elm_clock_legacy.h
+++ b/src/lib/elm_clock_legacy.h
@@ -11,250 +11,4 @@
  */
 EAPI Evas_Object      *elm_clock_add(Evas_Object *parent);
 
-/**
- * Set a clock widget's time, programmatically
- *
- * @param obj The clock widget object
- * @param hrs The hours to set
- * @param min The minutes to set
- * @param sec The seconds to set
- *
- * This function updates the time that is showed by the clock
- * widget.
- *
- *  Values @b must be set within the following ranges:
- * - 0 - 23, for hours
- * - 0 - 59, for minutes
- * - 0 - 59, for seconds,
- *
- * even if the clock is not in "military" mode.
- *
- * @warning The behavior for values set out of those ranges is @b
- * undefined.
- *
- * @ingroup Clock
- */
-EAPI void              elm_clock_time_set(Evas_Object *obj, int hrs, int min, int sec);
-
-/**
- * Get a clock widget's time values
- *
- * @param obj The clock object
- * @param[out] hrs Pointer to the variable to get the hours value
- * @param[out] min Pointer to the variable to get the minutes value
- * @param[out] sec Pointer to the variable to get the seconds value
- *
- * This function gets the time set for @p obj, returning
- * it on the variables passed as the arguments to function
- *
- * @note Use @c NULL pointers on the time values you're not
- * interested in: they'll be ignored by the function.
- *
- * @ingroup Clock
- */
-EAPI void              elm_clock_time_get(const Evas_Object *obj, int *hrs, int *min, int *sec);
-
-/**
- * Set whether a given clock widget is under <b>edition mode</b> or
- * under (default) displaying-only mode.
- *
- * @param obj The clock object
- * @param edit @c EINA_TRUE to put it in edition, @c EINA_FALSE to
- * put it back to "displaying only" mode
- *
- * This function makes a clock's time to be editable or not <b>by
- * user interaction</b>. When in edition mode, clocks @b stop
- * ticking, until one brings them back to canonical mode. The
- * elm_clock_edit_mode_set() function will influence which digits
- * of the clock will be editable.
- *
- * @note am/pm sheets, if being shown, will @b always be editable
- * under edition mode.
- *
- * @see elm_clock_edit_get()
- *
- * @ingroup Clock
- */
-EAPI void              elm_clock_edit_set(Evas_Object *obj, Eina_Bool edit);
-
-/**
- * Retrieve whether a given clock widget is under editing mode
- * or under (default) displaying-only mode.
- *
- * @param obj The clock object
- * @return @c EINA_TRUE, if it's in edition mode, @c EINA_FALSE otherwise
- *
- * This function retrieves whether the clock's time can be edited
- * or not by user interaction.
- *
- * @see elm_clock_edit_set() for more details
- *
- * @ingroup Clock
- */
-EAPI Eina_Bool         elm_clock_edit_get(const Evas_Object *obj);
-
-/**
- * Set what digits of the given clock widget should be editable
- * when in edition mode.
- *
- * @param obj The clock object
- * @param digedit Bit mask indicating the digits to be editable
- * (values in #Elm_Clock_Edit_Mode).
- *
- * @see elm_clock_edit_mode_get()
- *
- * @ingroup Clock
- */
-EAPI void              elm_clock_edit_mode_set(Evas_Object *obj, Elm_Clock_Edit_Mode digedit);
-
-/**
- * Retrieve what digits of the given clock widget should be
- * editable when in edition mode.
- *
- * @param obj The clock object
- * @return Bit mask indicating the digits to be editable
- * (values in #Elm_Clock_Edit_Mode).
- *
- * @see elm_clock_edit_mode_set() for more details
- *
- * @ingroup Clock
- */
-EAPI Elm_Clock_Edit_Mode elm_clock_edit_mode_get(const Evas_Object *obj);
-
-/**
- * Set if the given clock widget must show hours in military or
- * am/pm mode
- *
- * @param obj The clock object
- * @param am_pm @c EINA_TRUE to put it in am/pm mode, @c EINA_FALSE
- * to military mode
- *
- * This function sets if the clock must show hours in military or
- * am/pm mode. In some countries like Brazil the military mode
- * (00-24h-format) is used, in opposition to the USA, where the
- * am/pm mode is more commonly used.
- *
- * @see elm_clock_show_am_pm_get()
- *
- * @ingroup Clock
- */
-EAPI void              elm_clock_show_am_pm_set(Evas_Object *obj, Eina_Bool am_pm);
-
-/**
- * Get if the given clock widget shows hours in military or am/pm
- * mode
- *
- * @param obj The clock object
- * @return @c EINA_TRUE, if in am/pm mode, @c EINA_FALSE if in
- * military
- *
- * This function gets if the clock shows hours in military or am/pm
- * mode.
- *
- * @see elm_clock_show_am_pm_set() for more details
- *
- * @ingroup Clock
- */
-EAPI Eina_Bool         elm_clock_show_am_pm_get(const Evas_Object *obj);
-
-/**
- * Set if the given clock widget must show time with seconds or not
- *
- * @param obj The clock object
- * @param seconds @c EINA_TRUE to show seconds, @c EINA_FALSE otherwise
- *
- * This function sets if the given clock must show or not elapsed
- * seconds. By default, they are @b not shown.
- *
- * @see elm_clock_show_seconds_get()
- *
- * @ingroup Clock
- */
-EAPI void              elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool seconds);
-
-/**
- * Get whether the given clock widget is showing time with seconds
- * or not
- *
- * @param obj The clock object
- * @return @c EINA_TRUE if it's showing seconds, @c EINA_FALSE otherwise
- *
- * This function gets whether @p obj is showing or not the elapsed
- * seconds.
- *
- * @see elm_clock_show_seconds_set()
- *
- * @ingroup Clock
- */
-EAPI Eina_Bool         elm_clock_show_seconds_get(const Evas_Object *obj);
-
-/**
- * Set the first interval on time updates for a user mouse button hold
- * on clock widgets' time edition.
- *
- * @param obj The clock object
- * @param interval The first interval value in seconds
- *
- * This interval value is @b decreased while the user holds the
- * mouse pointer either incrementing or decrementing a given the
- * clock digit's value.
- *
- * This helps the user to get to a given time distant from the
- * current one easier/faster, as it will start to flip quicker and
- * quicker on mouse button holds.
- *
- * The calculation for the next flip interval value, starting from
- * the one set with this call, is the previous interval divided by
- * 1.05, so it decreases a little bit.
- *
- * The default starting interval value for automatic flips is
- * @b 0.85 seconds.
- *
- * @see elm_clock_first_interval_get()
- *
- * @ingroup Clock
- */
-EAPI void              elm_clock_first_interval_set(Evas_Object *obj, double interval);
-
-/**
- * Get the first interval on time updates for a user mouse button hold
- * on clock widgets' time edition.
- *
- * @param obj The clock object
- * @return The first interval value, in seconds, set on it
- *
- * @see elm_clock_first_interval_set() for more details
- *
- * @ingroup Clock
- */
-EAPI double            elm_clock_first_interval_get(const Evas_Object *obj);
-
-/**
- * Set whether the given clock widget should be paused or not.
- *
- * @param obj The clock object
- * @param pause @c EINA_TRUE to pause clock, @c EINA_FALSE otherwise
- *
- * This function pauses or starts the clock widget.
- *
- * @see elm_clock_pause_get()
- *
- * @ingroup Clock
- * @since 1.9
- */
-EAPI void              elm_clock_pause_set(Evas_Object *obj, Eina_Bool pause);
-
-/**
- * Get whether the given clock widget is paused.
- *
- * @param obj The clock object
- * @return @c EINA_TRUE if it's paused @c EINA_FALSE otherwise
- *
- * This function gets whether the clock is paused or not.
- *
- * @see elm_clock_pause_set()
- *
- * @ingroup Clock
- * @since 1.9
- */
-EAPI Eina_Bool         elm_clock_pause_get(const Evas_Object *obj);
+#include "elm_clock.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_colorselector_eo.h b/src/lib/elm_colorselector_eo.h
index 844d4862a..0a120da4d 100644
--- a/src/lib/elm_colorselector_eo.h
+++ b/src/lib/elm_colorselector_eo.h
@@ -1,171 +1 @@
-#include "elm_colorselector.eo.h"
-#if 0
-#define ELM_OBJ_COLORSELECTOR_CLASS elm_obj_colorselector_class_get()
-
-const Eo_Class *elm_obj_colorselector_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_COLORSELECTOR_BASE_ID;
-
-enum
-{
-   ELM_OBJ_COLORSELECTOR_SUB_ID_COLOR_SET,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_COLOR_GET,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_MODE_SET,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_MODE_GET,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_COLOR_ADD,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_CLEAR,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_SELECTED_ITEM_GET,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_ITEMS_GET,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_NAME_SET,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_NAME_GET,
-   ELM_OBJ_COLORSELECTOR_SUB_ID_LAST
-};
-
-#define ELM_OBJ_COLORSELECTOR_ID(sub_id) (ELM_OBJ_COLORSELECTOR_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_colorselector_color_set
- * @since 1.8
- *
- * Set color to colorselector
- *
- * @param[in] r
- * @param[in] g
- * @param[in] b
- * @param[in] a
- *
- * @see elm_colorselector_color_set
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_color_set(r, g, b, a) ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_COLOR_SET), EO_TYPECHECK(int, r), EO_TYPECHECK(int, g), EO_TYPECHECK(int, b), EO_TYPECHECK(int, a)
-
-/**
- * @def elm_obj_colorselector_color_get
- * @since 1.8
- *
- * Get current color from colorselector
- *
- * @param[out] r
- * @param[out] g
- * @param[out] b
- * @param[out] a
- *
- * @see elm_colorselector_color_get
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_color_get(r, g, b, a) ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_COLOR_GET), EO_TYPECHECK(int *, r), EO_TYPECHECK(int *, g), EO_TYPECHECK(int *, b), EO_TYPECHECK(int *, a)
-
-/**
- * @def elm_obj_colorselector_mode_set
- * @since 1.8
- *
- * Set Colorselector's mode.
- *
- * @param[in] mode
- *
- * @see elm_colorselector_mode_set
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_mode_set(mode) ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_MODE_SET), EO_TYPECHECK(Elm_Colorselector_Mode, mode)
-
-/**
- * @def elm_obj_colorselector_mode_get
- * @since 1.8
- *
- * Get Colorselector's mode.
- *
- * @param[out] ret
- *
- * @see elm_colorselector_mode_get
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_mode_get(ret) ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_MODE_GET), EO_TYPECHECK(Elm_Colorselector_Mode *, ret)
-
-/**
- * @def elm_obj_colorselector_palette_color_add
- * @since 1.8
- *
- * Add a new color item to palette.
- *
- * @param[in] r
- * @param[in] g
- * @param[in] b
- * @param[in] a
- * @param[out] ret
- *
- * @see elm_colorselector_palette_color_add
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_palette_color_add(r, g, b, a, ret) ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_COLOR_ADD), EO_TYPECHECK(int, r), EO_TYPECHECK(int, g), EO_TYPECHECK(int, b), EO_TYPECHECK(int, a), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_colorselector_palette_clear
- * @since 1.8
- *
- * Clear the palette items.
- *
- *
- * @see elm_colorselector_palette_clear
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_palette_clear() ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_CLEAR)
-
-/**
- * @def elm_obj_colorselector_palette_items_get
- * @since 1.9
- *
- * Get list of palette items.
- *
- * @param[out] ret
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_palette_items_get(ret) ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_ITEMS_GET), EO_TYPECHECK(const Eina_List **, ret)
-
-/**
- * @def elm_obj_colorselector_palette_selected_item_get
- * @since 1.9
- *
- * Get current selected palette item
- *
- * @param[out] ret
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_palette_selected_item_get(ret) ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_SELECTED_ITEM_GET), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_colorselector_palette_name_set
- * @since 1.8
- *
- * Set current palette's name
- *
- * @param[in] palette_name
- *
- * @see elm_colorselector_palette_name_set
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_palette_name_set(palette_name) ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_NAME_SET), EO_TYPECHECK(const char *, palette_name)
-
-/**
- * @def elm_obj_colorselector_palette_name_get
- * @since 1.8
- *
- * Get current palette's name
- *
- * @param[out] ret
- *
- * @see elm_colorselector_palette_name_get
- *
- * @ingroup Colorselector
- */
-#define elm_obj_colorselector_palette_name_get(ret) ELM_OBJ_COLORSELECTOR_ID(ELM_OBJ_COLORSELECTOR_SUB_ID_PALETTE_NAME_GET), EO_TYPECHECK(const char **, ret)
-#endif
+#include "elm_colorselector.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_colorselector_legacy.h b/src/lib/elm_colorselector_legacy.h
index 7a7dd039c..90ae6f2ae 100644
--- a/src/lib/elm_colorselector_legacy.h
+++ b/src/lib/elm_colorselector_legacy.h
@@ -8,126 +8,4 @@
  */
 EAPI Evas_Object *elm_colorselector_add(Evas_Object *parent);
 
-/**
- * Set color to colorselector
- *
- * @param obj Colorselector object
- * @param r r-value of color
- * @param g g-value of color
- * @param b b-value of color
- * @param a a-value of color
- *
- * @ingroup Colorselector
- */
-EAPI void elm_colorselector_color_set(Evas_Object *obj, int r, int g, int b, int a);
-
-/**
- * Get current color from colorselector
- *
- * @param obj Colorselector object
- * @param r integer pointer for r-value of color
- * @param g integer pointer for g-value of color
- * @param b integer pointer for b-value of color
- * @param a integer pointer for a-value of color
- *
- * @ingroup Colorselector
- */
-EAPI void elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-
-/**
- * Set Colorselector's mode.
- *
- * @param obj Colorselector object
- * @param mode Elm_Colorselector_Mode
- *
- * Colorselector supports three modes palette only, selector only and both.
- *
- * @ingroup Colorselector
- */
-EAPI void elm_colorselector_mode_set(Evas_Object *obj, Elm_Colorselector_Mode mode);
-
-/**
- * Get Colorselector's mode.
- *
- * @param obj Colorselector object
- * @return mode The current mode of colorselector
- *
- * @ingroup Colorselector
- */
-EAPI Elm_Colorselector_Mode elm_colorselector_mode_get(const Evas_Object *obj);
-
-/**
- * Add a new color item to palette.
- *
- * @param obj The Colorselector object
- * @param r r-value of color
- * @param g g-value of color
- * @param b b-value of color
- * @param a a-value of color
- * @return A new color palette Item.
- *
- * @ingroup Colorselector
- */
-EAPI Elm_Object_Item *elm_colorselector_palette_color_add(Evas_Object *obj, int r, int g, int b, int a);
-
-/**
- * Clear the palette items.
- *
- * @param obj The Colorselector object
- *
- * @ingroup Colorselector
- */
-EAPI void elm_colorselector_palette_clear(Evas_Object *obj);
-
-/**
- * Get list of palette items.
- *
- * @param obj The Colorselector object
- * @return The list of color palette items.
- *
- * Note That palette item list is internally managed by colorselector widget and
- * it should not be freed/modified by application.
- *
- * @since 1.9
- *
- * @ingroup Colorselector
- */
-EAPI const Eina_List *elm_colorselector_palette_items_get(const Evas_Object *obj);
-
-/**
- * Get the selected item in colorselector palette.
- *
- * @param obj The Colorselector object
- * @return The selected item, or NULL if none is selected.
- *
- * @since 1.9
- * @ingroup Colorselector
- */
-EAPI Elm_Object_Item *elm_colorselector_palette_selected_item_get(const Evas_Object *obj);
-
-/**
- * Set current palette's name
- *
- * @param obj The Colorselector object
- * @param palette_name Name of palette
- *
- * When colorpalette name is set, colors will be loaded from and saved to config
- * using the set name. If no name is set then colors will be loaded from or
- * saved to "default" config.
- *
- * @ingroup Colorselector
- */
-EAPI void elm_colorselector_palette_name_set(Evas_Object *obj, const char *palette_name);
-
-/**
- * Get current palette's name
- *
- * @param obj The Colorselector object
- * @return Name of palette
- *
- * Returns the currently set palette name using which colors will be
- * saved/loaded in to config.
- *
- * @ingroup Colorselector
- */
-EAPI const char *elm_colorselector_palette_name_get(const Evas_Object *obj);
+#include "elm_colorselector.eo.legacy.h"