Eolian: Eo header clean and legacy integration.

  Elementary Slider
  Elementary SlideShow
  Elementary Spinner
  Elementary Systray
  Elementary Table
  Elementary Thumb
  Elementary Toolbar
  Elementary Video
  Elementary Web
  Elementary Win

22 files changed, 70 insertions, 8919 deletions

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 5476d5282..2350e3ba5 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -352,6 +352,7 @@ elm_separator.h \
 elm_separator_eo.h \
 elm_separator_legacy.h \
 elm_slider.h \
+elm_slider_common.h \
 elm_slider_eo.h \
 elm_slider_legacy.h \
 elm_slideshow.h \
@@ -741,24 +742,33 @@ BUILT_SOURCES = \
 		elm_separator.eo.legacy.h \
 		elm_slider.eo.c \
 		elm_slider.eo.h \
+		elm_slider.eo.legacy.h \
 		elm_slideshow.eo.c \
 		elm_slideshow.eo.h \
+		elm_slideshow.eo.legacy.h \
 		elm_spinner.eo.c \
 		elm_spinner.eo.h \
+		elm_spinner.eo.legacy.h \
 		elm_systray.eo.c \
 		elm_systray.eo.h \
 		elm_table.eo.c \
 		elm_table.eo.h \
+		elm_table.eo.legacy.h \
 		elm_thumb.eo.c \
 		elm_thumb.eo.h \
+		elm_thumb.eo.legacy.h \
 		elm_toolbar.eo.c \
 		elm_toolbar.eo.h \
+		elm_toolbar.eo.legacy.h \
 		elm_video.eo.c \
 		elm_video.eo.h \
+		elm_video.eo.legacy.h \
 		elm_web.eo.c \
 		elm_web.eo.h \
+		elm_web.eo.legacy.h \
 		elm_win.eo.c \
-		elm_win.eo.h
+		elm_win.eo.h \
+		elm_win.eo.legacy.h
 
 EXTRA_DIST += \
 	     elm_widget.eo \
@@ -990,4 +1000,13 @@ nodist_includesunstable_HEADERS = \
 		          elm_route.eo.legacy.h \
 		          elm_scroller.eo.legacy.h \
 		          elm_segment_control.eo.legacy.h \
-		          elm_separator.eo.legacy.h
+		          elm_separator.eo.legacy.h \
+                  elm_slider.eo.legacy.h \
+		          elm_slideshow.eo.legacy.h \
+		          elm_spinner.eo.legacy.h \
+		          elm_table.eo.legacy.h \
+		          elm_thumb.eo.legacy.h \
+		          elm_toolbar.eo.legacy.h \
+		          elm_video.eo.legacy.h \
+		          elm_web.eo.legacy.h \
+		          elm_win.eo.legacy.h
diff --git a/src/lib/elm_slider.h b/src/lib/elm_slider.h
index dd667a071..6a21cbda2 100644
--- a/src/lib/elm_slider.h
+++ b/src/lib/elm_slider.h
@@ -74,6 +74,7 @@
  * @{
  */
 
+#include "elm_slider_common.h"
 #ifdef EFL_EO_API_SUPPORT
 #include "elm_slider_eo.h"
 #endif
diff --git a/src/lib/elm_slider_common.h b/src/lib/elm_slider_common.h
new file mode 100644
index 000000000..92c9219a3
--- /dev/null
+++ b/src/lib/elm_slider_common.h
@@ -0,0 +1,3 @@
+typedef char *(*slider_func_type)(double);
+typedef void (*slider_freefunc_type)(char *);
+
diff --git a/src/lib/elm_slider_eo.h b/src/lib/elm_slider_eo.h
index b431fdc42..bb87e3dc2 100644
--- a/src/lib/elm_slider_eo.h
+++ b/src/lib/elm_slider_eo.h
@@ -1,363 +1 @@
-typedef char *(*slider_func_type)(double);
-typedef void (*slider_freefunc_type)(char *);
-
 #include "elm_slider.eo.h"
-
-#if 0
-#define ELM_OBJ_SLIDER_CLASS elm_obj_slider_class_get()
-
-const Eo_Class *elm_obj_slider_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_SLIDER_BASE_ID;
-
-enum
-{
-   ELM_OBJ_SLIDER_SUB_ID_SPAN_SIZE_SET,
-   ELM_OBJ_SLIDER_SUB_ID_SPAN_SIZE_GET,
-   ELM_OBJ_SLIDER_SUB_ID_UNIT_FORMAT_SET,
-   ELM_OBJ_SLIDER_SUB_ID_UNIT_FORMAT_GET,
-   ELM_OBJ_SLIDER_SUB_ID_INDICATOR_FORMAT_SET,
-   ELM_OBJ_SLIDER_SUB_ID_INDICATOR_FORMAT_GET,
-   ELM_OBJ_SLIDER_SUB_ID_HORIZONTAL_SET,
-   ELM_OBJ_SLIDER_SUB_ID_HORIZONTAL_GET,
-   ELM_OBJ_SLIDER_SUB_ID_MIN_MAX_SET,
-   ELM_OBJ_SLIDER_SUB_ID_MIN_MAX_GET,
-   ELM_OBJ_SLIDER_SUB_ID_VALUE_SET,
-   ELM_OBJ_SLIDER_SUB_ID_VALUE_GET,
-   ELM_OBJ_SLIDER_SUB_ID_INVERTED_SET,
-   ELM_OBJ_SLIDER_SUB_ID_INVERTED_GET,
-   ELM_OBJ_SLIDER_SUB_ID_INDICATOR_FORMAT_FUNCTION_SET,
-   ELM_OBJ_SLIDER_SUB_ID_UNITS_FORMAT_FUNCTION_SET,
-   ELM_OBJ_SLIDER_SUB_ID_INDICATOR_SHOW_SET,
-   ELM_OBJ_SLIDER_SUB_ID_INDICATOR_SHOW_GET,
-   ELM_OBJ_SLIDER_SUB_ID_STEP_SET,
-   ELM_OBJ_SLIDER_SUB_ID_STEP_GET,
-   ELM_OBJ_SLIDER_SUB_ID_INDICATOR_SHOW_ON_FOCUS_SET,
-   ELM_OBJ_SLIDER_SUB_ID_INDICATOR_SHOW_ON_FOCUS_GET,
-   ELM_OBJ_SLIDER_SUB_ID_LAST
-};
-
-#define ELM_OBJ_SLIDER_ID(sub_id) (ELM_OBJ_SLIDER_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_slider_span_size_set
- * @since 1.8
- *
- * Set the (exact) length of the bar region of a given slider widget.
- *
- * @param[in] size
- *
- * @see elm_slider_span_size_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_span_size_set(size) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_SPAN_SIZE_SET), EO_TYPECHECK(Evas_Coord, size)
-
-/**
- * @def elm_obj_slider_span_size_get
- * @since 1.8
- *
- * Get the length set for the bar region of a given slider widget
- *
- * @param[out] ret
- *
- * @see elm_slider_span_size_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_span_size_get(ret) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_SPAN_SIZE_GET), EO_TYPECHECK(Evas_Coord *, ret)
-
-/**
- * @def elm_obj_slider_unit_format_set
- * @since 1.8
- *
- * Set the format string for the unit label.
- *
- * @param[in] units
- *
- * @see elm_slider_unit_format_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_unit_format_set(units) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_UNIT_FORMAT_SET), EO_TYPECHECK(const char *, units)
-
-/**
- * @def elm_obj_slider_unit_format_get
- * @since 1.8
- *
- * Get the unit label format of the slider.
- *
- * @param[out] ret
- *
- * @see elm_slider_unit_format_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_unit_format_get(ret) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_UNIT_FORMAT_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_slider_indicator_format_set
- * @since 1.8
- *
- * Set the format string for the indicator label.
- *
- * @param[in] indicator
- *
- * @see elm_slider_indicator_format_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_indicator_format_set(indicator) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_INDICATOR_FORMAT_SET), EO_TYPECHECK(const char *, indicator)
-
-/**
- * @def elm_obj_slider_indicator_format_get
- * @since 1.8
- *
- * Get the indicator label format of the slider.
- *
- * @param[out] ret
- *
- * @see elm_slider_indicator_format_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_indicator_format_get(ret) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_INDICATOR_FORMAT_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_slider_horizontal_set
- * @since 1.8
- *
- * Set the orientation of a given slider widget.
- *
- * @param[in] horizontal
- *
- * @see elm_slider_horizontal_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_horizontal_set(horizontal) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_HORIZONTAL_SET), EO_TYPECHECK(Eina_Bool, horizontal)
-
-/**
- * @def elm_obj_slider_horizontal_get
- * @since 1.8
- *
- * Retrieve the orientation of a given slider widget
- *
- * @param[out] ret
- *
- * @see elm_slider_horizontal_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_horizontal_get(ret) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_HORIZONTAL_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_slider_min_max_set
- * @since 1.8
- *
- * Set the minimum and maximum values for the slider.
- *
- * @param[in] min
- * @param[in] max
- *
- * @see elm_slider_min_max_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_min_max_set(min, max) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_MIN_MAX_SET), EO_TYPECHECK(double, min), EO_TYPECHECK(double, max)
-
-/**
- * @def elm_obj_slider_min_max_get
- * @since 1.8
- *
- * Get the minimum and maximum values of the slider.
- *
- * @param[out] min
- * @param[out] max
- *
- * @see elm_slider_min_max_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_min_max_get(min, max) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_MIN_MAX_GET), EO_TYPECHECK(double *, min), EO_TYPECHECK(double *, max)
-
-/**
- * @def elm_obj_slider_value_set
- * @since 1.8
- *
- * Set the value the slider displays.
- *
- * @param[in] val
- *
- * @see elm_slider_value_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_value_set(val) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_VALUE_SET), EO_TYPECHECK(double, val)
-
-/**
- * @def elm_obj_slider_value_get
- * @since 1.8
- *
- * Get the value displayed by the slider.
- *
- * @param[out] ret
- *
- * @see elm_slider_value_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_value_get(ret) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_VALUE_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_slider_inverted_set
- * @since 1.8
- *
- * Invert a given slider widget's displaying values order
- *
- * @param[in] inverted
- *
- * @see elm_slider_inverted_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_inverted_set(inverted) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_INVERTED_SET), EO_TYPECHECK(Eina_Bool, inverted)
-
-/**
- * @def elm_obj_slider_inverted_get
- * @since 1.8
- *
- * Get whether a given slider widget's displaying values are
- * inverted or not.
- *
- * @param[out] ret
- *
- * @see elm_slider_inverted_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_inverted_get(ret) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_INVERTED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_slider_indicator_format_function_set
- * @since 1.8
- *
- * Set the format function pointer for the indicator label
- *
- * @param[in] func
- * @param[in] free_func
- *
- * @see elm_slider_indicator_format_function_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_indicator_format_function_set(func, free_func) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_INDICATOR_FORMAT_FUNCTION_SET), EO_TYPECHECK(slider_func_type, func), EO_TYPECHECK(slider_freefunc_type, free_func)
-
-/**
- * @def elm_obj_slider_units_format_function_set
- * @since 1.8
- *
- * Set the format function pointer for the units label
- *
- * @param[in] func
- * @param[in] free_func
- *
- * @see elm_slider_units_format_function_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_units_format_function_set(func, free_func) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_UNITS_FORMAT_FUNCTION_SET), EO_TYPECHECK(slider_func_type, func), EO_TYPECHECK(slider_freefunc_type, free_func)
-
-/**
- * @def elm_obj_slider_indicator_show_set
- * @since 1.9
- *
- * Set whether to enlarge slider indicator (augmented knob) or not.
- *
- * @param[in] show
- *
- * @see elm_slider_indicator_show_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_indicator_show_set(show) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_INDICATOR_SHOW_SET), EO_TYPECHECK(Eina_Bool, show)
-
-/**
- * @def elm_obj_slider_indicator_show_get
- * @since 1.8
- *
- * Get whether a given slider widget's enlarging indicator or not.
- *
- * @param[out] ret
- *
- * @see elm_slider_indicator_show_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_indicator_show_get(ret) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_INDICATOR_SHOW_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_slider_step_set
- * @since 1.8
- *
- * Set the step by which slider indicator will move.
- *
- * This value is used when draggable object is moved automatically i.e., in case
- * of key event when up/down/left/right key is pressed or in case when
- * accessibility is set and flick event is used to inc/dec slider values.
- * By default step value is equal to 0.05.
- *
- * @param[in] step
- *
- * @see elm_slider_step_set
- *
- * @ingroup Slider
- */
-
-#define elm_obj_slider_step_set(step) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_STEP_SET), EO_TYPECHECK(double, step)
-
-
-/**
- * @def elm_obj_slider_step_get
- * @since 1.8
- *
- * Get the step by which slider indicator moves.
- *
- * @param[out] ret
- *
- * @see elm_slider_step_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_step_get(ret) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_STEP_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_slider_indicator_show_on_focus_set
- * @since 1.9
- *
- * show indicator of slider on focus
- *
- * @param[in] flag
- *
- * @see elm_slider_indicator_show_on_focus_set
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_indicator_show_on_focus_set(flag) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_INDICATOR_SHOW_ON_FOCUS_SET), EO_TYPECHECK(Eina_Bool, flag)
-
-/**
- * @def elm_obj_slider_indicator_show_on_focus_get
- * @since 1.9
- *
- * Get whether the indicator of the slider is set or not
- *
- * @param[out] ret
- *
- * @see elm_slider_indicator_show_on_focus_get
- *
- * @ingroup Slider
- */
-#define elm_obj_slider_indicator_show_on_focus_get(ret) ELM_OBJ_SLIDER_ID(ELM_OBJ_SLIDER_SUB_ID_INDICATOR_SHOW_ON_FOCUS_GET), EO_TYPECHECK(Eina_Bool*, ret)
-
-#endif
diff --git a/src/lib/elm_slider_legacy.h b/src/lib/elm_slider_legacy.h
index 35dc17c6a..a7eec576f 100644
--- a/src/lib/elm_slider_legacy.h
+++ b/src/lib/elm_slider_legacy.h
@@ -11,370 +11,4 @@
  */
 EAPI Evas_Object                 *elm_slider_add(Evas_Object *parent);
 
-/**
- * Set the (exact) length of the bar region of a given slider widget.
- *
- * @param obj The slider object.
- * @param size The length of the slider's bar region.
- *
- * This sets the minimum width (when in horizontal mode) or height
- * (when in vertical mode) of the actual bar area of the slider
- * @p obj. This in turn affects the object's minimum size. Use
- * this when you're not setting other size hints expanding on the
- * given direction (like weight and alignment hints) and you would
- * like it to have a specific size.
- *
- * @note Icon, end, label, indicator and unit text around @p obj
- * will require their
- * own space, which will make @p obj to require more the @p size,
- * actually.
- *
- * @see elm_slider_span_size_get()
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size);
-
-/**
- * Get the length set for the bar region of a given slider widget
- *
- * @param obj The slider object.
- * @return The length of the slider's bar region.
- *
- * If that size was not set previously, with
- * elm_slider_span_size_set(), this call will return @c 0.
- *
- * @ingroup Slider
- */
-EAPI Evas_Coord                   elm_slider_span_size_get(const Evas_Object *obj);
-
-/**
- * Set the format string for the unit label.
- *
- * @param obj The slider object.
- * @param format The format string for the unit display.
- *
- * Unit label is displayed all the time, if set, after slider's bar.
- * In horizontal mode, at right and in vertical mode, at bottom.
- *
- * If @c NULL, unit label won't be visible. If not it sets the format
- * string for the label text. To the label text is provided a floating point
- * value, so the label text can display up to 1 floating point value.
- * Note that this is optional.
- *
- * Use a format string such as "%1.2f meters" for example, and it will
- * display values like: "3.14 meters" for a value equal to 3.14159.
- *
- * Default is unit label disabled.
- *
- * @see elm_slider_indicator_format_get()
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_unit_format_set(Evas_Object *obj, const char *format);
-
-/**
- * Get the unit label format of the slider.
- *
- * @param obj The slider object.
- * @return The unit label format string in UTF-8.
- *
- * Unit label is displayed all the time, if set, after slider's bar.
- * In horizontal mode, at right and in vertical mode, at bottom.
- *
- * @see elm_slider_unit_format_set() for more
- * information on how this works.
- *
- * @ingroup Slider
- */
-EAPI const char                  *elm_slider_unit_format_get(const Evas_Object *obj);
-
-/**
- * Set the format string for the indicator label.
- *
- * @param obj The slider object.
- * @param indicator The format string for the indicator display.
- *
- * The slider may display its value somewhere else then unit label,
- * for example, above the slider knob that is dragged around. This function
- * sets the format string used for this.
- *
- * If @c NULL, indicator label won't be visible. If not it sets the format
- * string for the label text. To the label text is provided a floating point
- * value, so the label text can display up to 1 floating point value.
- * Note that this is optional.
- *
- * Use a format string such as "%1.2f meters" for example, and it will
- * display values like: "3.14 meters" for a value equal to 3.14159.
- *
- * Default is indicator label disabled.
- *
- * @see elm_slider_indicator_format_get()
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_indicator_format_set(Evas_Object *obj, const char *indicator);
-
-/**
- * Get the indicator label format of the slider.
- *
- * @param obj The slider object.
- * @return The indicator label format string in UTF-8.
- *
- * The slider may display its value somewhere else then unit label,
- * for example, above the slider knob that is dragged around. This function
- * gets the format string used for this.
- *
- * @see elm_slider_indicator_format_set() for more
- * information on how this works.
- *
- * @ingroup Slider
- */
-EAPI const char                  *elm_slider_indicator_format_get(const Evas_Object *obj);
-
-/**
- * Set the orientation of a given slider widget.
- *
- * @param obj The slider object.
- * @param horizontal Use @c EINA_TRUE to make @p obj to be
- * @b horizontal, @c EINA_FALSE to make it @b vertical.
- *
- * Use this function to change how your slider is to be
- * disposed: vertically or horizontally.
- *
- * By default it's displayed horizontally.
- *
- * @see elm_slider_horizontal_get()
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-
-/**
- * Retrieve the orientation of a given slider widget
- *
- * @param obj The slider object.
- * @return @c EINA_TRUE, if @p obj is set to be @b horizontal,
- * @c EINA_FALSE if it's @b vertical (and on errors).
- *
- * @see elm_slider_horizontal_set() for more details.
- *
- * @ingroup Slider
- */
-EAPI Eina_Bool                    elm_slider_horizontal_get(const Evas_Object *obj);
-
-/**
- * Set the minimum and maximum values for the slider.
- *
- * @param obj The slider object.
- * @param min The minimum value.
- * @param max The maximum value.
- *
- * Define the allowed range of values to be selected by the user.
- *
- * If actual value is less than @p min, it will be updated to @p min. If it
- * is bigger then @p max, will be updated to @p max. Actual value can be
- * get with elm_slider_value_get().
- *
- * By default, min is equal to 0.0, and max is equal to 1.0.
- *
- * @warning Maximum must be greater than minimum, otherwise behavior
- * is undefined.
- *
- * @see elm_slider_min_max_get()
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_min_max_set(Evas_Object *obj, double min, double max);
-
-/**
- * Get the minimum and maximum values of the slider.
- *
- * @param obj The slider object.
- * @param min Pointer to store the minimum value.
- * @param max Pointer to store the maximum value.
- *
- * @note If only one value is needed, the other pointer can be passed
- * as @c NULL.
- *
- * @see elm_slider_min_max_set() for details.
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max);
-
-/**
- * Set the value the slider displays.
- *
- * @param obj The slider object.
- * @param val The value to be displayed.
- *
- * Value will be presented on the unit label following format specified with
- * elm_slider_unit_format_set() and on indicator with
- * elm_slider_indicator_format_set().
- *
- * @warning The value must to be between min and max values. This values
- * are set by elm_slider_min_max_set().
- *
- * @see elm_slider_value_get()
- * @see elm_slider_unit_format_set()
- * @see elm_slider_indicator_format_set()
- * @see elm_slider_min_max_set()
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_value_set(Evas_Object *obj, double val);
-
-/**
- * Get the value displayed by the slider.
- *
- * @param obj The slider object.
- * @return The value displayed.
- *
- * @see elm_slider_value_set() for details.
- *
- * @ingroup Slider
- */
-EAPI double                       elm_slider_value_get(const Evas_Object *obj);
-
-/**
- * Invert a given slider widget's displaying values order
- *
- * @param obj The slider object.
- * @param inverted Use @c EINA_TRUE to make @p obj inverted,
- * @c EINA_FALSE to bring it back to default, non-inverted values.
- *
- * A slider may be @b inverted, in which state it gets its
- * values inverted, with high vales being on the left or top and
- * low values on the right or bottom, as opposed to normally have
- * the low values on the former and high values on the latter,
- * respectively, for horizontal and vertical modes.
- *
- * @see elm_slider_inverted_get()
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted);
-
-/**
- * Get whether a given slider widget's displaying values are
- * inverted or not.
- *
- * @param obj The slider object.
- * @return @c EINA_TRUE, if @p obj has inverted values,
- * @c EINA_FALSE otherwise (and on errors).
- *
- * @see elm_slider_inverted_set() for more details.
- *
- * @ingroup Slider
- */
-EAPI Eina_Bool                    elm_slider_inverted_get(const Evas_Object *obj);
-
-/**
- * Set the format function pointer for the indicator label
- *
- * @param obj The slider object.
- * @param func The indicator format function.
- * @param free_func The freeing function for the format string.
- *
- * Set the callback function to format the indicator string.
- *
- * @see elm_slider_indicator_format_set() for more info on how this works.
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_indicator_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str));
-
-/**
- * Set the format function pointer for the units label
- *
- * @param obj The slider object.
- * @param func The units format function.
- * @param free_func The freeing function for the format string.
- *
- * Set the callback function to format the units string.
- *
- * @see elm_slider_unit_format_set() for more info on how this works.
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_units_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str));
-
-/**
- * Set whether to enlarge slider indicator (augmented knob) or not.
- *
- * @param obj The slider object.
- * @param show @c EINA_TRUE will make it enlarge, @c EINA_FALSE will
- * let the knob always at default size.
- *
- * By default, indicator will be bigger while dragged by the user.
- *
- * @warning It won't display values set with
- * elm_slider_indicator_format_set() if you disable indicator.
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show);
-
-/**
- * Get whether a given slider widget's enlarging indicator or not.
- *
- * @param obj The slider object.
- * @return @c EINA_TRUE, if @p obj is enlarging indicator, or
- * @c EINA_FALSE otherwise (and on errors).
- *
- * @see elm_slider_indicator_show_set() for details.
- *
- * @ingroup Slider
- */
-EAPI Eina_Bool                    elm_slider_indicator_show_get(const Evas_Object *obj);
-
-/**
- * Set the step by which slider indicator will move.
- *
- * @param obj The slider object.
- * @param step The step value.
- *
- * This value is used when draggable object is moved automatically i.e., in case
- * of key event when up/down/left/right key is pressed or in case when
- * accessibility is set and flick event is used to inc/dec slider values.
- * By default step value is equal to 0.05.
- *
- * @see elm_slider_step_get() for more details.
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_step_set(Evas_Object *obj, double step);
-
-/**
- * Get the step by which slider indicator moves.
- *
- * @param obj The slider object.
- * @return The step value.
- *
- * @see elm_slider_step_set() for more details.
- *
- * @ingroup Slider
- */
-EAPI double                       elm_slider_step_get(const Evas_Object *obj);
-
-/**
- * Show the indicator of slider on focus
- *
- * @param obj The slider object.
- * @param flag @ EINA_TRUE sets the indicator visible
- *
- * @ingroup Slider
- */
-EAPI void                         elm_slider_indicator_show_on_focus_set(Evas_Object *obj, Eina_Bool flag);
-
-/**
- * Get whether the indicator of the slider is set or not
- *
- * @param obj The slider object.
- * @return @c EINA_TRUE, if indicator is set
- *         @c EINA_FALSE otherwise.
- *
- * @ingroup Slider
- */
-EAPI Eina_Bool                    elm_slider_indicator_show_on_focus_get(const Evas_Object *obj);
+#include "elm_slider.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_slideshow_eo.h b/src/lib/elm_slideshow_eo.h
index 175d3b14a..1e598adc1 100644
--- a/src/lib/elm_slideshow_eo.h
+++ b/src/lib/elm_slideshow_eo.h
@@ -1,377 +1 @@
-#include "elm_slideshow.eo.h"
-
-#if 0
-#define ELM_OBJ_SLIDESHOW_CLASS elm_obj_slideshow_class_get()
-
-const Eo_Class *elm_obj_slideshow_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_SLIDESHOW_BASE_ID;
-
-enum
-{
-   ELM_OBJ_SLIDESHOW_SUB_ID_ITEM_ADD,
-   ELM_OBJ_SLIDESHOW_SUB_ID_ITEM_SORTED_INSERT,
-   ELM_OBJ_SLIDESHOW_SUB_ID_NEXT,
-   ELM_OBJ_SLIDESHOW_SUB_ID_PREVIOUS,
-   ELM_OBJ_SLIDESHOW_SUB_ID_TRANSITIONS_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_LAYOUTS_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_TRANSITION_SET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_TRANSITION_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_TIMEOUT_SET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_TIMEOUT_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_LOOP_SET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_LAYOUT_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_LAYOUT_SET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_LOOP_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_CLEAR,
-   ELM_OBJ_SLIDESHOW_SUB_ID_ITEMS_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_ITEM_CURRENT_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_CACHE_BEFORE_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_CACHE_BEFORE_SET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_CACHE_AFTER_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_CACHE_AFTER_SET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_ITEM_NTH_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_COUNT_GET,
-   ELM_OBJ_SLIDESHOW_SUB_ID_LAST
-};
-
-#define ELM_OBJ_SLIDESHOW_ID(sub_id) (ELM_OBJ_SLIDESHOW_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_slideshow_item_add
- * @since 1.8
- *
- * Add (append) a new item in a given slideshow widget.
- *
- * @param[in] itc
- * @param[in] data
- * @param[out] ret
- *
- * @see elm_slideshow_item_add
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_item_add(itc, data, ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_ITEM_ADD), EO_TYPECHECK(const Elm_Slideshow_Item_Class *, itc), EO_TYPECHECK(const void *, data), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_slideshow_item_sorted_insert
- * @since 1.8
- *
- * Insert a new item into the given slideshow widget, using the func
- * function to sort items (by item handles).
- *
- * @param[in] itc
- * @param[in] data
- * @param[in] func
- * @param[out] ret
- *
- * @see elm_slideshow_item_sorted_insert
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_item_sorted_insert(itc, data, func, ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_ITEM_SORTED_INSERT), EO_TYPECHECK(const Elm_Slideshow_Item_Class *, itc), EO_TYPECHECK(const void *, data), EO_TYPECHECK(Eina_Compare_Cb, func), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_slideshow_next
- * @since 1.8
- *
- * Slide to the next item, in a given slideshow widget
- *
- *
- * @see elm_slideshow_next
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_next() ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_NEXT)
-
-/**
- * @def elm_obj_slideshow_previous
- * @since 1.8
- *
- * Slide to the previous item, in a given slideshow widget
- *
- *
- * @see elm_slideshow_previous
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_previous() ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_PREVIOUS)
-
-/**
- * @def elm_obj_slideshow_transitions_get
- * @since 1.8
- *
- * Returns the list of sliding transition/effect names available, for a
- * given slideshow widget.
- *
- * @param[out] ret
- *
- * @see elm_slideshow_transitions_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_transitions_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_TRANSITIONS_GET), EO_TYPECHECK(const Eina_List **, ret)
-
-/**
- * @def elm_obj_slideshow_layouts_get
- * @since 1.8
- *
- * Returns the list of layout names available, for a given
- * slideshow widget.
- *
- * @param[out] ret
- *
- * @see elm_slideshow_layouts_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_layouts_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_LAYOUTS_GET), EO_TYPECHECK(const Eina_List **, ret)
-
-/**
- * @def elm_obj_slideshow_transition_set
- * @since 1.8
- *
- * Set the current slide transition/effect in use for a given
- * slideshow widget.
- *
- * @param[in] transition
- *
- * @see elm_slideshow_transition_set
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_transition_set(transition) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_TRANSITION_SET), EO_TYPECHECK(const char *, transition)
-
-/**
- * @def elm_obj_slideshow_transition_get
- * @since 1.8
- *
- * Get the current slide transition/effect in use for a given
- * slideshow widget.
- *
- * @param[out] ret
- *
- * @see elm_slideshow_transition_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_transition_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_TRANSITION_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_slideshow_timeout_set
- * @since 1.8
- *
- * Set the interval between each image transition on a given
- * slideshow widget.
- *
- * @param[in] timeout
- *
- * @see elm_slideshow_timeout_set
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_timeout_set(timeout) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_TIMEOUT_SET), EO_TYPECHECK(double, timeout)
-
-/**
- * @def elm_obj_slideshow_timeout_get
- * @since 1.8
- *
- * Get the interval set for image transitions on a given slideshow
- * widget.
- *
- * @param[out] ret
- *
- * @see elm_slideshow_timeout_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_timeout_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_TIMEOUT_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_slideshow_loop_set
- * @since 1.8
- *
- * Set if, after a slideshow is started, for a given slideshow
- * widget.
- *
- * @param[in] loop
- *
- * @see elm_slideshow_loop_set
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_loop_set(loop) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_LOOP_SET), EO_TYPECHECK(Eina_Bool, loop)
-
-/**
- * @def elm_obj_slideshow_layout_get
- * @since 1.8
- *
- * Get the current slide layout in use for a given slideshow widget
- *
- * @param[out] ret
- *
- * @see elm_slideshow_layout_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_layout_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_LAYOUT_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_slideshow_layout_set
- * @since 1.8
- *
- * Set the current slide layout in use for a given slideshow widget
- *
- * @param[in] layout
- *
- * @see elm_slideshow_layout_set
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_layout_set(layout) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_LAYOUT_SET), EO_TYPECHECK(const char *, layout)
-
-/**
- * @def elm_obj_slideshow_loop_get
- * @since 1.8
- *
- * Get if, after a slideshow is started, for a given slideshow
- * widget.
- *
- * @param[out] ret
- *
- * @see elm_slideshow_loop_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_loop_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_LOOP_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_slideshow_clear
- * @since 1.8
- *
- * Remove all items from a given slideshow widget
- *
- *
- * @see elm_slideshow_clear
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_clear() ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_CLEAR)
-
-/**
- * @def elm_obj_slideshow_items_get
- * @since 1.8
- *
- * Get the internal list of items in a given slideshow widget.
- *
- * @param[out] ret
- *
- * @see elm_slideshow_items_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_items_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_ITEMS_GET), EO_TYPECHECK(const Eina_List **, ret)
-
-/**
- * @def elm_obj_slideshow_item_current_get
- * @since 1.8
- *
- * Returns the currently displayed item, in a given slideshow widget
- *
- * @param[out] ret
- *
- * @see elm_slideshow_item_current_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_item_current_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_ITEM_CURRENT_GET), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_slideshow_cache_before_get
- * @since 1.8
- *
- * Retrieve the number of items to cache, on a given slideshow widget,
- *
- * @param[out] ret
- *
- * @see elm_slideshow_cache_before_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_cache_before_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_CACHE_BEFORE_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_slideshow_cache_before_set
- * @since 1.8
- *
- * Set the number of items to cache, on a given slideshow widget,
- *
- * @param[in] count
- *
- * @see elm_slideshow_cache_before_set
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_cache_before_set(count) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_CACHE_BEFORE_SET), EO_TYPECHECK(int, count)
-
-/**
- * @def elm_obj_slideshow_cache_after_get
- * @since 1.8
- *
- * Retrieve the number of items to cache, on a given slideshow widget,
- * <b>after the current item</b>
- *
- * @param[out] ret
- *
- * @see elm_slideshow_cache_after_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_cache_after_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_CACHE_AFTER_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_slideshow_cache_after_set
- * @since 1.8
- *
- * Set the number of items to cache, on a given slideshow widget,
- * <b>after the current item</b>
- *
- * @param[in] count
- *
- * @see elm_slideshow_cache_after_set
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_cache_after_set(count) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_CACHE_AFTER_SET), EO_TYPECHECK(int, count)
-
-/**
- * @def elm_obj_slideshow_item_nth_get
- * @since 1.8
- *
- * Get the the item, in a given slideshow widget, placed at
- * position @p nth, in its internal items list
- *
- * @param[in] nth
- * @param[out] ret
- *
- * @see elm_slideshow_item_nth_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_item_nth_get(nth, ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_ITEM_NTH_GET), EO_TYPECHECK(unsigned int, nth), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_slideshow_count_get
- * @since 1.8
- *
- * Get the number of items stored in a given slideshow widget
- *
- * @param[out] ret
- *
- * @see elm_slideshow_count_get
- *
- * @ingroup Slideshow
- */
-#define elm_obj_slideshow_count_get(ret) ELM_OBJ_SLIDESHOW_ID(ELM_OBJ_SLIDESHOW_SUB_ID_COUNT_GET), EO_TYPECHECK(unsigned int *, ret)
-#endif
+#include "elm_slideshow.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_slideshow_legacy.h b/src/lib/elm_slideshow_legacy.h
index 4de53c20c..c56db2367 100644
--- a/src/lib/elm_slideshow_legacy.h
+++ b/src/lib/elm_slideshow_legacy.h
@@ -11,415 +11,4 @@
  */
 EAPI Evas_Object          *elm_slideshow_add(Evas_Object *parent);
 
-/**
- * Add (append) a new item in a given slideshow widget.
- *
- * @param obj The slideshow object
- * @param itc The item class for the item
- * @param data The item's data
- * @return A handle to the item added or @c NULL, on errors
- *
- * Add a new item to @p obj's internal list of items, appending it.
- * The item's class must contain the function really fetching the
- * image object to show for this item, which could be an Evas image
- * object or an Elementary photo, for example. The @p data
- * parameter is going to be passed to both class functions of the
- * item.
- *
- * @see #Elm_Slideshow_Item_Class
- * @see elm_slideshow_item_sorted_insert()
- * @see elm_object_item_data_set()
- *
- * @ingroup Slideshow
- */
-EAPI Elm_Object_Item      *elm_slideshow_item_add(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, const void *data);
-
-/**
- * Insert a new item into the given slideshow widget, using the @p func
- * function to sort items (by item handles).
- *
- * @param obj The slideshow object
- * @param itc The item class for the item
- * @param data The item's data
- * @param func The comparing function to be used to sort slideshow
- * items <b>by #Elm_Slideshow_Item_Class item handles</b>
- * @return Returns The slideshow item handle, on success, or
- * @c NULL, on errors
- *
- * Add a new item to @p obj's internal list of items, in a position
- * determined by the @p func comparing function. The item's class
- * must contain the function really fetching the image object to
- * show for this item, which could be an Evas image object or an
- * Elementary photo, for example. The @p data parameter is going to
- * be passed to both class functions of the item.
- *
- * @see #Elm_Slideshow_Item_Class
- * @see elm_slideshow_item_add()
- *
- * @ingroup Slideshow
- */
-EAPI Elm_Object_Item      *elm_slideshow_item_sorted_insert(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, const void *data, Eina_Compare_Cb func);
-
-/**
- * Slide to the @b next item, in a given slideshow widget
- *
- * @param obj The slideshow object
- *
- * The sliding animation @p obj is set to use will be the
- * transition effect used, after this call is issued.
- *
- * @note If the end of the slideshow's internal list of items is
- * reached, it'll wrap around to the list's beginning, again.
- *
- * @ingroup Slideshow
- */
-EAPI void                  elm_slideshow_next(Evas_Object *obj);
-
-/**
- * Slide to the @b previous item, in a given slideshow widget
- *
- * @param obj The slideshow object
- *
- * The sliding animation @p obj is set to use will be the
- * transition effect used, after this call is issued.
- *
- * @note If the beginning of the slideshow's internal list of items
- * is reached, it'll wrap around to the list's end, again.
- *
- * @ingroup Slideshow
- */
-EAPI void                  elm_slideshow_previous(Evas_Object *obj);
-
-/**
- * Returns the list of sliding transition/effect names available, for a
- * given slideshow widget.
- *
- * @param obj The slideshow object
- * @return The list of transitions (list of @b stringshared strings
- * as data)
- *
- * The transitions, which come from @p obj's theme, must be an EDC
- * data item named @c "transitions" on the theme file, with (prefix)
- * names of EDC programs actually implementing them.
- *
- * The available transitions for slideshows on the default theme are:
- * - @c "fade" - the current item fades out, while the new one
- *   fades in to the slideshow's viewport.
- * - @c "black_fade" - the current item fades to black, and just
- *   then, the new item will fade in.
- * - @c "horizontal" - the current item slides horizontally, until
- *   it gets out of the slideshow's viewport, while the new item
- *   comes from the left to take its place.
- * - @c "vertical" - the current item slides vertically, until it
- *   gets out of the slideshow's viewport, while the new item comes
- *   from the bottom to take its place.
- * - @c "square" - the new item starts to appear from the middle of
- *   the current one, but with a tiny size, growing until its
- *   target (full) size and covering the old one.
- *
- * @warning The stringshared strings get no new references
- * exclusive to the user grabbing the list, here, so if you'd like
- * to use them out of this call's context, you'd better @c
- * eina_stringshare_ref() them. Also the list is an internal list and
- * so is only valid for as long as the slideshow object is valid and
- * has not internally changed its list for some reason, so make a
- * copy if you need it around.
- *
- * @see elm_slideshow_transition_set()
- *
- * @ingroup Slideshow
- */
-EAPI const Eina_List      *elm_slideshow_transitions_get(const Evas_Object *obj);
-
-/**
- * Returns the list of @b layout names available, for a given
- * slideshow widget.
- *
- * @param obj The slideshow object
- * @return The list of layouts (list of @b stringshared strings
- * as data)
- *
- * Slideshow layouts will change how the widget is to dispose each
- * image item in its viewport, with regard to cropping, scaling,
- * etc.
- *
- * The layouts, which come from @p obj's theme, must be an EDC
- * data item name @c "layouts" on the theme file, with (prefix)
- * names of EDC programs actually implementing them.
- *
- * The available layouts for slideshows on the default theme are:
- * - @c "fullscreen" - item images with original aspect, scaled to
- *   touch top and down slideshow borders or, if the image's height
- *   is not enough, left and right slideshow borders.
- * - @c "not_fullscreen" - the same behavior as the @c "fullscreen"
- *   one, but always leaving 10% of the slideshow's dimensions of
- *   distance between the item image's borders and the slideshow
- *   borders, for each axis.
- *
- * @warning The stringshared strings get no new references
- * exclusive to the user grabbing the list, here, so if you'd like
- * to use them out of this call's context, you'd better @c
- * eina_stringshare_ref() them.
- *
- * @see elm_slideshow_layout_set()
- *
- * @ingroup Slideshow
- */
-EAPI const Eina_List      *elm_slideshow_layouts_get(const Evas_Object *obj);
-
-/**
- * Set the current slide transition/effect in use for a given
- * slideshow widget
- *
- * @param obj The slideshow object
- * @param transition The new transition's name string
- *
- * If @p transition is implemented in @p obj's theme (i.e., is
- * contained in the list returned by
- * elm_slideshow_transitions_get()), this new sliding effect will
- * be used on the widget.
- *
- * @see elm_slideshow_transitions_get() for more details
- *
- * @ingroup Slideshow
- */
-EAPI void                  elm_slideshow_transition_set(Evas_Object *obj, const char *transition);
-
-/**
- * Get the current slide transition/effect in use for a given
- * slideshow widget
- *
- * @param obj The slideshow object
- * @return The current transition's name
- *
- * @see elm_slideshow_transition_set() for more details
- *
- * @ingroup Slideshow
- */
-EAPI const char           *elm_slideshow_transition_get(const Evas_Object *obj);
-
-/**
- * Set the interval between each image transition on a given
- * slideshow widget, <b>and start the slideshow, itself</b>
- *
- * @param obj The slideshow object
- * @param timeout The new displaying timeout for images
- *
- * After this call, the slideshow widget will start cycling its
- * view, sequentially and automatically, with the images of the
- * items it has. The time between each new image displayed is going
- * to be @p timeout, in @b seconds. If a different timeout was set
- * previously and an slideshow was in progress, it will continue
- * with the new time between transitions, after this call.
- *
- * @note A value less than or equal to 0 on @p timeout will disable
- * the widget's internal timer, thus halting any slideshow which
- * could be happening on @p obj.
- *
- * @see elm_slideshow_timeout_get()
- *
- * @ingroup Slideshow
- */
-EAPI void                  elm_slideshow_timeout_set(Evas_Object *obj, double timeout);
-
-/**
- * Get the interval set for image transitions on a given slideshow
- * widget.
- *
- * @param obj The slideshow object
- * @return Returns the timeout set on it or -1.0, on errors
- *
- * @see elm_slideshow_timeout_set() for more details
- *
- * @ingroup Slideshow
- */
-EAPI double                elm_slideshow_timeout_get(const Evas_Object *obj);
-
-/**
- * Set if, after a slideshow is started, for a given slideshow
- * widget, its items should be displayed cyclically or not.
- *
- * @param obj The slideshow object
- * @param loop Use @c EINA_TRUE to make it cycle through items or
- * @c EINA_FALSE for it to stop at the end of @p obj's internal
- * list of items
- *
- * @note elm_slideshow_next() and elm_slideshow_previous() will @b
- * ignore what is set by this functions, i.e., they'll @b always
- * cycle through items. This affects only the "automatic"
- * slideshow, as set by elm_slideshow_timeout_set().
- *
- * @see elm_slideshow_loop_get()
- *
- * @ingroup Slideshow
- */
-EAPI void                  elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop);
-
-/**
- * Get the current slide layout in use for a given slideshow widget
- *
- * @param obj The slideshow object
- * @return The current layout's name
- *
- * @see elm_slideshow_layout_set() for more details
- *
- * @ingroup Slideshow
- */
-EAPI const char           *elm_slideshow_layout_get(const Evas_Object *obj);
-
-/**
- * Set the current slide layout in use for a given slideshow widget
- *
- * @param obj The slideshow object
- * @param layout The new layout's name string
- *
- * If @p layout is implemented in @p obj's theme (i.e., is contained
- * in the list returned by elm_slideshow_layouts_get()), this new
- * images layout will be used on the widget.
- *
- * @see elm_slideshow_layouts_get() for more details
- *
- * @ingroup Slideshow
- */
-EAPI void                  elm_slideshow_layout_set(Evas_Object *obj, const char *layout);
-
-/**
- * Get if, after a slideshow is started, for a given slideshow
- * widget, its items are to be displayed cyclically or not.
- *
- * @param obj The slideshow object
- * @return @c EINA_TRUE, if the items in @p obj will be cycled
- * through or @c EINA_FALSE, otherwise
- *
- * @see elm_slideshow_loop_set() for more details
- *
- * @ingroup Slideshow
- */
-EAPI Eina_Bool             elm_slideshow_loop_get(const Evas_Object *obj);
-
-/**
- * Remove all items from a given slideshow widget
- *
- * @param obj The slideshow object
- *
- * This removes (and deletes) all items in @p obj, leaving it
- * empty.
- *
- * @see elm_object_item_del(), to remove just one item.
- *
- * @ingroup Slideshow
- */
-EAPI void                  elm_slideshow_clear(Evas_Object *obj);
-
-/**
- * Get the internal list of items in a given slideshow widget.
- *
- * @param obj The slideshow object
- * @return The list of items (#Elm_Object_Item as data) or
- * @c NULL on errors.
- *
- * This list is @b not to be modified in any way and must not be
- * freed. Use the list members with functions like
- * elm_object_item_del(), elm_object_item_data_get().
- *
- * @warning This list is only valid until @p obj object's internal
- * items list is changed. It should be fetched again with another
- * call to this function when changes happen.
- *
- * @ingroup Slideshow
- */
-EAPI const Eina_List      *elm_slideshow_items_get(const Evas_Object *obj);
-
-/**
- * Returns the currently displayed item, in a given slideshow widget
- *
- * @param obj The slideshow object
- * @return A handle to the item being displayed in @p obj or
- * @c NULL, if none is (and on errors)
- *
- * @ingroup Slideshow
- */
-EAPI Elm_Object_Item      *elm_slideshow_item_current_get(const Evas_Object *obj);
-
-
-/**
- * Retrieve the number of items to cache, on a given slideshow widget,
- * <b>before the current item</b>
- *
- * @param obj The slideshow object
- * @return The number of items set to be cached before the current one
- *
- * @see elm_slideshow_cache_before_set() for more details
- *
- * @ingroup Slideshow
- */
-EAPI int                   elm_slideshow_cache_before_get(const Evas_Object *obj);
-
-/**
- * Set the number of items to cache, on a given slideshow widget,
- * <b>before the current item</b>
- *
- * @param obj The slideshow object
- * @param count Number of items to cache before the current one
- *
- * The default value for this property is @c 2. See
- * @ref Slideshow_Caching "slideshow caching" for more details.
- *
- * @see elm_slideshow_cache_before_get()
- *
- * @ingroup Slideshow
- */
-EAPI void                  elm_slideshow_cache_before_set(Evas_Object *obj, int count);
-
-/**
- * Retrieve the number of items to cache, on a given slideshow widget,
- * <b>after the current item</b>
- *
- * @param obj The slideshow object
- * @return The number of items set to be cached after the current one
- *
- * @see elm_slideshow_cache_after_set() for more details
- *
- * @ingroup Slideshow
- */
-EAPI int                   elm_slideshow_cache_after_get(const Evas_Object *obj);
-
-/**
- * Set the number of items to cache, on a given slideshow widget,
- * <b>after the current item</b>
- *
- * @param obj The slideshow object
- * @param count Number of items to cache after the current one
- *
- * The default value for this property is @c 2. See
- * @ref Slideshow_Caching "slideshow caching" for more details.
- *
- * @see elm_slideshow_cache_after_get()
- *
- * @ingroup Slideshow
- */
-EAPI void                  elm_slideshow_cache_after_set(Evas_Object *obj, int count);
-
-/**
- * Get the the item, in a given slideshow widget, placed at
- * position @p nth, in its internal items list
- *
- * @param obj The slideshow object
- * @param nth The number of the item to grab a handle to (0 being
- * the first)
- * @return The item stored in @p obj at position @p nth or @c NULL,
- * if there's no item with that index (and on errors)
- *
- * @ingroup Slideshow
- */
-EAPI Elm_Object_Item      *elm_slideshow_item_nth_get(const Evas_Object *obj, unsigned int nth);
-
-/**
- * Get the number of items stored in a given slideshow widget
- *
- * @param obj The slideshow object
- * @return The number of items on @p obj, at the moment of this call
- *
- * @ingroup Slideshow
- */
-EAPI unsigned int          elm_slideshow_count_get(const Evas_Object *obj);
+#include "elm_slideshow.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_spinner_eo.h b/src/lib/elm_spinner_eo.h
index 4cc78e4e6..8c6d57dfd 100644
--- a/src/lib/elm_spinner_eo.h
+++ b/src/lib/elm_spinner_eo.h
@@ -1,305 +1 @@
-#include "elm_spinner.eo.h"
-
-#if 0
-#define ELM_OBJ_SPINNER_CLASS elm_obj_spinner_class_get()
-
-const Eo_Class *elm_obj_spinner_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_SPINNER_BASE_ID;
-
-enum
-{
-   ELM_OBJ_SPINNER_SUB_ID_LABEL_FORMAT_SET,
-   ELM_OBJ_SPINNER_SUB_ID_LABEL_FORMAT_GET,
-   ELM_OBJ_SPINNER_SUB_ID_MIN_MAX_SET,
-   ELM_OBJ_SPINNER_SUB_ID_MIN_MAX_GET,
-   ELM_OBJ_SPINNER_SUB_ID_STEP_SET,
-   ELM_OBJ_SPINNER_SUB_ID_STEP_GET,
-   ELM_OBJ_SPINNER_SUB_ID_VALUE_SET,
-   ELM_OBJ_SPINNER_SUB_ID_VALUE_GET,
-   ELM_OBJ_SPINNER_SUB_ID_WRAP_SET,
-   ELM_OBJ_SPINNER_SUB_ID_WRAP_GET,
-   ELM_OBJ_SPINNER_SUB_ID_SPECIAL_VALUE_ADD,
-   ELM_OBJ_SPINNER_SUB_ID_EDITABLE_SET,
-   ELM_OBJ_SPINNER_SUB_ID_EDITABLE_GET,
-   ELM_OBJ_SPINNER_SUB_ID_INTERVAL_SET,
-   ELM_OBJ_SPINNER_SUB_ID_INTERVAL_GET,
-   ELM_OBJ_SPINNER_SUB_ID_BASE_SET,
-   ELM_OBJ_SPINNER_SUB_ID_BASE_GET,
-   ELM_OBJ_SPINNER_SUB_ID_ROUND_SET,
-   ELM_OBJ_SPINNER_SUB_ID_ROUND_GET,
-   ELM_OBJ_SPINNER_SUB_ID_LAST
-};
-
-#define ELM_OBJ_SPINNER_ID(sub_id) (ELM_OBJ_SPINNER_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_spinner_label_format_set
- * @since 1.8
- *
- * Set the format string of the displayed label.
- *
- * @param[in] fmt
- *
- * @see elm_spinner_label_format_set
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_label_format_set(fmt) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_LABEL_FORMAT_SET), EO_TYPECHECK(const char *, fmt)
-
-/**
- * @def elm_obj_spinner_label_format_get
- * @since 1.8
- *
- * Get the label format of the spinner.
- *
- * @param[out] ret
- *
- * @see elm_spinner_label_format_get
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_label_format_get(ret) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_LABEL_FORMAT_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_spinner_min_max_set
- * @since 1.8
- *
- * Set the minimum and maximum values for the spinner.
- *
- * @param[in] min
- * @param[in] max
- *
- * @see elm_spinner_min_max_set
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_min_max_set(min, max) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_MIN_MAX_SET), EO_TYPECHECK(double, min), EO_TYPECHECK(double, max)
-
-/**
- * @def elm_obj_spinner_min_max_get
- * @since 1.8
- *
- * Get the minimum and maximum values of the spinner.
- *
- * @param[out] min
- * @param[out] max
- *
- * @see elm_spinner_min_max_get
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_min_max_get(min, max) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_MIN_MAX_GET), EO_TYPECHECK(double *, min), EO_TYPECHECK(double *, max)
-
-/**
- * @def elm_obj_spinner_step_set
- * @since 1.8
- *
- * Set the step used to increment or decrement the spinner value.
- *
- * @param[in] step
- *
- * @see elm_spinner_step_set
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_step_set(step) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_STEP_SET), EO_TYPECHECK(double, step)
-
-/**
- * @def elm_obj_spinner_step_get
- * @since 1.8
- *
- * Get the step used to increment or decrement the spinner value.
- *
- * @param[out] ret
- *
- * @see elm_spinner_step_get
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_step_get(ret) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_STEP_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_spinner_value_set
- * @since 1.8
- *
- * Set the value the spinner displays.
- *
- * @param[in] val
- *
- * @see elm_spinner_value_set
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_value_set(val) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_VALUE_SET), EO_TYPECHECK(double, val)
-
-/**
- * @def elm_obj_spinner_value_get
- * @since 1.8
- *
- * Get the value displayed by the spinner.
- *
- * @param[out] ret
- *
- * @see elm_spinner_value_get
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_value_get(ret) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_VALUE_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_spinner_wrap_set
- * @since 1.8
- *
- * Set whether the spinner should wrap when it reaches its
- *
- * @param[in] wrap
- *
- * @see elm_spinner_wrap_set
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_wrap_set(wrap) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_WRAP_SET), EO_TYPECHECK(Eina_Bool, wrap)
-
-/**
- * @def elm_obj_spinner_wrap_get
- * @since 1.8
- *
- * Get whether the spinner should wrap when it reaches its
- *
- * @param[out] ret
- *
- * @see elm_spinner_wrap_get
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_wrap_get(ret) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_WRAP_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_spinner_special_value_add
- * @since 1.8
- *
- * Set a special string to display in the place of the numerical value.
- *
- * @param[in] value
- * @param[in] label
- *
- * @see elm_spinner_special_value_add
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_special_value_add(value, label) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_SPECIAL_VALUE_ADD), EO_TYPECHECK(double, value), EO_TYPECHECK(const char *, label)
-
-/**
- * @def elm_obj_spinner_editable_set
- * @since 1.8
- *
- * Set whether the spinner can be directly edited by the user or not.
- *
- * @param[in] editable
- *
- * @see elm_spinner_editable_set
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_editable_set(editable) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_EDITABLE_SET), EO_TYPECHECK(Eina_Bool, editable)
-
-/**
- * @def elm_obj_spinner_editable_get
- * @since 1.8
- *
- * Get whether the spinner can be directly edited by the user or not.
- *
- * @param[out] ret
- *
- * @see elm_spinner_editable_get
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_editable_get(ret) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_EDITABLE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_spinner_interval_set
- * @since 1.8
- *
- * Set the interval on time updates for an user mouse button hold
- *
- * @param[in] interval
- *
- * @see elm_spinner_interval_set
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_interval_set(interval) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_INTERVAL_SET), EO_TYPECHECK(double, interval)
-
-/**
- * @def elm_obj_spinner_interval_get
- * @since 1.8
- *
- * Get the interval on time updates for an user mouse button hold
- *
- * @param[out] ret
- *
- * @see elm_spinner_interval_get
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_interval_get(ret) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_INTERVAL_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_spinner_base_set
- * @since 1.8
- *
- * Set the base for rounding
- *
- * @param[in] base
- *
- * @see elm_spinner_base_set
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_base_set(base) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_BASE_SET), EO_TYPECHECK(double, base)
-
-/**
- * @def elm_obj_spinner_base_get
- * @since 1.8
- *
- * Get the base for rounding
- *
- * @param[out] ret
- *
- * @see elm_spinner_base_get
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_base_get(ret) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_BASE_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_spinner_round_set
- * @since 1.8
- *
- * Set the round value for rounding
- *
- * @param[in] rnd
- *
- * @see elm_spinner_round_set
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_round_set(rnd) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_ROUND_SET), EO_TYPECHECK(int, rnd)
-
-/**
- * @def elm_obj_spinner_round_get
- * @since 1.8
- *
- * Get the round value for rounding
- *
- * @param[out] ret
- *
- * @see elm_spinner_round_get
- *
- * @ingroup Spinner
- */
-#define elm_obj_spinner_round_get(ret) ELM_OBJ_SPINNER_ID(ELM_OBJ_SPINNER_SUB_ID_ROUND_GET), EO_TYPECHECK(int *, ret)
-#endif
+#include "elm_spinner.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_spinner_legacy.h b/src/lib/elm_spinner_legacy.h
index 47419b228..47c2ae498 100644
--- a/src/lib/elm_spinner_legacy.h
+++ b/src/lib/elm_spinner_legacy.h
@@ -42,370 +42,4 @@ EAPI void elm_spinner_special_value_del(Evas_Object *obj, double value);
  */
 EAPI const char *elm_spinner_special_value_get(Evas_Object *obj, double value);
 
-/**
- * Set the format string of the displayed label.
- *
- * @param obj The spinner object.
- * @param fmt The format string for the label display.
- *
- * If @c NULL, this sets the format to "%.0f". If not it sets the format
- * string for the label text. The label text is provided a floating point
- * value, so the label text can display up to 1 floating point value.
- * Note that this is optional.
- *
- * Use a format string such as "%1.2f meters" for example, and it will
- * display values like: "3.14 meters" for a value equal to 3.14159.
- *
- * Default is "%0.f".
- *
- * @see elm_spinner_label_format_get()
- *
- * @ingroup Spinner
- */
-EAPI void        elm_spinner_label_format_set(Evas_Object *obj, const char *fmt);
-
-/**
- * Get the label format of the spinner.
- *
- * @param obj The spinner object.
- * @return The text label format string in UTF-8.
- *
- * @see elm_spinner_label_format_set() for details.
- *
- * @ingroup Spinner
- */
-EAPI const char *elm_spinner_label_format_get(const Evas_Object *obj);
-
-/**
- * Set the minimum and maximum values for the spinner.
- *
- * @param obj The spinner object.
- * @param min The minimum value.
- * @param max The maximum value.
- *
- * Define the allowed range of values to be selected by the user.
- *
- * If actual value is less than @p min, it will be updated to @p min. If it
- * is bigger then @p max, will be updated to @p max. Actual value can be
- * get with elm_spinner_value_get().
- *
- * By default, min is equal to 0, and max is equal to 100.
- *
- * @warning Maximum must be greater than minimum.
- *
- * @see elm_spinner_min_max_get()
- *
- * @ingroup Spinner
- */
-EAPI void        elm_spinner_min_max_set(Evas_Object *obj, double min, double max);
-
-/**
- * Get the minimum and maximum values of the spinner.
- *
- * @param obj The spinner object.
- * @param min Pointer to store the minimum value.
- * @param max Pointer to store the maximum value.
- *
- * @note If only one value is needed, the other pointer can be passed
- * as @c NULL.
- *
- * @see elm_spinner_min_max_set() for details.
- *
- * @ingroup Spinner
- */
-EAPI void        elm_spinner_min_max_get(const Evas_Object *obj, double *min, double *max);
-
-/**
- * Set the step used to increment or decrement the spinner value.
- *
- * @param obj The spinner object.
- * @param step The step value.
- *
- * This value will be incremented or decremented to the displayed value.
- * It will be incremented while the user keep right or top arrow pressed,
- * and will be decremented while the user keep left or bottom arrow pressed.
- *
- * The interval to increment / decrement can be set with
- * elm_spinner_interval_set().
- *
- * By default step value is equal to 1.
- *
- * @see elm_spinner_step_get()
- *
- * @ingroup Spinner
- */
-EAPI void        elm_spinner_step_set(Evas_Object *obj, double step);
-
-/**
- * Get the step used to increment or decrement the spinner value.
- *
- * @param obj The spinner object.
- * @return The step value.
- *
- * @see elm_spinner_step_get() for more details.
- *
- * @ingroup Spinner
- */
-EAPI double      elm_spinner_step_get(const Evas_Object *obj);
-
-/**
- * Set the value the spinner displays.
- *
- * @param obj The spinner object.
- * @param val The value to be displayed.
- *
- * Value will be presented on the label following format specified with
- * elm_spinner_format_set().
- *
- * @warning The value must to be between min and max values. This values
- * are set by elm_spinner_min_max_set().
- *
- * @see elm_spinner_value_get().
- * @see elm_spinner_format_set().
- * @see elm_spinner_min_max_set().
- *
- * @ingroup Spinner
- */
-EAPI void        elm_spinner_value_set(Evas_Object *obj, double val);
-
-/**
- * Get the value displayed by the spinner.
- *
- * @param obj The spinner object.
- * @return The value displayed.
- *
- * @see elm_spinner_value_set() for details.
- *
- * @ingroup Spinner
- */
-EAPI double      elm_spinner_value_get(const Evas_Object *obj);
-
-/**
- * Set whether the spinner should wrap when it reaches its
- * minimum or maximum value.
- *
- * @param obj The spinner object.
- * @param wrap @c EINA_TRUE to enable wrap or @c EINA_FALSE to
- * disable it.
- *
- * Disabled by default. If disabled, when the user tries to increment the
- * value,
- * but displayed value plus step value is bigger than maximum value,
- * the new value will be the maximum value.
- * The same happens when the user tries to decrement it,
- * but the value less step is less than minimum value. In this case,
- * the new displayed value will be the minimum value.
- *
- * When wrap is enabled, when the user tries to increment the value,
- * but displayed value plus step value is bigger than maximum value,
- * the new value will be the minimum value. When the the user tries to
- * decrement it, but the value less step is less than minimum value,
- * the new displayed value will be the maximum value.
- *
- * E.g.:
- * @li min value = 10
- * @li max value = 50
- * @li step value = 20
- * @li displayed value = 20
- *
- * When the user decrement value (using left or bottom arrow), it will
- * displays @c 50.
- *
- * @see elm_spinner_wrap_get().
- *
- * @ingroup Spinner
- */
-EAPI void        elm_spinner_wrap_set(Evas_Object *obj, Eina_Bool wrap);
-
-/**
- * Get whether the spinner should wrap when it reaches its
- * minimum or maximum value.
- *
- * @param obj The spinner object
- * @return @c EINA_TRUE means wrap is enabled. @c EINA_FALSE indicates
- * it's disabled. If @p obj is @c NULL, @c EINA_FALSE is returned.
- *
- * @see elm_spinner_wrap_set() for details.
- *
- * @ingroup Spinner
- */
-EAPI Eina_Bool   elm_spinner_wrap_get(const Evas_Object *obj);
-
-/**
- * Set a special string to display in the place of the numerical value.
- *
- * @param obj The spinner object.
- * @param value The value to be replaced.
- * @param label The label to be used.
- *
- * It's useful for cases when a user should select an item that is
- * better indicated by a label than a value. For example, weekdays or months.
- *
- * E.g.:
- * @code
- * sp = elm_spinner_add(win);
- * elm_spinner_min_max_set(sp, 1, 3);
- * elm_spinner_special_value_add(sp, 1, "January");
- * elm_spinner_special_value_add(sp, 2, "February");
- * elm_spinner_special_value_add(sp, 3, "March");
- * evas_object_show(sp);
- * @endcode
- *
- * @note If another label was previously set to @p value, it will be replaced
- * by the new label.
- *
- * @see elm_spinner_special_value_get().
- * @see elm_spinner_special_value_del().
- *
- * @ingroup Spinner
- */
-EAPI void        elm_spinner_special_value_add(Evas_Object *obj, double value, const char *label);
-
-/**
- * Set whether the spinner can be directly edited by the user or not.
- *
- * @param obj The spinner object.
- * @param editable @c EINA_TRUE to allow users to edit it or @c EINA_FALSE to
- * don't allow users to edit it directly.
- *
- * Spinner objects can have edition @b disabled, in which state they will
- * be changed only by arrows.
- * Useful for contexts
- * where you don't want your users to interact with it writing the value.
- * Specially
- * when using special values, the user can see real value instead
- * of special label on edition.
- *
- * It's enabled by default.
- *
- * @see elm_spinner_editable_get()
- *
- * @ingroup Spinner
- */
-EAPI void        elm_spinner_editable_set(Evas_Object *obj, Eina_Bool editable);
-
-/**
- * Get whether the spinner can be directly edited by the user or not.
- *
- * @param obj The spinner object.
- * @return @c EINA_TRUE means edition is enabled. @c EINA_FALSE indicates
- * it's disabled. If @p obj is @c NULL, @c EINA_FALSE is returned.
- *
- * @see elm_spinner_editable_set() for details.
- *
- * @ingroup Spinner
- */
-EAPI Eina_Bool   elm_spinner_editable_get(const Evas_Object *obj);
-
-/**
- * Set the interval on time updates for an user mouse button hold
- * on spinner widgets' arrows.
- *
- * @param obj The spinner 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 spinner's value.
- *
- * This helps the user to get to a given value 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
- * @c 1.05, so it decreases a little bit.
- *
- * The default starting interval value for automatic changes is
- * @c 0.85 seconds.
- *
- * @see elm_spinner_interval_get()
- *
- * @ingroup Spinner
- */
-EAPI void        elm_spinner_interval_set(Evas_Object *obj, double interval);
-
-/**
- * Get the interval on time updates for an user mouse button hold
- * on spinner widgets' arrows.
- *
- * @param obj The spinner object.
- * @return The (first) interval value, in seconds, set on it.
- *
- * @see elm_spinner_interval_set() for more details.
- *
- * @ingroup Spinner
- */
-EAPI double      elm_spinner_interval_get(const Evas_Object *obj);
-
-/**
- * Set the base for rounding
- *
- * @param obj The spinner object
- * @param base The base value
- *
- * Rounding works as follows:
- *
- * rounded_val = base + (double)(((value - base) / round) * round)
- *
- * Where rounded_val, value and base are doubles, and round is an integer.
- *
- * This means that things will be rounded to increments (or decrements) of
- * "round" starting from value @p base. The default base for rounding is 0.
- *
- * Example: round = 3, base = 2
- * Values:  ..., -2, 0, 2, 5, 8, 11, 14, ...
- *
- * Example: round = 2, base = 5.5
- * Values: ..., -0.5, 1.5, 3.5, 5.5, 7.5, 9.5, 11.5, ...
- *
- * @see elm_spinner_round_get()
- * @see elm_spinner_base_get() too.
- *
- * @ingroup Spinner
- */
-EAPI void elm_spinner_base_set(Evas_Object *obj, double base);
-
-/**
- * Get the base for rounding
- *
- * @param obj The spinner object
- * @return The base rounding value
- *
- * This returns the base for rounding.
- *
- * @see elm_spinner_round_set() too.
- * @see elm_spinner_base_set() too.
- *
- * @ingroup Spinner
- */
-EAPI double elm_spinner_base_get(const Evas_Object *obj);
-
-/**
- * Set the round value for rounding
- *
- * @param obj The spinner object
- * @param rnd The rounding value
- *
- * Sets the rounding value used for value rounding in the spinner.
- *
- * @see elm_spinner_round_get()
- * @see elm_spinner_base_set()
- *
- * @ingroup Spinner
- */
-EAPI void elm_spinner_round_set(Evas_Object *obj, int rnd);
-
-/**
- * Get the round value for rounding
- *
- * @param obj The spinner object
- * @return The rounding value
- *
- * This returns the round value for rounding.
- *
- * @see elm_spinner_round_set() too.
- * @see elm_spinner_base_set() too.
- *
- * @ingroup Spinner
- */
-EAPI int elm_spinner_round_get(const Evas_Object *obj);
+#include "elm_spinner.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_systray_eo.h b/src/lib/elm_systray_eo.h
index da03523e3..5e124f395 100644
--- a/src/lib/elm_systray_eo.h
+++ b/src/lib/elm_systray_eo.h
@@ -3,295 +3,9 @@
  *
  * @{
  */
-#include "elm_systray.eo.h"
-#if 0
-#define ELM_OBJ_SYSTRAY_CLASS elm_obj_systray_class_get()
-
-const Eo_Class *elm_obj_systray_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_SYSTRAY_BASE_ID;
-
-enum
-{
-   ELM_OBJ_SYSTRAY_SUB_ID_CATEGORY_SET,
-   ELM_OBJ_SYSTRAY_SUB_ID_CATEGORY_GET,
-   ELM_OBJ_SYSTRAY_SUB_ID_STATUS_SET,
-   ELM_OBJ_SYSTRAY_SUB_ID_STATUS_GET,
-   ELM_OBJ_SYSTRAY_SUB_ID_ATT_ICON_NAME_SET,
-   ELM_OBJ_SYSTRAY_SUB_ID_ATT_ICON_NAME_GET,
-   ELM_OBJ_SYSTRAY_SUB_ID_ICON_NAME_SET,
-   ELM_OBJ_SYSTRAY_SUB_ID_ICON_NAME_GET,
-   ELM_OBJ_SYSTRAY_SUB_ID_ICON_THEME_PATH_SET,
-   ELM_OBJ_SYSTRAY_SUB_ID_ICON_THEME_PATH_GET,
-   ELM_OBJ_SYSTRAY_SUB_ID_ID_SET,
-   ELM_OBJ_SYSTRAY_SUB_ID_ID_GET,
-   ELM_OBJ_SYSTRAY_SUB_ID_TITLE_SET,
-   ELM_OBJ_SYSTRAY_SUB_ID_TITLE_GET,
-   ELM_OBJ_SYSTRAY_SUB_ID_MENU_SET,
-   ELM_OBJ_SYSTRAY_SUB_ID_MENU_GET,
-   ELM_OBJ_SYSTRAY_SUB_ID_REGISTER,
-   ELM_OBJ_SYSTRAY_SUB_ID_LAST
-};
-
-#define ELM_OBJ_SYSTRAY_ID(sub_id) (ELM_OBJ_SYSTRAY_BASE_ID + sub_id)
-
-/**
- * @def elm_obj_systray_category_set
- *
- * Set the category of the Status Notifier Item.
- *
- * @param[in] cat Category
- *
- * @see Elm_Systray_Category
- *
- * @since 1.8
- */
-#define elm_obj_systray_category_set(cat)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_CATEGORY_SET), \
-        EO_TYPECHECK(Elm_Systray_Category, cat)
-
-/**
- * @def elm_obj_systray_category_get
- *
- * Retrieve the category of the Status Notifier Item.
- *
- * @param[out] ret Category
- *
- * @see elm_obj_systray_category_set
- *
- * @since 1.8
- */
-#define elm_obj_systray_category_get(ret)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_CATEGORY_GET), \
-        EO_TYPECHECK(Elm_Systray_Category *, ret)
-
-/**
- * @def elm_obj_systray_status_set
- *
- * Set the status of the Status Notifier Item.
- *
- * @param[in] st Status
- *
- * @see Elm_Systray_Status
- *
- * @since 1.8
- */
-#define elm_obj_systray_status_set(st)                         \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_STATUS_SET), \
-        EO_TYPECHECK(Elm_Systray_Status, st)
-
-/**
- * @def elm_obj_systray_status_get
- *
- * Retrieve the status of the Status Notifier Item.
- *
- * @param[out] ret Status
- *
- * @see elm_obj_systray_status_set
- *
- * @since 1.8
- */
-#define elm_obj_systray_status_get(ret)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_STATUS_GET), \
-        EO_TYPECHECK(Elm_Systray_Status *, ret)
-
-/**
- * @def elm_obj_systray_att_icon_name_set
- *
- * Set the name of the attention icon to be used by the Status Notifier Item.
- *
- * @param[in] att_icon_name
- *
- * @see elm_obj_systray_att_icon_name_get
- *
- * @since 1.8
- */
-#define elm_obj_systray_att_icon_name_set(att_icon_name)              \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_ATT_ICON_NAME_SET), \
-        EO_TYPECHECK(const char *, att_icon_name)
-
-/**
- * @def elm_obj_systray_att_icon_name_get
- *
- * Retrieve the name of the attention icon used by the Status Notifier Item.
- *
- * @param[out] ret
- *
- * @see elm_obj_systray_att_icon_name_set
- *
- * @since 1.8
- */
-#define elm_obj_systray_att_icon_name_get(ret)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_ATT_ICON_NAME_GET), \
-        EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_systray_icon_name_set
- *
- * Set the name of the icon to be used by the Status Notifier Item.
- *
- * @param[in] icon_name
- *
- * @see elm_obj_systray_icon_name_get
- *
- * @since 1.8
- */
-#define elm_obj_systray_icon_name_set(icon_name)                  \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_ICON_NAME_SET), \
-        EO_TYPECHECK(const char *, icon_name)
-
-/**
- * @def elm_obj_systray_icon_name_get
- *
- * Retrieve the name of the icon used by the Status Notifier Item.
- *
- * @param[out] ret
- *
- * @see elm_obj_systray_icon_name_set
- *
- * @since 1.8
- */
-#define elm_obj_systray_icon_name_get(ret)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_ICON_NAME_GET), \
-        EO_TYPECHECK(const char **, ret)
 
-/**
- * @def elm_obj_systray_icon_theme_path_set
- *
- * Set the path to the theme where the icons can be found.
- * Set this value to "" to use the default path.
- *
- * @param[in] icon_theme_path
- *
- * @see elm_obj_systray_icon_theme_path_get
- *
- * @since 1.8
- */
-#define elm_obj_systray_icon_theme_path_set(icon_theme_path)            \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_ICON_THEME_PATH_SET), \
-        EO_TYPECHECK(const char *, icon_theme_path)
-
-/**
- * @def elm_obj_systray_icon_theme_path_get
- *
- * Retrieve the path to the icon's theme currently in use.
- *
- * @param[out] ret
- *
- * @see elm_obj_systray_icon_theme_path_set
- *
- * @since 1.8
- */
-#define elm_obj_systray_icon_theme_path_get(ret)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_ICON_THEME_PATH_GET), \
-        EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_systray_id_set
- *
- * Set the id of the Status Notifier Item.
- *
- * @param[in] id
- *
- * @see elm_obj_systray_id_get
- *
- * @since 1.8
- */
-#define elm_obj_systray_id_set(id)                         \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_ID_SET), \
-        EO_TYPECHECK(const char *, id)
-
-/**
- * @def elm_obj_systray_id_get
- *
- * Retrieve the id of the Status Notifier Item.
- *
- * @param[out] ret
- *
- * @see elm_obj_systray_id_set
- *
- * @since 1.8
- */
-#define elm_obj_systray_id_get(ret)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_ID_GET), \
-        EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_systray_title_set
- *
- * Set the title of the Status Notifier Item.
- *
- * @param[in] title
- *
- * @see elm_obj_systray_title_get
- *
- * @since 1.8
- */
-#define elm_obj_systray_title_set(title)                      \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_TITLE_SET), \
-        EO_TYPECHECK(const char *, title)
-
-/**
- * @def elm_obj_systray_title_get
- *
- * Retrieve the title of the Status Notifier Item.
- *
- * @param[out] ret
- *
- * @see elm_obj_systray_title_set
- *
- * @since 1.8
- */
-#define elm_obj_systray_title_get(ret)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_TITLE_GET), \
-        EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_systray_menu_set
- *
- * Set the object path of the D-Bus Menu that is to be show when the
- * Status Notifier Item is activated by the user.
- *
- * @param[in] menu
- *
- * @see elm_obj_systray_menu_get
- *
- * @since 1.8
- */
-#define elm_obj_systray_menu_set(menu)                       \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_MENU_SET), \
-        EO_TYPECHECK(const Eo *, menu)
-
-/**
- * @def elm_obj_systray_menu_get
- *
- * Retrieve the object path of the D-Bus Menu currently in use.
- *
- * @param[out] ret
- *
- * @see elm_obj_systray_menu_set
- *
- * @since 1.8
- */
-#define elm_obj_systray_menu_get(ret)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_MENU_GET), \
-        EO_TYPECHECK(const Eo **, ret)
+#include "elm_systray.eo.h"
 
 /**
- * @def elm_obj_systray_register
- *
- * Register this Status Notifier Item in the System Tray Watcher.
- * This function should only be called after the event
- * ELM_EVENT_SYSTRAY_READY is emitted.
- *
- * @param[out] ret
- *
- * @since 1.8
- */
-#define elm_obj_systray_register(ret)                        \
-        ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_REGISTER), \
-        EO_TYPECHECK(Eina_Bool *, ret)
-#endif
-/**
  * @}
  */
diff --git a/src/lib/elm_table_eo.h b/src/lib/elm_table_eo.h
index f3ae2d473..1ea5ba01d 100644
--- a/src/lib/elm_table_eo.h
+++ b/src/lib/elm_table_eo.h
@@ -1,181 +1 @@
-#include "elm_table.eo.h"
-
-#if 0
-#define ELM_OBJ_TABLE_CLASS elm_obj_table_class_get()
-
-const Eo_Class *elm_obj_table_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_TABLE_BASE_ID;
-
-enum
-{
-   ELM_OBJ_TABLE_SUB_ID_HOMOGENEOUS_SET,
-   ELM_OBJ_TABLE_SUB_ID_HOMOGENEOUS_GET,
-   ELM_OBJ_TABLE_SUB_ID_PADDING_SET,
-   ELM_OBJ_TABLE_SUB_ID_PADDING_GET,
-   ELM_OBJ_TABLE_SUB_ID_PACK,
-   ELM_OBJ_TABLE_SUB_ID_UNPACK,
-   ELM_OBJ_TABLE_SUB_ID_PACK_SET,
-   ELM_OBJ_TABLE_SUB_ID_PACK_GET,
-   ELM_OBJ_TABLE_SUB_ID_CLEAR,
-   ELM_OBJ_TABLE_SUB_ID_CHILD_GET,
-   ELM_OBJ_TABLE_SUB_ID_LAST
-};
-
-#define ELM_OBJ_TABLE_ID(sub_id) (ELM_OBJ_TABLE_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_table_homogeneous_set
- * @since 1.8
- *
- * @brief Set the homogeneous layout in the table
- *
- * @param[in] homogeneous
- *
- * @see elm_table_homogeneous_set
- *
- * @ingroup Table
- */
-#define elm_obj_table_homogeneous_set(homogeneous) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_HOMOGENEOUS_SET), EO_TYPECHECK(Eina_Bool, homogeneous)
-
-/**
- * @def elm_obj_table_homogeneous_get
- * @since 1.8
- *
- * @brief Get the current table homogeneous mode.
- *
- * @param[out] ret
- *
- * @see elm_table_homogeneous_get
- *
- * @ingroup Table
- */
-#define elm_obj_table_homogeneous_get(ret) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_HOMOGENEOUS_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_table_padding_set
- * @since 1.8
- *
- * @brief Set padding between cells.
- *
- * @param[in] horizontal
- * @param[in] vertical
- *
- * @see elm_table_padding_set
- *
- * @ingroup Table
- */
-#define elm_obj_table_padding_set(horizontal, vertical) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_PADDING_SET), EO_TYPECHECK(Evas_Coord, horizontal), EO_TYPECHECK(Evas_Coord, vertical)
-
-/**
- * @def elm_obj_table_padding_get
- * @since 1.8
- *
- * @brief Get padding between cells.
- *
- * @param[out] horizontal
- * @param[out] vertical
- *
- * @see elm_table_padding_get
- *
- * @ingroup Table
- */
-#define elm_obj_table_padding_get(horizontal, vertical) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_PADDING_GET), EO_TYPECHECK(Evas_Coord *, horizontal), EO_TYPECHECK(Evas_Coord *, vertical)
-
-/**
- * @def elm_obj_table_pack
- * @since 1.8
- *
- * @brief Add a subobject on the table with the coordinates passed
- *
- * @param[in] subobj
- * @param[in] column
- * @param[in] row
- * @param[in] colspan
- * @param[in] rowspan
- *
- * @see elm_table_pack
- *
- * @ingroup Table
- */
-#define elm_obj_table_pack(subobj, column, row, colspan, rowspan) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_PACK), EO_TYPECHECK(Evas_Object *, subobj), EO_TYPECHECK(int, column), EO_TYPECHECK(int, row), EO_TYPECHECK(int, colspan), EO_TYPECHECK(int, rowspan)
-
-/**
- * @def elm_obj_table_unpack
- * @since 1.8
- *
- * @brief Remove child from table.
- *
- * @param[in] subobj
- *
- * @see elm_table_unpack
- *
- * @ingroup Table
- */
-#define elm_obj_table_unpack(subobj) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_UNPACK), EO_TYPECHECK(Evas_Object *, subobj)
-
-/**
- * @def elm_obj_table_pack_set
- * @since 1.8
- *
- * @brief Set the packing location of an existing child of the table
- *
- * @param[in] subobj
- * @param[in] column
- * @param[in] row
- * @param[in] colspan
- * @param[in] rowspan
- *
- * @see elm_table_pack_set
- *
- * @ingroup Table
- */
-#define elm_obj_table_pack_set(subobj, column, row, colspan, rowspan) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_PACK_SET), EO_TYPECHECK(Evas_Object *, subobj), EO_TYPECHECK(int, column), EO_TYPECHECK(int, row), EO_TYPECHECK(int, colspan), EO_TYPECHECK(int, rowspan)
-
-/**
- * @def elm_obj_table_pack_get
- * @since 1.8
- *
- * @brief Get the packing location of an existing child of the table
- *
- * @param[in] subobj
- * @param[out] column
- * @param[out] row
- * @param[out] colspan
- * @param[out] rowspan
- *
- * @see elm_table_pack_get
- *
- * @ingroup Table
- */
-#define elm_obj_table_pack_get(subobj, column, row, colspan, rowspan) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_PACK_GET), EO_TYPECHECK(Evas_Object *, subobj), EO_TYPECHECK(int *, column), EO_TYPECHECK(int *, row), EO_TYPECHECK(int *, colspan), EO_TYPECHECK(int *, rowspan)
-
-/**
- * @def elm_obj_table_clear
- * @since 1.8
- *
- * @brief Faster way to remove all child objects from a table object.
- *
- * @param[in] clear
- *
- * @see elm_table_clear
- *
- * @ingroup Table
- */
-#define elm_obj_table_clear(clear) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_CLEAR), EO_TYPECHECK(Eina_Bool, clear)
-
-/**
- * @def elm_obj_table_child_get
- * @since 1.8
- *
- * @brief Get child object of table at given coordinates.
- *
- * @param[in] col column number of child object
- * @param[in] row row number of child object
- * @param[out] ret object at given col and row
- *
- * @ingroup Table
- */
-#define elm_obj_table_child_get(col, row, ret) ELM_OBJ_TABLE_ID(ELM_OBJ_TABLE_SUB_ID_CHILD_GET), EO_TYPECHECK(int, col), EO_TYPECHECK(int, row), EO_TYPECHECK(Evas_Object **, ret)
-#endif
+#include "elm_table.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_table_legacy.h b/src/lib/elm_table_legacy.h
index 0ff6b49f1..48c3fac0b 100644
--- a/src/lib/elm_table_legacy.h
+++ b/src/lib/elm_table_legacy.h
@@ -9,86 +9,6 @@
 EAPI Evas_Object *elm_table_add(Evas_Object *parent);
 
 /**
- * @brief Set the homogeneous layout in the table
- *
- * @param obj The layout object
- * @param homogeneous A boolean to set if the layout is homogeneous in the
- * table (EINA_TRUE = homogeneous,  EINA_FALSE = no homogeneous)
- *
- * @ingroup Table
- */
-EAPI void      elm_table_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-
-/**
- * @brief Get the current table homogeneous mode.
- *
- * @param obj The table object
- * @return A boolean to indicating if the layout is homogeneous in the table
- * (EINA_TRUE = homogeneous,  EINA_FALSE = no homogeneous)
- *
- * @ingroup Table
- */
-EAPI Eina_Bool elm_table_homogeneous_get(const Evas_Object *obj);
-
-/**
- * @brief Set padding between cells.
- *
- * @param obj The layout object.
- * @param horizontal set the horizontal padding.
- * @param vertical set the vertical padding.
- *
- * Default value is 0.
- *
- * @ingroup Table
- */
-EAPI void      elm_table_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical);
-
-/**
- * @brief Get padding between cells.
- *
- * @param obj The layout object.
- * @param horizontal set the horizontal padding.
- * @param vertical set the vertical padding.
- *
- * @ingroup Table
- */
-EAPI void      elm_table_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical);
-
-/**
- * @brief Add a subobject on the table with the coordinates passed
- *
- * @param obj The table object
- * @param subobj The subobject to be added to the table
- * @param col Column number
- * @param row Row number
- * @param colspan colspan
- * @param rowspan rowspan
- *
- * @note All positioning inside the table is relative to rows and columns, so
- * a value of 0 for x and y, means the top left cell of the table, and a
- * value of 1 for w and h means @p subobj only takes that 1 cell.
- *
- * Note that columns and rows only guarantee 16bit unsigned values at best.
- * That means that col + colspan AND row + rowspan must fit inside 16bit
- * unsigned values cleanly. You will be warned once values exceed 15bit
- * storage, and attempting to use values not able to fit in 16bits will
- * result in failure.
- *
- * @ingroup Table
- */
-EAPI void      elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int col, int row, int colspan, int rowspan);
-
-/**
- * @brief Remove child from table.
- *
- * @param obj The table object
- * @param subobj The subobject
- *
- * @ingroup Table
- */
-EAPI void      elm_table_unpack(Evas_Object *obj, Evas_Object *subobj);
-
-/**
  * @brief Set the packing location of an existing child of the table
  *
  * @param subobj The subobject to be modified in the table
@@ -122,23 +42,4 @@ EAPI void      elm_table_pack_set(Evas_Object *subobj, int col, int row, int col
  */
 EAPI void      elm_table_pack_get(Evas_Object *subobj, int *col, int *row, int *colspan, int *rowspan);
 
-/**
- * @brief Faster way to remove all child objects from a table object.
- *
- * @param obj The table object
- * @param clear If true, will delete children, else just remove from table.
- *
- * @ingroup Table
- */
-EAPI void      elm_table_clear(Evas_Object *obj, Eina_Bool clear);
-
-/**
- * @brief Get child object of table at given coordinates.
- *
- * @param obj The table object
- * @param col Column number of child object
- * @param row Row number of child object
- *
- * @return Child of object if find if not return NULL.
- */
-EAPI Evas_Object *elm_table_child_get(const Evas_Object *obj, int col, int row);
+#include "elm_table.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_thumb_eo.h b/src/lib/elm_thumb_eo.h
index b74df465d..f446b3a67 100644
--- a/src/lib/elm_thumb_eo.h
+++ b/src/lib/elm_thumb_eo.h
@@ -1,379 +1 @@
-#include "elm_thumb.eo.h"
-#if 0
-#define ELM_OBJ_THUMB_CLASS elm_obj_thumb_class_get()
-
-const Eo_Class *elm_obj_thumb_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_THUMB_BASE_ID;
-
-enum
-{
-   ELM_OBJ_THUMB_SUB_ID_RELOAD,
-   ELM_OBJ_THUMB_SUB_ID_FILE_SET,
-   ELM_OBJ_THUMB_SUB_ID_FILE_GET,
-   ELM_OBJ_THUMB_SUB_ID_PATH_GET,
-   ELM_OBJ_THUMB_SUB_ID_ASPECT_SET,
-   ELM_OBJ_THUMB_SUB_ID_ASPECT_GET,
-   ELM_OBJ_THUMB_SUB_ID_FDO_SIZE_SET,
-   ELM_OBJ_THUMB_SUB_ID_FDO_SIZE_GET,
-   ELM_OBJ_THUMB_SUB_ID_FORMAT_SET,
-   ELM_OBJ_THUMB_SUB_ID_FORMAT_GET,
-   ELM_OBJ_THUMB_SUB_ID_ORIENTATION_SET,
-   ELM_OBJ_THUMB_SUB_ID_ORIENTATION_GET,
-   ELM_OBJ_THUMB_SUB_ID_CROP_ALIGN_SET,
-   ELM_OBJ_THUMB_SUB_ID_CROP_ALIGN_GET,
-   ELM_OBJ_THUMB_SUB_ID_SIZE_SET,
-   ELM_OBJ_THUMB_SUB_ID_SIZE_GET,
-   ELM_OBJ_THUMB_SUB_ID_COMPRESS_SET,
-   ELM_OBJ_THUMB_SUB_ID_COMPRESS_GET,
-   ELM_OBJ_THUMB_SUB_ID_QUALITY_SET,
-   ELM_OBJ_THUMB_SUB_ID_QUALITY_GET,
-   ELM_OBJ_THUMB_SUB_ID_ANIMATE_SET,
-   ELM_OBJ_THUMB_SUB_ID_ANIMATE_GET,
-   ELM_OBJ_THUMB_SUB_ID_EDITABLE_SET,
-   ELM_OBJ_THUMB_SUB_ID_EDITABLE_GET,
-   ELM_OBJ_THUMB_SUB_ID_LAST
-};
-
-#define ELM_OBJ_THUMB_ID(sub_id) (ELM_OBJ_THUMB_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_thumb_reload
- * @since 1.8
- *
- * Reload thumbnail if it was generated before.
- *
- *
- * @see elm_thumb_reload
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_reload() ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_RELOAD)
-
-/**
- * @def elm_obj_thumb_file_set
- * @since 1.8
- *
- * Set the file that will be used as thumbnail source.
- *
- * @param[in] file
- * @param[in] key
- *
- * @see elm_thumb_file_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_file_set(file, key) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_FILE_SET), EO_TYPECHECK(const char *, file), EO_TYPECHECK(const char *, key)
-
-/**
- * @def elm_obj_thumb_file_get
- * @since 1.8
- *
- * Get the image or video path and key used to generate the thumbnail.
- *
- * @param[out] file
- * @param[out] key
- *
- * @see elm_thumb_file_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_file_get(file, key) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_FILE_GET), EO_TYPECHECK(const char **, file), EO_TYPECHECK(const char **, key)
-
-/**
- * @def elm_obj_thumb_path_get
- * @since 1.8
- *
- * Get the path and key to the image or video thumbnail generated by ethumb.
- *
- * @param[out] file
- * @param[out] key
- *
- * @see elm_thumb_path_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_path_get(file, key) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_PATH_GET), EO_TYPECHECK(const char **, file), EO_TYPECHECK(const char **, key)
-
-/**
- * @def elm_obj_thumb_aspect_set
- * @since 1.8
- *
- * Set the aspect for the thumb object
- *
- * @param[in] setting
- *
- * @see elm_thumb_aspect_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_aspect_set(aspect) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_ASPECT_SET), EO_TYPECHECK(Ethumb_Thumb_Aspect, aspect)
-
-/**
- * @def elm_obj_thumb_aspect_get
- * @since 1.8
- *
- * Get the aspect of the thumb object
- * @param[out] ret
- *
- * @see elm_thumb_aspect_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_aspect_get(ret) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_ASPECT_GET), EO_TYPECHECK(Ethumb_Thumb_Aspect *, ret)
-
-/**
- * @def elm_obj_thumb_fdo_size_set
- * @since 1.8
- *
- * Set the fdo size for the thumb object
- *
- * @param[in] setting
- *
- * @see elm_thumb_fdo_size_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_fdo_size_set(size) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_FDO_SIZE_SET), EO_TYPECHECK(Ethumb_Thumb_FDO_Size, size)
-
-/**
- * @def elm_obj_thumb_fdo_size_get
- * @since 1.8
- *
- * Get the fdo size of the thumb object
- * @param[out] ret
- *
- * @see elm_thumb_fdo_size_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_fdo_size_get(ret) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_FDO_SIZE_GET), EO_TYPECHECK(Ethumb_Thumb_FDO_Size *, ret)
-
-/**
- * @def elm_obj_thumb_format_set
- * @since 1.8
- *
- * Set the format for the thumb object
- *
- * @param[in] setting
- *
- * @see elm_thumb_format_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_format_set(format) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_FORMAT_SET), EO_TYPECHECK(Ethumb_Thumb_Format, format)
-
-/**
- * @def elm_obj_thumb_format_get
- * @since 1.8
- *
- * Get the format of the thumb object
- * @param[out] ret
- *
- * @see elm_thumb_format_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_format_get(ret) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_FORMAT_GET), EO_TYPECHECK(Ethumb_Thumb_Format *, ret)
-
-/**
- * @def elm_obj_thumb_orientation_set
- * @since 1.8
- *
- * Set the orientation for the thumb object
- *
- * @param[in] setting
- *
- * @see elm_thumb_orientation_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_orientation_set(orient) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_ORIENTATION_SET), EO_TYPECHECK(Ethumb_Thumb_Orientation, orient)
-
-/**
- * @def elm_obj_thumb_orientation_get
- * @since 1.8
- *
- * Get the orientation of the thumb object
- * @param[out] ret
- *
- * @see elm_thumb_orientaion_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_orientation_get(ret) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_ORIENTATION_GET), EO_TYPECHECK(Ethumb_Thumb_Orientation *, ret)
-
-/**
- * @def elm_obj_thumb_size_set
- * @since 1.8
- *
- * Set the width and height of the thumbnail
- *
- * @param[in] width
- * @param[in] height
- *0
- * @see elm_thumb_size_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_size_set(tw, th) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_SIZE_SET), EO_TYPECHECK(int, tw), EO_TYPECHECK(int, th)
-
-/**
- * @def elm_obj_thumb_size_get
- * @since 1.8
- *
- * Get the size of the thumbnail.
- *
- * @param[out] tw
- * @param[out] th
- *
- * @see elm_thumb_size_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_size_get(tw, th) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_SIZE_GET), EO_TYPECHECK(int *, tw), EO_TYPECHECK(int *, th)
-
-/**
- * @def elm_obj_thumb_crop_align_set
- * @since 1.8
- *
- * Set the crop alignment of the thumbnail
- *
- * @param[in] x coordinate
- * @param[in] y coordinate
- *
- * @see elm_thumb_crop_align_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_crop_align_set(cropx, cropy) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_CROP_ALIGN_SET), EO_TYPECHECK(double, cropx), EO_TYPECHECK(double, cropy)
-
-/**
- * @def elm_obj_thumb_crop_align_get
- * @since 1.8
- *
- * Get the crop alignment of the thumbnail.
- *
- * @param[out] cropx
- * @param[out] cropy
- *
- * @see elm_thumb_crop_align_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_crop_align_get(cropx, cropy) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_CROP_ALIGN_GET), EO_TYPECHECK(double *, cropx), EO_TYPECHECK(double *, cropy)
-
-/**
- * @def elm_obj_thumb_compress_set
- * @since 1.8
- *
- * Set the compression of the thumbnail
- *
- * @param[in] compress
- *
- * @see elm_thumb_compress_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_compress_set(compress) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_COMPRESS_SET), EO_TYPECHECK(int, compress)
-
-/**
- * @def elm_obj_thumb_compress_get
- * @since 1.8
- *
- * Get the compression of the thumbnail.
- *
- * @param[out] compress
- *
- * @see elm_thumb_compress_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_compress_get(compress) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_COMPRESS_GET), EO_TYPECHECK(int *, compress)
-
-/**
- * @def elm_obj_thumb_quality_set
- * @since 1.8
- *
- * Set the quality of the thumbnail
- *
- * @param[in] quality
- *
- * @see elm_thumb_quality_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_quality_set(quality) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_QUALITY_SET), EO_TYPECHECK(int, quality)
-
-/**
- * @def elm_obj_thumb_quality_get
- * @since 1.8
- *
- * Get the quality of the thumbnail.
- *
- * @param[out] quality
- *
- * @see elm_thumb_quality_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_quality_get(quality) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_QUALITY_GET), EO_TYPECHECK(int *, quality)
-
-/**
- * @def elm_obj_thumb_animate_set
- * @since 1.8
- *
- * Set the animation state for the thumb object. If its content is an animated
- *
- * @param[in] setting
- *
- * @see elm_thumb_animate_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_animate_set(setting) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_ANIMATE_SET), EO_TYPECHECK(Elm_Thumb_Animation_Setting, setting)
-
-/**
- * @def elm_obj_thumb_animate_get
- * @since 1.8
- *
- * Get the animation state for the thumb object.
- *
- * @param[out] ret
- *
- * @see elm_thumb_animate_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_animate_get(ret) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_ANIMATE_GET), EO_TYPECHECK(Elm_Thumb_Animation_Setting *, ret)
-
-/**
- * @def elm_obj_thumb_editable_set
- * @since 1.8
- *
- * Make the thumbnail 'editable'.
- *
- * @param[in] edit
- * @param[out] ret
- *
- * @see elm_thumb_editable_set
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_editable_set(edit, ret) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_EDITABLE_SET), EO_TYPECHECK(Eina_Bool, edit), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_thumb_editable_get
- * @since 1.8
- *
- * Make the thumbnail 'editable'.
- *
- * @param[out] ret
- *
- * @see elm_thumb_editable_get
- *
- * @ingroup Thumb
- */
-#define elm_obj_thumb_editable_get(ret) ELM_OBJ_THUMB_ID(ELM_OBJ_THUMB_SUB_ID_EDITABLE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-#endif
+#include "elm_thumb.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_thumb_legacy.h b/src/lib/elm_thumb_legacy.h
index c649115c2..313c8055c 100644
--- a/src/lib/elm_thumb_legacy.h
+++ b/src/lib/elm_thumb_legacy.h
@@ -11,338 +11,4 @@
  */
 EAPI Evas_Object                *elm_thumb_add(Evas_Object *parent);
 
-/**
- * Reload thumbnail if it was generated before.
- *
- * @param obj The thumb object to reload
- *
- * This is useful if the ethumb client configuration changed, like its
- * size, aspect or any other property one set in the handle returned
- * by elm_thumb_ethumb_client_get().
- *
- * If the options didn't change, the thumbnail won't be generated again, but
- * the old one will still be used.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_reload(Evas_Object *obj);
-
-/**
- * Set the file that will be used as thumbnail @b source.
- *
- * @param obj The thumb object.
- * @param file The path to file that will be used as thumbnail source.
- * @param key The key used in case of an EET file.
- *
- * The file can be an image or a video (in that case, acceptable
- * extensions are: avi, mp4, ogv, mov, mpg and wmv). To start the
- * video animation, use the function elm_thumb_animate().
- *
- * @see elm_thumb_file_get()
- * @see elm_thumb_reload()
- * @see elm_thumb_animate()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_file_set(Evas_Object *obj, const char *file, const char *key);
-
-/**
- * Get the image or video path and key used to generate the thumbnail.
- *
- * @param obj The thumb object.
- * @param file Pointer to filename.
- * @param key Pointer to key.
- *
- * @see elm_thumb_file_set()
- * @see elm_thumb_path_get()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_file_get(const Evas_Object *obj, const char **file, const char **key);
-
-/**
- * Get the path and key to the image or video thumbnail generated by ethumb.
- *
- * One just needs to make sure that the thumbnail was generated before getting
- * its path; otherwise, the path will be NULL. One way to do that is by asking
- * for the path when/after the "generate,stop" smart callback is called.
- *
- * @param obj The thumb object.
- * @param file Pointer to thumb path.
- * @param key Pointer to thumb key.
- *
- * @see elm_thumb_file_get()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_path_get(const Evas_Object *obj, const char **file, const char **key);
-
-/**
- * Set the aspect for the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @param aspect The aspect setting.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_aspect_set(Evas_Object *obj, Ethumb_Thumb_Aspect aspect);
-
-/**
- * Get the aspect of the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @return getting The aspect setting.
- *
- * @see elm_thumb_aspect_set()
- *
- * @ingroup Thumb
- */
-EAPI Ethumb_Thumb_Aspect elm_thumb_aspect_get(const Evas_Object *obj);
-
-/**
- * Set the FDO size for the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @param size The FDO size setting.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_fdo_size_set(Evas_Object *obj, Ethumb_Thumb_FDO_Size size);
-
-/**
- * Get the fdo size of the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @return getting The FDO size setting.
- *
- * @see elm_thumb_fdo_size_set()
- *
- * @ingroup Thumb
- */
-EAPI Ethumb_Thumb_FDO_Size elm_thumb_fdo_size_get(const Evas_Object *obj);
-
-/**
- * Set the format for the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @param size The format setting.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_format_set(Evas_Object *obj, Ethumb_Thumb_Format format);
-
-/**
- * Get the format of the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @return getting The Format setting.
- *
- * @see elm_thumb_format_set()
- *
- * @ingroup Thumb
- */
-EAPI Ethumb_Thumb_Format elm_thumb_format_get(const Evas_Object *obj);
-
-/**
- * Set the orientation for the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @param size The orientation setting.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_orientation_set(Evas_Object *obj, Ethumb_Thumb_Orientation orient);
-
-/**
- * Get the orientation of the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @return getting The orientation setting.
- *
- * @see elm_thumb_orientation_set()
- *
- * @ingroup Thumb
- */
-EAPI Ethumb_Thumb_Orientation elm_thumb_orientation_get(const Evas_Object *obj);
-
-/**
- * Set the size for the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @param tw The width of the thumb.
- * @param th The height of the thumb.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_size_set(Evas_Object *obj, int tw, int th);
-
-/**
- * Get the size of the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @return getting The size setting.
- *
- * @see elm_thumb_size_set()
- *
- * @ingroup Thumb
- */
-EAPI void elm_thumb_size_get(const Evas_Object *obj, int *tw, int *th);
-
-/**
- * Set the crop alignment for the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @param cropx The x coordinate of the crop.
- * @param cropy The y coordinate of the crop.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_crop_align_set(Evas_Object *obj, double cropx, double cropy);
-
-/**
- * Get the crop alignment of the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @return getting The crop align setting.
- *
- * @see elm_thumb_crop_align_set()
- *
- * @ingroup Thumb
- */
-EAPI void elm_thumb_crop_align_get(const Evas_Object *obj, double *cropx, double *cropy);
-
-/**
- * Set the compression for the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @param compress The compression of the thumb.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_compress_set(Evas_Object *obj, int compress);
-
-/**
- * Get the compression of the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @return getting The compress setting.
- *
- * @see elm_thumb_compress_set()
- *
- * @ingroup Thumb
- */
-EAPI void elm_thumb_compress_get(const Evas_Object *obj, int *compress);
-
-
-/**
- * Set the quality for the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @param quality The quality of the thumb.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_quality_set(Evas_Object *obj, int quality);
-
-/**
- * Get the quality of the thumb object.
- * @since 1.8
- *
- * @param obj The thumb object.
- * @return getting The quality setting.
- *
- * @see elm_thumb_quality_set()
- *
- * @ingroup Thumb
- */
-EAPI void elm_thumb_quality_get(const Evas_Object *obj, int *quality);
-
-/**
- * Set the animation state for the thumb object. If its content is an animated
- * video, you may start/stop the animation or tell it to play continuously and
- * looping.
- *
- * @param obj The thumb object.
- * @param s The animation setting.
- *
- * @see elm_thumb_file_set()
- *
- * @ingroup Thumb
- */
-EAPI void                        elm_thumb_animate_set(Evas_Object *obj, Elm_Thumb_Animation_Setting s);
-
-/**
- * Get the animation state for the thumb object.
- *
- * @param obj The thumb object.
- * @return getting The animation setting or @c ELM_THUMB_ANIMATION_LAST,
- * on errors.
- *
- * @see elm_thumb_animate_set()
- *
- * @ingroup Thumb
- */
-EAPI Elm_Thumb_Animation_Setting elm_thumb_animate_get(const Evas_Object *obj);
-
-/**
- * Make the thumbnail 'editable'.
- *
- * @param obj Thumb object.
- * @param edit Turn on or off editability. Default is @c EINA_FALSE.
- *
- * This means the thumbnail is a valid drag target for drag and drop, and can be
- * cut or pasted too.
- *
- * @see elm_thumb_editable_get()
- *
- * @ingroup Thumb
- */
-EAPI Eina_Bool                   elm_thumb_editable_set(Evas_Object *obj, Eina_Bool edit);
-
-/**
- * Make the thumbnail 'editable'.
- *
- * @param obj Thumb object.
- * @return Editability.
- *
- * This means the thumbnail is a valid drag target for drag and drop, and can be
- * cut or pasted too.
- *
- * @see elm_thumb_editable_set()
- *
- * @ingroup Thumb
- */
-EAPI Eina_Bool                   elm_thumb_editable_get(const Evas_Object *obj);
+#include "elm_thumb.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_toolbar_eo.h b/src/lib/elm_toolbar_eo.h
index 9b5eb275a..7d3cf2427 100644
--- a/src/lib/elm_toolbar_eo.h
+++ b/src/lib/elm_toolbar_eo.h
@@ -3,408 +3,9 @@
  *
  * @{
  */
-#include "elm_toolbar.eo.h"
-#if 0
-#define ELM_OBJ_TOOLBAR_CLASS elm_obj_toolbar_class_get()
-
-const Eo_Class *elm_obj_toolbar_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_TOOLBAR_BASE_ID;
-
-enum
-{
-   ELM_OBJ_TOOLBAR_SUB_ID_ICON_SIZE_SET,
-   ELM_OBJ_TOOLBAR_SUB_ID_ICON_SIZE_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_ITEM_APPEND,
-   ELM_OBJ_TOOLBAR_SUB_ID_ITEM_PREPEND,
-   ELM_OBJ_TOOLBAR_SUB_ID_ITEM_INSERT_BEFORE,
-   ELM_OBJ_TOOLBAR_SUB_ID_ITEM_INSERT_AFTER,
-   ELM_OBJ_TOOLBAR_SUB_ID_FIRST_ITEM_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_LAST_ITEM_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_ITEM_FIND_BY_LABEL,
-   ELM_OBJ_TOOLBAR_SUB_ID_SELECTED_ITEM_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_MORE_ITEM_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_SHRINK_MODE_SET,
-   ELM_OBJ_TOOLBAR_SUB_ID_SHRINK_MODE_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_HOMOGENEOUS_SET,
-   ELM_OBJ_TOOLBAR_SUB_ID_HOMOGENEOUS_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_MENU_PARENT_SET,
-   ELM_OBJ_TOOLBAR_SUB_ID_MENU_PARENT_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_ALIGN_SET,
-   ELM_OBJ_TOOLBAR_SUB_ID_ALIGN_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_ICON_ORDER_LOOKUP_SET,
-   ELM_OBJ_TOOLBAR_SUB_ID_ICON_ORDER_LOOKUP_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_HORIZONTAL_SET,
-   ELM_OBJ_TOOLBAR_SUB_ID_HORIZONTAL_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_ITEMS_COUNT,
-   ELM_OBJ_TOOLBAR_SUB_ID_STANDARD_PRIORITY_SET,
-   ELM_OBJ_TOOLBAR_SUB_ID_STANDARD_PRIORITY_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_SELECT_MODE_SET,
-   ELM_OBJ_TOOLBAR_SUB_ID_SELECT_MODE_GET,
-   ELM_OBJ_TOOLBAR_SUB_ID_LAST
-};
-
-#define ELM_OBJ_TOOLBAR_ID(sub_id) (ELM_OBJ_TOOLBAR_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_toolbar_icon_size_set
- * @since 1.8
- *
- * Set the icon size, in pixels, to be used by toolbar items.
- *
- * @param[in] icon_size
- *
- * @see elm_toolbar_icon_size_set
- */
-#define elm_obj_toolbar_icon_size_set(icon_size) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ICON_SIZE_SET), EO_TYPECHECK(int, icon_size)
-
-/**
- * @def elm_obj_toolbar_icon_size_get
- * @since 1.8
- *
- * Get the icon size, in pixels, to be used by toolbar items.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_icon_size_get
- */
-#define elm_obj_toolbar_icon_size_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ICON_SIZE_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_toolbar_item_append
- * @since 1.8
- *
- * Append item to the toolbar.
- *
- * @param[in] icon
- * @param[in] label
- * @param[in] func
- * @param[in] data
- * @param[out] ret
- *
- * @see elm_toolbar_item_append
- */
-#define elm_obj_toolbar_item_append(icon, label, func, data, ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ITEM_APPEND), EO_TYPECHECK(const char *, icon), EO_TYPECHECK(const char *, label), EO_TYPECHECK(Evas_Smart_Cb, func), EO_TYPECHECK(const void *, data), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_toolbar_item_prepend
- * @since 1.8
- *
- * Prepend item to the toolbar.
- *
- * @param[in] icon
- * @param[in] label
- * @param[in] func
- * @param[in] data
- * @param[out] ret
- *
- * @see elm_toolbar_item_prepend
- */
-#define elm_obj_toolbar_item_prepend(icon, label, func, data, ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ITEM_PREPEND), EO_TYPECHECK(const char *, icon), EO_TYPECHECK(const char *, label), EO_TYPECHECK(Evas_Smart_Cb, func), EO_TYPECHECK(const void *, data), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_toolbar_item_insert_before
- * @since 1.8
- *
- * Insert a new item into the toolbar object before item before.
- *
- * @param[in] before
- * @param[in] icon
- * @param[in] label
- * @param[in] func
- * @param[in] data
- * @param[out] ret
- *
- * @see elm_toolbar_item_insert_before
- */
-#define elm_obj_toolbar_item_insert_before(before, icon, label, func, data, ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ITEM_INSERT_BEFORE), EO_TYPECHECK(Elm_Object_Item *, before), EO_TYPECHECK(const char *, icon), EO_TYPECHECK(const char *, label), EO_TYPECHECK(Evas_Smart_Cb, func), EO_TYPECHECK(const void *, data), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_toolbar_item_insert_after
- * @since 1.8
- *
- * Insert a new item into the toolbar object after item after.
- *
- * @param[in] after
- * @param[in] icon
- * @param[in] label
- * @param[in] func
- * @param[in] data
- * @param[out] ret
- *
- * @see elm_toolbar_item_insert_after
- */
-#define elm_obj_toolbar_item_insert_after(after, icon, label, func, data, ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ITEM_INSERT_AFTER), EO_TYPECHECK(Elm_Object_Item *, after), EO_TYPECHECK(const char *, icon), EO_TYPECHECK(const char *, label), EO_TYPECHECK(Evas_Smart_Cb, func), EO_TYPECHECK(const void *, data), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_toolbar_first_item_get
- * @since 1.8
- *
- * Get the first item in the given toolbar widget's list of
- * items.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_first_item_get
- */
-#define elm_obj_toolbar_first_item_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_FIRST_ITEM_GET), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_toolbar_last_item_get
- * @since 1.8
- *
- * Get the last item in the given toolbar widget's list of
- * items.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_last_item_get
- */
-#define elm_obj_toolbar_last_item_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_LAST_ITEM_GET), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_toolbar_item_find_by_label
- * @since 1.8
- *
- * Returns a pointer to a toolbar item by its label.
- *
- * @param[in] label
- * @param[out] ret
- *
- * @see elm_toolbar_item_find_by_label
- */
-#define elm_obj_toolbar_item_find_by_label(label, ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ITEM_FIND_BY_LABEL), EO_TYPECHECK(const char *, label), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_toolbar_selected_item_get
- * @since 1.8
- *
- * Get the selected item.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_selected_item_get
- */
-#define elm_obj_toolbar_selected_item_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_SELECTED_ITEM_GET), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_toolbar_more_item_get
- * @since 1.8
- *
- * Get the more item.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_more_item_get
- */
-#define elm_obj_toolbar_more_item_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_MORE_ITEM_GET), EO_TYPECHECK(Elm_Object_Item **, ret)
-
-/**
- * @def elm_obj_toolbar_shrink_mode_set
- * @since 1.8
- *
- * Set the item displaying mode of a given toolbar widget obj.
- *
- * @param[in] shrink_mode
- *
- * @see elm_toolbar_shrink_mode_set
- */
-#define elm_obj_toolbar_shrink_mode_set(shrink_mode) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_SHRINK_MODE_SET), EO_TYPECHECK(Elm_Toolbar_Shrink_Mode, shrink_mode)
-
-/**
- * @def elm_obj_toolbar_shrink_mode_get
- * @since 1.8
- *
- * Get the shrink mode of toolbar obj.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_shrink_mode_get
- */
-#define elm_obj_toolbar_shrink_mode_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_SHRINK_MODE_GET), EO_TYPECHECK(Elm_Toolbar_Shrink_Mode *, ret)
-
-/**
- * @def elm_obj_toolbar_homogeneous_set
- * @since 1.8
- *
- * Enable/disable homogeneous mode.
- *
- * @param[in] homogeneous
- *
- * @see elm_toolbar_homogeneous_set
- */
-#define elm_obj_toolbar_homogeneous_set(homogeneous) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_HOMOGENEOUS_SET), EO_TYPECHECK(Eina_Bool, homogeneous)
-
-/**
- * @def elm_obj_toolbar_homogeneous_get
- * @since 1.8
- *
- * Get whether the homogeneous mode is enabled.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_homogeneous_get
- */
-#define elm_obj_toolbar_homogeneous_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_HOMOGENEOUS_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_toolbar_menu_parent_set
- * @since 1.8
- *
- * Set the parent object of the toolbar items' menus.
- *
- * @param[in] parent
- *
- * @see elm_toolbar_menu_parent_set
- */
-#define elm_obj_toolbar_menu_parent_set(parent) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_MENU_PARENT_SET), EO_TYPECHECK(Evas_Object *, parent)
-
-/**
- * @def elm_obj_toolbar_menu_parent_get
- * @since 1.8
- *
- * Get the parent object of the toolbar items' menus.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_menu_parent_get
- */
-#define elm_obj_toolbar_menu_parent_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_MENU_PARENT_GET), EO_TYPECHECK(Evas_Object **, ret)
-
-/**
- * @def elm_obj_toolbar_align_set
- * @since 1.8
- *
- * Set the alignment of the items.
- *
- * @param[in] align
- *
- * @see elm_toolbar_align_set
- */
-#define elm_obj_toolbar_align_set(align) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ALIGN_SET), EO_TYPECHECK(double, align)
-
-/**
- * @def elm_obj_toolbar_align_get
- * @since 1.8
- *
- * Get the alignment of the items.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_align_get
- */
-#define elm_obj_toolbar_align_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ALIGN_GET), EO_TYPECHECK(double *, ret)
 
-/**
- * @def elm_obj_toolbar_icon_order_lookup_set
- * @since 1.8
- *
- * Sets icon lookup order, for toolbar items' icons.
- *
- * @param[in] order
- *
- * @see elm_toolbar_icon_order_lookup_set
- */
-#define elm_obj_toolbar_icon_order_lookup_set(order) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ICON_ORDER_LOOKUP_SET), EO_TYPECHECK(Elm_Icon_Lookup_Order, order)
-
-/**
- * @def elm_obj_toolbar_icon_order_lookup_get
- * @since 1.8
- *
- * Get the icon lookup order.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_icon_order_lookup_get
- */
-#define elm_obj_toolbar_icon_order_lookup_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ICON_ORDER_LOOKUP_GET), EO_TYPECHECK(Elm_Icon_Lookup_Order *, ret)
-
-/**
- * @def elm_obj_toolbar_horizontal_set
- * @since 1.8
- *
- * Change a toolbar's orientation
- *
- * @param[in] horizontal
- *
- * @see elm_toolbar_horizontal_set
- */
-#define elm_obj_toolbar_horizontal_set(horizontal) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_HORIZONTAL_SET), EO_TYPECHECK(Eina_Bool, horizontal)
-
-/**
- * @def elm_obj_toolbar_horizontal_get
- * @since 1.8
- *
- * Get a toolbar's orientation
- *
- * @param[out] ret
- *
- * @see elm_toolbar_horizontal_get
- */
-#define elm_obj_toolbar_horizontal_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_HORIZONTAL_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_toolbar_items_count
- * @since 1.8
- *
- * Get the number of items in a toolbar
- *
- * @param[out] ret
- *
- * @see elm_toolbar_items_count
- */
-#define elm_obj_toolbar_items_count(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_ITEMS_COUNT), EO_TYPECHECK(unsigned int *, ret)
-
-/**
- * @def elm_obj_toolbar_standard_priority_set
- * @since 1.8
- *
- * Set the standard priority of visible items in a toolbar
- *
- * @param[in] priority
- *
- * @see elm_toolbar_standard_priority_set
- */
-#define elm_obj_toolbar_standard_priority_set(priority) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_STANDARD_PRIORITY_SET), EO_TYPECHECK(int, priority)
-
-/**
- * @def elm_obj_toolbar_standard_priority_get
- * @since 1.8
- *
- * Get the standard_priority of visible items in a toolbar
- *
- * @param[out] ret
- *
- * @see elm_toolbar_standard_priority_get
- */
-#define elm_obj_toolbar_standard_priority_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_STANDARD_PRIORITY_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_toolbar_select_mode_set
- * @since 1.8
- *
- * No description supplied by the EAPI.
- *
- * @param[in] mode
- *
- * @see elm_toolbar_select_mode_set
- */
-#define elm_obj_toolbar_select_mode_set(mode) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_SELECT_MODE_SET), EO_TYPECHECK(Elm_Object_Select_Mode, mode)
-
-/**
- * @def elm_obj_toolbar_select_mode_get
- * @since 1.8
- *
- * No description supplied by the EAPI.
- *
- * @param[out] ret
- *
- * @see elm_toolbar_select_mode_get
- */
-#define elm_obj_toolbar_select_mode_get(ret) ELM_OBJ_TOOLBAR_ID(ELM_OBJ_TOOLBAR_SUB_ID_SELECT_MODE_GET), EO_TYPECHECK(Elm_Object_Select_Mode *, ret)
+#include "elm_toolbar.eo.h"
 
-#endif
 /**
  * @}
  */
diff --git a/src/lib/elm_toolbar_legacy.h b/src/lib/elm_toolbar_legacy.h
index e0ff40434..cb4e3465b 100644
--- a/src/lib/elm_toolbar_legacy.h
+++ b/src/lib/elm_toolbar_legacy.h
@@ -12,313 +12,26 @@
 EAPI Evas_Object                 *elm_toolbar_add(Evas_Object *parent);
 
 /**
- * Set the icon size, in pixels, to be used by toolbar items.
- *
- * @param obj The toolbar object
- * @param icon_size The icon size in pixels
- *
- * @note Default value is @c 32. It reads value from elm config.
- *
- * @see elm_toolbar_icon_size_get()
- *
- * @ingroup Toolbar
- */
-EAPI void                         elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size);
-
-/**
- * Get the icon size, in pixels, to be used by toolbar items.
- *
- * @param obj The toolbar object.
- * @return The icon size in pixels.
- *
- * @see elm_toolbar_icon_size_set() for details.
- *
- * @ingroup Toolbar
- */
-EAPI int                          elm_toolbar_icon_size_get(const Evas_Object *obj);
-
-/**
- * Sets icon lookup order, for toolbar items' icons.
- *
- * @param obj The toolbar object.
- * @param order The icon lookup order.
- *
- * Icons added before calling this function will not be affected.
- * The default lookup order is #ELM_ICON_LOOKUP_THEME_FDO.
- *
- * @see elm_toolbar_icon_order_lookup_get()
- *
- * @ingroup Toolbar
- */
-EAPI void                         elm_toolbar_icon_order_lookup_set(Evas_Object *obj, Elm_Icon_Lookup_Order order);
-
-/**
- * Get the icon lookup order.
- *
- * @param obj The toolbar object.
- * @return The icon lookup order.
- *
- * @see elm_toolbar_icon_order_lookup_set() for details.
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Icon_Lookup_Order        elm_toolbar_icon_order_lookup_get(const Evas_Object *obj);
-
-/**
- * Append item to the toolbar.
- *
- * @param obj The toolbar object.
- * @param icon A string with icon name or the absolute path of an image file.
- * @param label The label of the item.
- * @param func The function to call when the item is clicked.
- * @param data The data to associate with the item for related callbacks.
- * @return The created item or @c NULL upon failure.
- *
- * A new item will be created and appended to the toolbar, i.e., will
- * be set as @b last item.
- *
- * Items created with this method can be deleted with
- * elm_object_item_del().
- *
- * Associated @p data can be properly freed when item is deleted if a
- * callback function is set with elm_object_item_del_cb_set().
- *
- * If a function is passed as argument, it will be called every time this item
- * is selected, i.e., the user clicks over an unselected item.
- * If such function isn't needed, just passing
- * @c NULL as @p func is enough. The same should be done for @p data.
- *
- * Toolbar will load icon image from fdo or current theme.
- * This behavior can be set by elm_toolbar_icon_order_lookup_set() function.
- * If an absolute path is provided it will load it direct from a file.
- *
- * @note This function does not accept relative icon path.
- *
- * @see elm_toolbar_item_icon_set()
- * @see elm_object_item_del()
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Object_Item             *elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-
-/**
- * Prepend item to the toolbar.
- *
- * @param obj The toolbar object.
- * @param icon A string with icon name or the absolute path of an image file.
- * @param label The label of the item.
- * @param func The function to call when the item is clicked.
- * @param data The data to associate with the item for related callbacks.
- * @return The created item or @c NULL upon failure.
- *
- * A new item will be created and prepended to the toolbar, i.e., will
- * be set as @b first item.
- *
- * Items created with this method can be deleted with
- * elm_object_item_del().
- *
- * Associated @p data can be properly freed when item is deleted if a
- * callback function is set with elm_object_item_del_cb_set().
- *
- * If a function is passed as argument, it will be called every time this item
- * is selected, i.e., the user clicks over an unselected item.
- * If such function isn't needed, just passing
- * @c NULL as @p func is enough. The same should be done for @p data.
- *
- * Toolbar will load icon image from fdo or current theme.
- * This behavior can be set by elm_toolbar_icon_order_lookup_set() function.
- * If an absolute path is provided it will load it direct from a file.
- *
- * @note This function does not accept relative icon path.
- *
- * @see elm_toolbar_item_icon_set()
- * @see elm_object_item_del()
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Object_Item             *elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-
-/**
- * Insert a new item into the toolbar object before item @p before.
- *
- * @param obj The toolbar object.
- * @param before The toolbar item to insert before.
- * @param icon A string with icon name or the absolute path of an image file.
- * @param label The label of the item.
- * @param func The function to call when the item is clicked.
- * @param data The data to associate with the item for related callbacks.
- * @return The created item or @c NULL upon failure.
- *
- * A new item will be created and added to the toolbar. Its position in
- * this toolbar will be just before item @p before.
- *
- * Items created with this method can be deleted with
- * elm_object_item_del().
- *
- * Associated @p data can be properly freed when item is deleted if a
- * callback function is set with elm_object_item_del_cb_set().
- *
- * If a function is passed as argument, it will be called every time this item
- * is selected, i.e., the user clicks over an unselected item.
- * If such function isn't needed, just passing
- * @c NULL as @p func is enough. The same should be done for @p data.
- *
- * Toolbar will load icon image from fdo or current theme.
- * This behavior can be set by elm_toolbar_icon_order_lookup_set() function.
- * If an absolute path is provided it will load it direct from a file.
- *
- * @note This function does not accept relative icon path.
- *
- * @see elm_toolbar_item_icon_set()
- * @see elm_object_item_del()
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Object_Item             *elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-
-/**
- * Insert a new item into the toolbar object after item @p after.
- *
- * @param obj The toolbar object.
- * @param after The toolbar item to insert after.
- * @param icon A string with icon name or the absolute path of an image file.
- * @param label The label of the item.
- * @param func The function to call when the item is clicked.
- * @param data The data to associate with the item for related callbacks.
- * @return The created item or @c NULL upon failure.
- *
- * A new item will be created and added to the toolbar. Its position in
- * this toolbar will be just after item @p after.
- *
- * Items created with this method can be deleted with
- * elm_object_item_del().
- *
- * Associated @p data can be properly freed when item is deleted if a
- * callback function is set with elm_object_item_del_cb_set().
- *
- * If a function is passed as argument, it will be called every time this item
- * is selected, i.e., the user clicks over an unselected item.
- * If such function isn't needed, just passing
- * @c NULL as @p func is enough. The same should be done for @p data.
- *
- * Toolbar will load icon image from fdo or current theme.
- * This behavior can be set by elm_toolbar_icon_order_lookup_set() function.
- * If an absolute path is provided it will load it direct from a file.
- *
- * @note This function does not accept relative icon path.
- *
- * @see elm_toolbar_item_icon_set()
- * @see elm_object_item_del()
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Object_Item             *elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-
-/**
- * Get the first item in the given toolbar widget's list of
- * items.
+ * Set reorder mode
  *
  * @param obj The toolbar object
- * @return The first item or @c NULL, if it has no items (and on
- * errors)
- *
- * @see elm_toolbar_item_append()
- * @see elm_toolbar_last_item_get()
+ * @param reorder_mode The reorder mode
+ * (EINA_TRUE = on, EINA_FALSE = off)
  *
  * @ingroup Toolbar
  */
-EAPI Elm_Object_Item             *elm_toolbar_first_item_get(const Evas_Object *obj);
+EAPI void                          elm_toolbar_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode);
 
 /**
- * Get the last item in the given toolbar widget's list of
- * items.
+ * Get the reorder mode
  *
  * @param obj The toolbar object
- * @return The last item or @c NULL, if it has no items (and on
- * errors)
- *
- * @see elm_toolbar_item_prepend()
- * @see elm_toolbar_first_item_get()
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Object_Item             *elm_toolbar_last_item_get(const Evas_Object *obj);
-
-/**
- * Returns a pointer to a toolbar item by its label.
- *
- * @param obj The toolbar object.
- * @param label The label of the item to find.
- *
- * @return The pointer to the toolbar item matching @p label or @c NULL
- * on failure.
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Object_Item             *elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label);
-
-/**
- * Get the selected item.
- *
- * @param obj The toolbar object.
- * @return The selected toolbar item.
- *
- * The selected item can be unselected with function
- * elm_toolbar_item_selected_set().
- *
- * The selected item always will be highlighted on toolbar.
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Object_Item             *elm_toolbar_selected_item_get(const Evas_Object *obj);
-
-/**
- * Get the more item which is auto-generated by toolbar.
- *
- * @param obj The toolbar object.
- * @return The toolbar more item.
- *
- * Toolbar generates 'more' item when there is no more space to fit items in
- * and toolbar is in ELM_TOOLBAR_SHRINK_MENU or ELM_TOOLBAR_SHRINK_EXPAND mode.
- * The more item can be manipulated by elm_object_item_text_set() and
- * elm_object_item_content_set.
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Object_Item             *elm_toolbar_more_item_get(const Evas_Object *obj);
-
-/**
- * Set the item displaying mode of a given toolbar widget @p obj.
- *
- * @param obj The toolbar object handle
- * @param shrink_mode Toolbar's items display behavior
- *
- * The toolbar won't scroll under #ELM_TOOLBAR_SHRINK_NONE mode, but
- * it will enforce a minimum size, so that all the items will fit
- * inside it. It won't scroll and won't show the items that don't fit
- * under #ELM_TOOLBAR_SHRINK_HIDE mode. Finally, it'll scroll under
- * #ELM_TOOLBAR_SHRINK_SCROLL mode, and it will create a button to
- * aggregate items which didn't fit with the #ELM_TOOLBAR_SHRINK_MENU
- * mode.
- *
- * @warning This function's behavior will clash with those of
- * elm_scroller_policy_set(), so use either one of them, but not both.
- *
- * @ingroup Toolbar
- */
-EAPI void                         elm_toolbar_shrink_mode_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode);
-
-/**
- * Get the shrink mode of toolbar @p obj.
- *
- * @param obj The toolbar object.
- * @return Toolbar's items display behavior.
- *
- * @see elm_toolbar_shrink_mode_set() for details.
+ * @return The reorder mode
+ * (EINA_TRUE = on, EINA_FALSE = off)
  *
  * @ingroup Toolbar
  */
-EAPI Elm_Toolbar_Shrink_Mode      elm_toolbar_shrink_mode_get(const Evas_Object *obj);
+EAPI Eina_Bool                     elm_toolbar_reorder_mode_get(const Evas_Object *obj);
 
 /**
  * Set the item's transverse expansion of a given toolbar widget @p obj.
@@ -347,204 +60,4 @@ EAPI void                         elm_toolbar_transverse_expanded_set(Evas_Objec
  */
 EAPI Eina_Bool                    elm_toolbar_transverse_expanded_get(const Evas_Object *obj);
 
-/**
- * Enable/disable homogeneous mode.
- *
- * @param obj The toolbar object
- * @param homogeneous Assume the items within the toolbar are of the
- * same size (EINA_TRUE = on, EINA_FALSE = off). Default is @c EINA_FALSE.
- *
- * This will enable the homogeneous mode where items are of the same size.
- * @see elm_toolbar_homogeneous_get()
- *
- * @ingroup Toolbar
- */
-EAPI void                         elm_toolbar_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-
-/**
- * Get whether the homogeneous mode is enabled.
- *
- * @param obj The toolbar object.
- * @return Assume the items within the toolbar are of the same height
- * and width (EINA_TRUE = on, EINA_FALSE = off).
- *
- * @see elm_toolbar_homogeneous_set()
- *
- * @ingroup Toolbar
- */
-EAPI Eina_Bool                    elm_toolbar_homogeneous_get(const Evas_Object *obj);
-
-/**
- * Set the parent object of the toolbar items' menus.
- *
- * @param obj The toolbar object.
- * @param parent The parent of the menu objects.
- *
- * Each item can be set as item menu, with elm_toolbar_item_menu_set().
- *
- * For more details about setting the parent for toolbar menus, see
- * elm_menu_parent_set().
- *
- * @see elm_menu_parent_set() for details.
- * @see elm_toolbar_item_menu_set() for details.
- *
- * @ingroup Toolbar
- */
-EAPI void                         elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
-
-/**
- * Get the parent object of the toolbar items' menus.
- *
- * @param obj The toolbar object.
- * @return The parent of the menu objects.
- *
- * @see elm_toolbar_menu_parent_set() for details.
- *
- * @ingroup Toolbar
- */
-EAPI Evas_Object                 *elm_toolbar_menu_parent_get(const Evas_Object *obj);
-
-/**
- * Set the alignment of the items.
- *
- * @param obj The toolbar object.
- * @param align The new alignment, a float between <tt> 0.0 </tt>
- * and <tt> 1.0 </tt>.
- *
- * Alignment of toolbar items, from <tt> 0.0 </tt> to indicates to align
- * left, to <tt> 1.0 </tt>, to align to right. <tt> 0.5 </tt> centralize
- * items.
- *
- * Centered items by default.
- *
- * @see elm_toolbar_align_get()
- *
- * @ingroup Toolbar
- */
-EAPI void                         elm_toolbar_align_set(Evas_Object *obj, double align);
-
-/**
- * Get the alignment of the items.
- *
- * @param obj The toolbar object.
- * @return toolbar items alignment, a float between <tt> 0.0 </tt> and
- * <tt> 1.0 </tt>.
- *
- * @see elm_toolbar_align_set() for details.
- *
- * @ingroup Toolbar
- */
-EAPI double                       elm_toolbar_align_get(const Evas_Object *obj);
-
-/**
- * Change a toolbar's orientation
- * @param obj The toolbar object
- * @param horizontal If @c EINA_TRUE, the toolbar is horizontal
- * By default, a toolbar will be horizontal. Use this function to create a vertical toolbar.
- * @ingroup Toolbar
- */
-EAPI void                         elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-
-/**
- * Get a toolbar's orientation
- * @param obj The toolbar object
- * @return If @c EINA_TRUE, the toolbar is horizontal
- * By default, a toolbar will be horizontal. Use this function to determine whether a toolbar is vertical.
- * @ingroup Toolbar
- */
-EAPI Eina_Bool                    elm_toolbar_horizontal_get(const Evas_Object *obj);
-
-/**
- * Get the number of items in a toolbar
- * @param obj The toolbar object
- * @return The number of items in @p obj toolbar
- * @ingroup Toolbar
- */
-EAPI unsigned int                 elm_toolbar_items_count(const Evas_Object *obj);
-
-/**
- * Set the standard priority of visible items in a toolbar
- * @param obj The toolbar object
- * @param priority The standard_priority of visible items
- *
- * If the priority of the item is up to standard priority, it is shown in basic panel.
- * The other items are located in more menu or panel. The more menu or panel can be shown when the more item is clicked.
- *
- * @see elm_toolbar_standard_priority_get()
- *
- * @since 1.7
- * @ingroup Toolbar
- */
-EAPI void                         elm_toolbar_standard_priority_set(Evas_Object *obj, int priority);
-
-/**
- * Get the standard_priority of visible items in a toolbar
- * @param obj The toolbar object
- * @return The standard priority of items in @p obj toolbar
- *
- * @see elm_toolbar_standard_priority_set()
- *
- * @since 1.7
- * @ingroup Toolbar
- */
-EAPI int                          elm_toolbar_standard_priority_get(const Evas_Object *obj);
-
-/**
- * Set the toolbar select mode.
- *
- * @param obj The toolbar object
- * @param mode The select mode
- *
- * elm_toolbar_select_mode_set() changes item select mode in the toolbar widget.
- * - ELM_OBJECT_SELECT_MODE_DEFAULT : Items will only call their selection func and
- *      callback when first becoming selected. Any further clicks will
- *      do nothing, unless you set always select mode.
- * - ELM_OBJECT_SELECT_MODE_ALWAYS :  This means that, even if selected,
- *      every click will make the selected callbacks be called.
- * - ELM_OBJECT_SELECT_MODE_NONE : This will turn off the ability to select items
- *      entirely and they will neither appear selected nor call selected
- *      callback functions.
- *
- * @see elm_toolbar_select_mode_get()
- *
- * @ingroup Toolbar
- */
-EAPI void
-elm_toolbar_select_mode_set(Evas_Object *obj, Elm_Object_Select_Mode mode);
-
-/**
- * Get the toolbar select mode.
- *
- * @param obj The toolbar object
- * @return The select mode
- * (If getting mode is failed, it returns ELM_OBJECT_SELECT_MODE_MAX)
- *
- * @see elm_toolbar_select_mode_set()
- *
- * @ingroup Toolbar
- */
-EAPI Elm_Object_Select_Mode
-elm_toolbar_select_mode_get(const Evas_Object *obj);
-
-/**
- * Set reorder mode
- *
- * @param obj The toolbar object
- * @param reorder_mode The reorder mode
- * (EINA_TRUE = on, EINA_FALSE = off)
- *
- * @ingroup Toolbar
- */
-EAPI void                          elm_toolbar_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode);
-
-/**
- * Get the reorder mode
- *
- * @param obj The toolbar object
- * @return The reorder mode
- * (EINA_TRUE = on, EINA_FALSE = off)
- *
- * @ingroup Toolbar
- */
-EAPI Eina_Bool                     elm_toolbar_reorder_mode_get(const Evas_Object *obj);
-
+#include "elm_toolbar.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_video_eo.h b/src/lib/elm_video_eo.h
index a7583e3f0..8ce44c1bf 100644
--- a/src/lib/elm_video_eo.h
+++ b/src/lib/elm_video_eo.h
@@ -1,288 +1,2 @@
 #include "elc_player.eo.h"
-#include "elm_video.eo.h"
-#if 0
-#define ELM_OBJ_PLAYER_CLASS elm_obj_player_class_get()
-
-const Eo_Class *elm_obj_player_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_PLAYER_BASE_ID;
-
-enum
-{
-   ELM_OBJ_PLAYER_SUB_ID_LAST
-};
-
-#define ELM_OBJ_PLAYER_ID(sub_id) (ELM_OBJ_PLAYER_BASE_ID + sub_id)
-
-/**
- * ELM_OBJ_VIDEO_CLASS
- */
-#define ELM_OBJ_VIDEO_CLASS elm_obj_video_class_get()
-
-const Eo_Class *elm_obj_video_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_VIDEO_BASE_ID;
-
-enum
-{
-   ELM_OBJ_VIDEO_SUB_ID_FILE_SET,
-   ELM_OBJ_VIDEO_SUB_ID_EMOTION_GET,
-   ELM_OBJ_VIDEO_SUB_ID_PLAY,
-   ELM_OBJ_VIDEO_SUB_ID_PAUSE,
-   ELM_OBJ_VIDEO_SUB_ID_STOP,
-   ELM_OBJ_VIDEO_SUB_ID_IS_PLAYING_GET,
-   ELM_OBJ_VIDEO_SUB_ID_IS_SEEKABLE_GET,
-   ELM_OBJ_VIDEO_SUB_ID_AUDIO_MUTE_GET,
-   ELM_OBJ_VIDEO_SUB_ID_AUDIO_MUTE_SET,
-   ELM_OBJ_VIDEO_SUB_ID_AUDIO_LEVEL_GET,
-   ELM_OBJ_VIDEO_SUB_ID_AUDIO_LEVEL_SET,
-   ELM_OBJ_VIDEO_SUB_ID_PLAY_POSITION_GET,
-   ELM_OBJ_VIDEO_SUB_ID_PLAY_POSITION_SET,
-   ELM_OBJ_VIDEO_SUB_ID_PLAY_LENGTH_GET,
-   ELM_OBJ_VIDEO_SUB_ID_TITLE_GET,
-   ELM_OBJ_VIDEO_SUB_ID_REMEMBER_POSITION_SET,
-   ELM_OBJ_VIDEO_SUB_ID_REMEMBER_POSITION_GET,
-   ELM_OBJ_VIDEO_SUB_ID_LAST
-};
-
-#define ELM_OBJ_VIDEO_ID(sub_id) (ELM_OBJ_VIDEO_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_video_file_set
- * @since 1.8
- *
- * @brief Define the file or URI that will be the video source.
- *
- * @param[in] filename
- * @param[out] ret
- *
- * @see elm_video_file_set
- *
- * @ingroup Video
- */
-#define elm_obj_video_file_set(filename, ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_FILE_SET), EO_TYPECHECK(const char *, filename), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_video_emotion_get
- * @since 1.8
- *
- * @brief Get the underlying Emotion object.
- *
- * @param[out] ret
- *
- * @see elm_video_emotion_get
- *
- * @ingroup Video
- */
-#define elm_obj_video_emotion_get(ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_EMOTION_GET), EO_TYPECHECK(Evas_Object **, ret)
-
-/**
- * @def elm_obj_video_play
- * @since 1.8
- *
- * @brief Start to play the video
- *
- *
- * @see elm_video_play
- *
- * @ingroup Video
- */
-#define elm_obj_video_play() ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_PLAY)
-
-/**
- * @def elm_obj_video_pause
- * @since 1.8
- *
- * @brief Pause the video
- *
- *
- * @see elm_video_pause
- *
- * @ingroup Video
- */
-#define elm_obj_video_pause() ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_PAUSE)
-
-/**
- * @def elm_obj_video_stop
- * @since 1.8
- *
- * @brief Stop the video
- *
- *
- * @see elm_video_stop
- *
- * @ingroup Video
- */
-#define elm_obj_video_stop() ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_STOP)
-
-/**
- * @def elm_obj_video_is_playing_get
- * @since 1.8
- *
- * @brief Is the video actually playing.
- *
- * @param[out] ret
- *
- * @see elm_video_is_playing_get
- *
- * @ingroup Video
- */
-#define elm_obj_video_is_playing_get(ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_IS_PLAYING_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_video_is_seekable_get
- * @since 1.8
- *
- * @brief Is it possible to seek inside the video.
- *
- * @param[out] ret
- *
- * @see elm_video_is_seekable_get
- *
- * @ingroup Video
- */
-#define elm_obj_video_is_seekable_get(ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_IS_SEEKABLE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_video_audio_mute_get
- * @since 1.8
- *
- * @brief Is the audio muted.
- *
- * @param[out] ret
- *
- * @see elm_video_audio_mute_get
- *
- * @ingroup Video
- */
-#define elm_obj_video_audio_mute_get(ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_AUDIO_MUTE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_video_audio_mute_set
- * @since 1.8
- *
- * @brief Change the mute state of the Elm_Video object.
- *
- * @param[in] mute
- *
- * @see elm_video_audio_mute_set
- *
- * @ingroup Video
- */
-#define elm_obj_video_audio_mute_set(mute) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_AUDIO_MUTE_SET), EO_TYPECHECK(Eina_Bool, mute)
-
-/**
- * @def elm_obj_video_audio_level_get
- * @since 1.8
- *
- * @brief Get the audio level of the current video.
- *
- * @param[out] ret
- *
- * @see elm_video_audio_level_get
- *
- * @ingroup Video
- */
-#define elm_obj_video_audio_level_get(ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_AUDIO_LEVEL_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_video_audio_level_set
- * @since 1.8
- *
- * @brief Set the audio level of an Elm_Video object.
- *
- * @param[in] volume
- *
- * @see elm_video_audio_level_set
- *
- * @ingroup Video
- */
-#define elm_obj_video_audio_level_set(volume) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_AUDIO_LEVEL_SET), EO_TYPECHECK(double, volume)
-
-/**
- * @def elm_obj_video_play_position_get
- * @since 1.8
- *
- * @brief Get the current position (in seconds) being played in the
- * Elm_Video object.
- *
- * @param[out] ret
- *
- * @see elm_video_play_position_get
- *
- * @ingroup Video
- */
-#define elm_obj_video_play_position_get(ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_PLAY_POSITION_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_video_play_position_set
- * @since 1.8
- *
- * @brief Set the current position (in seconds) to be played in the
- * Elm_Video object.
- *
- * @param[in] position
- *
- * @see elm_video_play_position_set
- *
- * @ingroup Video
- */
-#define elm_obj_video_play_position_set(position) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_PLAY_POSITION_SET), EO_TYPECHECK(double, position)
-
-/**
- * @def elm_obj_video_play_length_get
- * @since 1.8
- *
- * @brief Get the total playing time (in seconds) of the Elm_Video object.
- *
- * @param[out] ret
- *
- * @see elm_video_play_length_get
- *
- * @ingroup Video
- */
-#define elm_obj_video_play_length_get(ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_PLAY_LENGTH_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_video_title_get
- * @since 1.8
- *
- * @brief Get the title (for instance DVD title) from this emotion object.
- *
- * @param[out] ret
- *
- * @see elm_video_title_get
- *
- * @ingroup Video
- */
-#define elm_obj_video_title_get(ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_TITLE_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_video_remember_position_set
- * @since 1.8
- *
- * @brief Set whether the object can remember the last played position.
- *
- * @param[in] remember
- *
- * @see elm_video_remember_position_set
- *
- * @ingroup Video
- */
-#define elm_obj_video_remember_position_set(remember) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_REMEMBER_POSITION_SET), EO_TYPECHECK(Eina_Bool, remember)
-
-/**
- * @def elm_obj_video_remember_position_get
- * @since 1.8
- *
- * @brief Set whether the object can remember the last played position.
- *
- * @param[out] ret
- *
- * @see elm_video_remember_position_get
- *
- * @ingroup Video
- */
-#define elm_obj_video_remember_position_get(ret) ELM_OBJ_VIDEO_ID(ELM_OBJ_VIDEO_SUB_ID_REMEMBER_POSITION_GET), EO_TYPECHECK(Eina_Bool *, ret)
-#endif
+#include "elm_video.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_video_legacy.h b/src/lib/elm_video_legacy.h
index ddd30c6e9..3963a7cba 100644
--- a/src/lib/elm_video_legacy.h
+++ b/src/lib/elm_video_legacy.h
@@ -26,203 +26,4 @@ EAPI Evas_Object         *elm_player_add(Evas_Object *parent);
  */
 EAPI Evas_Object         *elm_video_add(Evas_Object *parent);
 
-/**
- * @brief Define the file or URI that will be the video source.
- *
- * @param video The video object to define the file or URI for the video
- * of the Elm_Video object.
- *
- * @param filename The file or URI to target.
- * Local files can be specified using file:// or by using full file paths.
- * URI could be remote source of video, like http:// or local source like
- * WebCam (v4l2://). (You can use Emotion API to request and list
- * the available Webcam on your system).
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
- *
- * This function will explicitly define a file or URI as a source
- * for the video of the Elm_Video object.
- *
- * @see elm_video_add()
- * @see elm_player_add()
- *
- * @ingroup Video
- */
-EAPI Eina_Bool            elm_video_file_set(Evas_Object *video, const char *filename);
-
-/**
- * @brief Get the underlying Emotion object.
- *
- * @param video The video object to proceed the request on.
- * @return the underlying Emotion object.
- *
- * @ingroup Video
- */
-EAPI Evas_Object         *elm_video_emotion_get(const Evas_Object *video);
-
-/**
- * @brief Start to play the video
- *
- * @param video The video object to proceed the request on.
- *
- * Start to play the video and cancel all suspend state.
- *
- * @ingroup Video
- */
-EAPI void                 elm_video_play(Evas_Object *video);
-
-/**
- * @brief Pause the video
- *
- * @param video The video object to proceed the request on.
- *
- * Pause the video and start a timer to trigger suspend mode.
- *
- * @ingroup Video
- */
-EAPI void                 elm_video_pause(Evas_Object *video);
-
-/**
- * @brief Stop the video
- *
- * @param video The video object to proceed the request on.
- *
- * Stop the video and put the emotion in deep sleep mode.
- *
- * @ingroup Video
- */
-EAPI void                 elm_video_stop(Evas_Object *video);
-
-/**
- * @brief Is the video actually playing.
- *
- * @param video The video object to proceed the request on.
- * @return @c EINA_TRUE if the video is actually playing.
- *
- * You should consider watching event on the object instead of polling
- * the object state.
- *
- * @ingroup Video
- */
-EAPI Eina_Bool            elm_video_is_playing_get(const Evas_Object *video);
-
-/**
- * @brief Is it possible to seek inside the video.
- *
- * @param video The video object to proceed the request on.
- * @return @c EINA_TRUE if is possible to seek inside the video.
- *
- * @ingroup Video
- */
-EAPI Eina_Bool            elm_video_is_seekable_get(const Evas_Object *video);
-
-/**
- * @brief Is the audio muted.
- *
- * @param video The video object to proceed the request on.
- * @return @c EINA_TRUE if the audio is muted.
- *
- * @ingroup Video
- */
-EAPI Eina_Bool            elm_video_audio_mute_get(const Evas_Object *video);
-
-/**
- * @brief Change the mute state of the Elm_Video object.
- *
- * @param video The video object to proceed the request on.
- * @param mute The new mute state.
- *
- * @ingroup Video
- */
-EAPI void                 elm_video_audio_mute_set(Evas_Object *video, Eina_Bool mute);
-
-/**
- * @brief Get the audio level of the current video.
- *
- * @param video The video object to proceed the request on.
- * @return the current audio level.
- *
- * @ingroup Video
- */
-EAPI double               elm_video_audio_level_get(const Evas_Object *video);
-
-/**
- * @brief Set the audio level of an Elm_Video object.
- *
- * @param video The video object to proceed the request on.
- * @param volume The new audio volume.
- *
- * @ingroup Video
- */
-EAPI void                 elm_video_audio_level_set(Evas_Object *video, double volume);
-
-/**
- * @brief Get the current position (in seconds) being played in the
- * Elm_Video object.
- *
- * @param video The video object.
- * @return The time (in seconds) since the beginning of the media file.
- *
- * @ingroup Video
- */
-EAPI double               elm_video_play_position_get(const Evas_Object *video);
-
-/**
- * @brief Set the current position (in seconds) to be played in the
- * Elm_Video object.
- *
- * @param video The video object.
- * @param position The time (in seconds) since the beginning of the media file.
- *
- * @ingroup Video
- */
-EAPI void                 elm_video_play_position_set(Evas_Object *video, double position);
-/**
- * @brief Get the total playing time (in seconds) of the Elm_Video object.
- *
- * @param video The video object.
- * @return The total duration (in seconds) of the media file.
- *
- * @ingroup Video
- */
-EAPI double               elm_video_play_length_get(const Evas_Object *video);
-
-/**
- * @brief Set whether the object can remember the last played position.
- *
- * @param video The video object.
- * @param remember the last played position of the Elm_Video object.
- *
- * @note This API only serves as indication. System support is required.
- *
- * @ingroup Video
- */
-EAPI void                 elm_video_remember_position_set(Evas_Object *video, Eina_Bool remember);
-
-/**
- * @brief Set whether the object can remember the last played position.
- *
- * @param video The video object.
- * @return whether the object remembers the last played position (@c EINA_TRUE)
- * or not.
- *
- * @note This API only serves as indication. System support is required.
- *
- * @ingroup Video
- */
-EAPI Eina_Bool            elm_video_remember_position_get(const Evas_Object *video);
-
-/**
- * @brief Get the title (for instance DVD title) from this emotion object.
- *
- * @param video The Elm_Video object.
- * @return A string containing the title.
- *
- * This function is only useful when playing a DVD.
- *
- * @note Don't change or free the string returned by this function.
- *
- * @ingroup Video
- */
-EAPI const char          *elm_video_title_get(const Evas_Object *video);
-
+#include "elm_video.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_web_eo.h b/src/lib/elm_web_eo.h
index 5690c6c08..33b3f7ede 100644
--- a/src/lib/elm_web_eo.h
+++ b/src/lib/elm_web_eo.h
@@ -1,725 +1 @@
-#include "elm_web.eo.h"
-
-#if 0
-#define ELM_OBJ_WEB_CLASS elm_obj_web_class_get()
-
-const Eo_Class *elm_obj_web_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_WEB_BASE_ID;
-
-enum
-{
-   ELM_OBJ_WEB_SUB_ID_WEBKIT_VIEW_GET,
-   ELM_OBJ_WEB_SUB_ID_WINDOW_CREATE_HOOK_SET,
-   ELM_OBJ_WEB_SUB_ID_DIALOG_ALERT_HOOK_SET,
-   ELM_OBJ_WEB_SUB_ID_DIALOG_CONFIRM_HOOK_SET,
-   ELM_OBJ_WEB_SUB_ID_DIALOG_PROMPT_HOOK_SET,
-   ELM_OBJ_WEB_SUB_ID_DIALOG_FILE_SELECTOR_HOOK_SET,
-   ELM_OBJ_WEB_SUB_ID_CONSOLE_MESSAGE_HOOK_SET,
-   ELM_OBJ_WEB_SUB_ID_USERAGENT_SET,
-   ELM_OBJ_WEB_SUB_ID_USERAGENT_GET,
-   ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_GET,
-   ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_SET,
-   ELM_OBJ_WEB_SUB_ID_URL_SET,
-   ELM_OBJ_WEB_SUB_ID_URL_GET,
-   ELM_OBJ_WEB_SUB_ID_HTML_STRING_LOAD,
-   ELM_OBJ_WEB_SUB_ID_TITLE_GET,
-   ELM_OBJ_WEB_SUB_ID_BG_COLOR_SET,
-   ELM_OBJ_WEB_SUB_ID_BG_COLOR_GET,
-   ELM_OBJ_WEB_SUB_ID_SELECTION_GET,
-   ELM_OBJ_WEB_SUB_ID_POPUP_SELECTED_SET,
-   ELM_OBJ_WEB_SUB_ID_POPUP_DESTROY,
-   ELM_OBJ_WEB_SUB_ID_TEXT_SEARCH,
-   ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_MARK,
-   ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_UNMARK_ALL,
-   ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_HIGHLIGHT_SET,
-   ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_HIGHLIGHT_GET,
-   ELM_OBJ_WEB_SUB_ID_LOAD_PROGRESS_GET,
-   ELM_OBJ_WEB_SUB_ID_STOP,
-   ELM_OBJ_WEB_SUB_ID_RELOAD,
-   ELM_OBJ_WEB_SUB_ID_RELOAD_FULL,
-   ELM_OBJ_WEB_SUB_ID_BACK,
-   ELM_OBJ_WEB_SUB_ID_FORWARD,
-   ELM_OBJ_WEB_SUB_ID_NAVIGATE,
-   ELM_OBJ_WEB_SUB_ID_BACK_POSSIBLE_GET,
-   ELM_OBJ_WEB_SUB_ID_FORWARD_POSSIBLE_GET,
-   ELM_OBJ_WEB_SUB_ID_NAVIGATE_POSSIBLE_GET,
-   ELM_OBJ_WEB_SUB_ID_HISTORY_ENABLED_GET,
-   ELM_OBJ_WEB_SUB_ID_HISTORY_ENABLED_SET,
-   ELM_OBJ_WEB_SUB_ID_ZOOM_SET,
-   ELM_OBJ_WEB_SUB_ID_ZOOM_GET,
-   ELM_OBJ_WEB_SUB_ID_ZOOM_MODE_SET,
-   ELM_OBJ_WEB_SUB_ID_ZOOM_MODE_GET,
-   ELM_OBJ_WEB_SUB_ID_REGION_SHOW,
-   ELM_OBJ_WEB_SUB_ID_REGION_BRING_IN,
-   ELM_OBJ_WEB_SUB_ID_INWIN_MODE_SET,
-   ELM_OBJ_WEB_SUB_ID_INWIN_MODE_GET,
-   ELM_OBJ_WEB_SUB_ID_LAST
-};
-
-#define ELM_OBJ_WEB_ID(sub_id) (ELM_OBJ_WEB_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_web_webkit_view_get
- * @since 1.8
- *
- * Get internal ewk_view object from web object.
- *
- * @param[out] ret
- *
- * @see elm_web_webkit_view_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_webkit_view_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_WEBKIT_VIEW_GET), EO_TYPECHECK(Evas_Object **, ret)
-
-/**
- * @def elm_obj_web_window_create_hook_set
- * @since 1.8
- *
- * Sets the function to call when a new window is requested
- *
- * @param[in] func
- * @param[in] data
- *
- * @see elm_web_window_create_hook_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_window_create_hook_set(func, data) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_WINDOW_CREATE_HOOK_SET), EO_TYPECHECK(Elm_Web_Window_Open, func), EO_TYPECHECK(void *, data)
-
-/**
- * @def elm_obj_web_dialog_alert_hook_set
- * @since 1.8
- *
- * Sets the function to call when an alert dialog
- *
- * @param[in] func
- * @param[in] data
- *
- * @see elm_web_dialog_alert_hook_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_dialog_alert_hook_set(func, data) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_DIALOG_ALERT_HOOK_SET), EO_TYPECHECK(Elm_Web_Dialog_Alert, func), EO_TYPECHECK(void *, data)
-
-/**
- * @def elm_obj_web_dialog_confirm_hook_set
- * @since 1.8
- *
- * Sets the function to call when an confirm dialog
- *
- * @param[in] func
- * @param[in] data
- *
- * @see elm_web_dialog_confirm_hook_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_dialog_confirm_hook_set(func, data) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_DIALOG_CONFIRM_HOOK_SET), EO_TYPECHECK(Elm_Web_Dialog_Confirm, func), EO_TYPECHECK(void *, data)
-
-/**
- * @def elm_obj_web_dialog_prompt_hook_set
- * @since 1.8
- *
- * Sets the function to call when an prompt dialog
- *
- * @param[in] func
- * @param[in] data
- *
- * @see elm_web_dialog_prompt_hook_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_dialog_prompt_hook_set(func, data) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_DIALOG_PROMPT_HOOK_SET), EO_TYPECHECK(Elm_Web_Dialog_Prompt, func), EO_TYPECHECK(void *, data)
-
-/**
- * @def elm_obj_web_dialog_file_selector_hook_set
- * @since 1.8
- *
- * Sets the function to call when an file selector dialog
- *
- * @param[in] func
- * @param[in] data
- *
- * @see elm_web_dialog_file_selector_hook_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_dialog_file_selector_hook_set(func, data) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_DIALOG_FILE_SELECTOR_HOOK_SET), EO_TYPECHECK(Elm_Web_Dialog_File_Selector, func), EO_TYPECHECK(void *, data)
-
-/**
- * @def elm_obj_web_console_message_hook_set
- * @since 1.8
- *
- * Sets the function to call when a console message is emitted from JS
- *
- * @param[in] func
- * @param[in] data
- *
- * @see elm_web_console_message_hook_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_console_message_hook_set(func, data) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_CONSOLE_MESSAGE_HOOK_SET), EO_TYPECHECK(Elm_Web_Console_Message, func), EO_TYPECHECK(void *, data)
-
-/**
- * @def elm_obj_web_useragent_set
- * @since 1.8
- *
- * Change useragent of a elm_web object
- *
- * @param[in] user_agent
- *
- * @see elm_web_useragent_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_useragent_set(user_agent) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_USERAGENT_SET), EO_TYPECHECK(const char *, user_agent)
-
-/**
- * @def elm_obj_web_useragent_get
- * @since 1.8
- *
- * Return current useragent of elm_web object
- *
- * @param[out] ret
- *
- * @see elm_web_useragent_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_useragent_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_USERAGENT_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_web_tab_propagate_get
- * @since 1.8
- *
- * Get the status of the tab propagation
- *
- * @param[out] ret
- *
- * @see elm_web_tab_propagate_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_tab_propagate_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_tab_propagate_set
- * @since 1.8
- *
- * Sets whether to use tab propagation
- *
- * @param[in] propagate
- *
- * @see elm_web_tab_propagate_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_tab_propagate_set(propagate) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_SET), EO_TYPECHECK(Eina_Bool, propagate)
-
-/**
- * @def elm_obj_web_url_set
- * @since 1.8
- *
- * Sets the URL for the web object
- *
- * @param[in] url
- * @param[out] ret
- *
- * @see elm_web_url_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_url_set(url, ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_SET), EO_TYPECHECK(const char *, url), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_url_get
- * @since 1.8
- *
- * Get the current URL for the object
- *
- * @param[out] ret
- *
- * @see elm_web_url_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_url_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_web_html_string_load
- * @since 1.9
- *
- * Loads the specified @a html string as the content of the web object
- *
- * @param[in] html
- * @param[in] base_url
- * @param[in] unreachable_url
- * @param[out] ret
- *
- * @see elm_web_html_string_load
- *
- * @ingroup Web
- */
-#define elm_obj_web_html_string_load(html, base_url, unreachable_url, ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_HTML_STRING_LOAD), EO_TYPECHECK(const char *, html), EO_TYPECHECK(const char *, base_url), EO_TYPECHECK(const char *, unreachable_url), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_title_get
- * @since 1.8
- *
- * Get the current title
- *
- * @param[out] ret
- *
- * @see elm_web_title_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_title_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TITLE_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_web_bg_color_set
- * @since 1.8
- *
- * Sets the background color to be used by the web object
- *
- * @param[in] r
- * @param[in] g
- * @param[in] b
- * @param[in] a
- *
- * @see elm_web_bg_color_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_bg_color_set(r, g, b, a) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BG_COLOR_SET), EO_TYPECHECK(int, r), EO_TYPECHECK(int, g), EO_TYPECHECK(int, b), EO_TYPECHECK(int, a)
-
-/**
- * @def elm_obj_web_bg_color_get
- * @since 1.8
- *
- * Get the background color to be used by the web object
- *
- * @param[out] r
- * @param[out] g
- * @param[out] b
- * @param[out] a
- *
- * @see elm_web_bg_color_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_bg_color_get(r, g, b, a) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BG_COLOR_GET), EO_TYPECHECK(int *, r), EO_TYPECHECK(int *, g), EO_TYPECHECK(int *, b), EO_TYPECHECK(int *, a)
-
-/**
- * @def elm_obj_web_selection_get
- * @since 1.8
- *
- * Get a copy of the currently selected text
- *
- * @param[out] ret
- *
- * @see elm_web_selection_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_selection_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_SELECTION_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_web_popup_selected_set
- * @since 1.8
- *
- * Tells the web object which index in the currently open popup was selected
- *
- * @param[in] idx
- *
- * @see elm_web_popup_selected_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_popup_selected_set(idx) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_POPUP_SELECTED_SET), EO_TYPECHECK(int, idx)
-
-/**
- * @def elm_obj_web_popup_destroy
- * @since 1.8
- *
- * Dismisses an open dropdown popup
- *
- * @param[out] ret
- *
- * @see elm_web_popup_destroy
- *
- * @ingroup Web
- */
-#define elm_obj_web_popup_destroy(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_POPUP_DESTROY), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_text_search
- * @since 1.8
- *
- * Searches the given string in a document.
- *
- * @param[in] string
- * @param[in] case_sensitive
- * @param[in] forward
- * @param[in] wrap
- * @param[out] ret
- *
- * @see elm_web_text_search
- *
- * @ingroup Web
- */
-#define elm_obj_web_text_search(string, case_sensitive, forward, wrap, ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_SEARCH), EO_TYPECHECK(const char *, string), EO_TYPECHECK(Eina_Bool, case_sensitive), EO_TYPECHECK(Eina_Bool, forward), EO_TYPECHECK(Eina_Bool, wrap), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_text_matches_mark
- * @since 1.8
- *
- * Marks matches of the given string in a document.
- *
- * @param[in] string
- * @param[in] case_sensitive
- * @param[in] highlight
- * @param[in] limit
- * @param[out] ret
- *
- * @see elm_web_text_matches_mark
- *
- * @ingroup Web
- */
-#define elm_obj_web_text_matches_mark(string, case_sensitive, highlight, limit, ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_MARK), EO_TYPECHECK(const char *, string), EO_TYPECHECK(Eina_Bool, case_sensitive), EO_TYPECHECK(Eina_Bool, highlight), EO_TYPECHECK(unsigned int, limit), EO_TYPECHECK(unsigned int *, ret)
-
-/**
- * @def elm_obj_web_text_matches_unmark_all
- * @since 1.8
- *
- * Clears all marked matches in the document
- *
- * @param[out] ret
- *
- * @see elm_web_text_matches_unmark_all
- *
- * @ingroup Web
- */
-#define elm_obj_web_text_matches_unmark_all(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_UNMARK_ALL), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_text_matches_highlight_set
- * @since 1.8
- *
- * Sets whether to highlight the matched marks
- *
- * @param[in] highlight
- * @param[out] ret
- *
- * @see elm_web_text_matches_highlight_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_text_matches_highlight_set(highlight, ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_HIGHLIGHT_SET), EO_TYPECHECK(Eina_Bool, highlight), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_text_matches_highlight_get
- * @since 1.8
- *
- * Get whether highlighting marks is enabled
- *
- * @param[out] ret
- *
- * @see elm_web_text_matches_highlight_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_text_matches_highlight_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_HIGHLIGHT_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_load_progress_get
- * @since 1.8
- *
- * Get the overall loading progress of the page
- *
- * @param[out] ret
- *
- * @see elm_web_load_progress_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_load_progress_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_LOAD_PROGRESS_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_web_stop
- * @since 1.8
- *
- * Stops loading the current page
- *
- * @param[out] ret
- *
- * @see elm_web_stop
- *
- * @ingroup Web
- */
-#define elm_obj_web_stop(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_STOP), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_reload
- * @since 1.8
- *
- * Requests a reload of the current document in the object
- *
- * @param[out] ret
- *
- * @see elm_web_reload
- *
- * @ingroup Web
- */
-#define elm_obj_web_reload(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_RELOAD), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_reload_full
- * @since 1.8
- *
- * Requests a reload of the current document, avoiding any existing caches
- *
- * @param[out] ret
- *
- * @see elm_web_reload_full
- *
- * @ingroup Web
- */
-#define elm_obj_web_reload_full(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_RELOAD_FULL), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_back
- * @since 1.8
- *
- * Goes back one step in the browsing history
- *
- * @param[out] ret
- *
- * @see elm_web_back
- *
- * @ingroup Web
- */
-#define elm_obj_web_back(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BACK), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_forward
- * @since 1.8
- *
- * Goes forward one step in the browsing history
- *
- * @param[out] ret
- *
- * @see elm_web_forward
- *
- * @ingroup Web
- */
-#define elm_obj_web_forward(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_FORWARD), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_navigate
- * @since 1.8
- *
- * Jumps the given number of steps in the browsing history
- *
- * @param[in] steps
- * @param[out] ret
- *
- * @see elm_web_navigate
- *
- * @ingroup Web
- */
-#define elm_obj_web_navigate(steps, ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_NAVIGATE), EO_TYPECHECK(int, steps), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_back_possible_get
- * @since 1.8
- *
- * Queries whether it's possible to go back in history
- *
- * @param[out] ret
- *
- * @see elm_web_back_possible_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_back_possible_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BACK_POSSIBLE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_forward_possible_get
- * @since 1.8
- *
- * Queries whether it's possible to go forward in history
- *
- * @param[out] ret
- *
- * @see elm_web_forward_possible_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_forward_possible_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_FORWARD_POSSIBLE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_navigate_possible_get
- * @since 1.8
- *
- * Queries whether it's possible to jump the given number of steps
- *
- * @param[in] steps
- * @param[out] ret
- *
- * @see elm_web_navigate_possible_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_navigate_possible_get(steps, ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_NAVIGATE_POSSIBLE_GET), EO_TYPECHECK(int, steps), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_history_enabled_get
- * @since 1.8
- *
- * Get whether browsing history is enabled for the given object
- *
- * @param[out] ret
- *
- * @see elm_web_history_enabled_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_history_enabled_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_HISTORY_ENABLED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_web_history_enabled_set
- * @since 1.8
- *
- * Enables or disables the browsing history
- *
- * @param[in] enable
- *
- * @see elm_web_history_enabled_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_history_enabled_set(enable) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_HISTORY_ENABLED_SET), EO_TYPECHECK(Eina_Bool, enable)
-
-/**
- * @def elm_obj_web_zoom_set
- * @since 1.8
- *
- * Sets the zoom level of the web object
- *
- * @param[in] zoom
- *
- * @see elm_web_zoom_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_zoom_set(zoom) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_ZOOM_SET), EO_TYPECHECK(double, zoom)
-
-/**
- * @def elm_obj_web_zoom_get
- * @since 1.8
- *
- * Get the current zoom level set on the web object
- *
- * @param[out] ret
- *
- * @see elm_web_zoom_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_zoom_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_ZOOM_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_web_zoom_mode_set
- * @since 1.8
- *
- * Sets the zoom mode to use
- *
- * @param[in] mode
- *
- * @see elm_web_zoom_mode_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_zoom_mode_set(mode) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_ZOOM_MODE_SET), EO_TYPECHECK(Elm_Web_Zoom_Mode, mode)
-
-/**
- * @def elm_obj_web_zoom_mode_get
- * @since 1.8
- *
- * Get the currently set zoom mode
- *
- * @param[out] ret
- *
- * @see elm_web_zoom_mode_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_zoom_mode_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_ZOOM_MODE_GET), EO_TYPECHECK(Elm_Web_Zoom_Mode *, ret)
-
-/**
- * @def elm_obj_web_region_show
- * @since 1.8
- *
- * Shows the given region in the web object
- *
- * @param[in] x
- * @param[in] y
- * @param[in] w
- * @param[in] h
- *
- * @see elm_web_region_show
- *
- * @ingroup Web
- */
-#define elm_obj_web_region_show(x, y, w, h) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_REGION_SHOW), EO_TYPECHECK(int, x), EO_TYPECHECK(int, y), EO_TYPECHECK(int, w), EO_TYPECHECK(int, h)
-
-/**
- * @def elm_obj_web_region_bring_in
- * @since 1.8
- *
- * Brings in the region to the visible area
- *
- * @param[in] x
- * @param[in] y
- * @param[in] w
- * @param[in] h
- *
- * @see elm_web_region_bring_in
- *
- * @ingroup Web
- */
-#define elm_obj_web_region_bring_in(x, y, w, h) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_REGION_BRING_IN), EO_TYPECHECK(int, x), EO_TYPECHECK(int, y), EO_TYPECHECK(int, w), EO_TYPECHECK(int, h)
-
-/**
- * @def elm_obj_web_inwin_mode_set
- * @since 1.8
- *
- * Sets the default dialogs to use an Inwin instead of a normal window
- *
- * @param[in] value
- *
- * @see elm_web_inwin_mode_set
- *
- * @ingroup Web
- */
-#define elm_obj_web_inwin_mode_set(value) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_INWIN_MODE_SET), EO_TYPECHECK(Eina_Bool, value)
-
-/**
- * @def elm_obj_web_inwin_mode_get
- * @since 1.8
- *
- * Get whether Inwin mode is set for the current object
- *
- * @param[out] ret
- *
- * @see elm_web_inwin_mode_get
- *
- * @ingroup Web
- */
-#define elm_obj_web_inwin_mode_get(ret) ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_INWIN_MODE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-#endif
+#include "elm_web.eo.h"
\ No newline at end of file
diff --git a/src/lib/elm_web_legacy.h b/src/lib/elm_web_legacy.h
index 49d9fe93e..e2c2577cf 100644
--- a/src/lib/elm_web_legacy.h
+++ b/src/lib/elm_web_legacy.h
@@ -12,223 +12,6 @@
 EAPI Evas_Object      *elm_web_add(Evas_Object *parent);
 
 /**
- * Get internal ewk_view object from web object.
- *
- * Elementary may not provide some low level features of EWebKit,
- * instead of cluttering the API with proxy methods we opted to
- * return the internal reference. Be careful using it as it may
- * interfere with elm_web behavior.
- *
- * @param obj The web object.
- * @return The internal ewk_view object or @c NULL if it does not
- *         exist. (Failure to create or Elementary compiled without
- *         ewebkit)
- *
- * @see elm_web_add()
- *
- * @ingroup Web
- */
-EAPI Evas_Object      *elm_web_webkit_view_get(const Evas_Object *obj);
-
-/**
- * Sets the function to call when a new window is requested
- *
- * This hook will be called when a request to create a new window is
- * issued from the web page loaded.
- * There is no default implementation for this feature, so leaving this
- * unset or passing @c NULL in @p func will prevent new windows from
- * opening.
- *
- * @param obj The web object where to set the hook function
- * @param func The hook function to be called when a window is requested
- * @param data User data
- *
- * @ingroup Web
- */
-EAPI void              elm_web_window_create_hook_set(Evas_Object *obj, Elm_Web_Window_Open func, void *data);
-
-/**
- * Sets the function to call when an alert dialog
- *
- * This hook will be called when a JavaScript alert dialog is requested.
- * If no function is set or @c NULL is passed in @p func, the default
- * implementation will take place.
- *
- * @param obj The web object where to set the hook function
- * @param func The callback function to be used
- * @param data User data
- *
- * @see elm_web_inwin_mode_set()
- *
- * @ingroup Web
- */
-EAPI void              elm_web_dialog_alert_hook_set(Evas_Object *obj, Elm_Web_Dialog_Alert func, void *data);
-
-/**
- * Sets the function to call when an confirm dialog
- *
- * This hook will be called when a JavaScript confirm dialog is requested.
- * If no function is set or @c NULL is passed in @p func, the default
- * implementation will take place.
- *
- * @param obj The web object where to set the hook function
- * @param func The callback function to be used
- * @param data User data
- *
- * @see elm_web_inwin_mode_set()
- *
- * @ingroup Web
- */
-EAPI void              elm_web_dialog_confirm_hook_set(Evas_Object *obj, Elm_Web_Dialog_Confirm func, void *data);
-
-/**
- * Sets the function to call when an prompt dialog
- *
- * This hook will be called when a JavaScript prompt dialog is requested.
- * If no function is set or @c NULL is passed in @p func, the default
- * implementation will take place.
- *
- * @param obj The web object where to set the hook function
- * @param func The callback function to be used
- * @param data User data
- *
- * @see elm_web_inwin_mode_set()
- *
- * @ingroup Web
- */
-EAPI void              elm_web_dialog_prompt_hook_set(Evas_Object *obj, Elm_Web_Dialog_Prompt func, void *data);
-
-/**
- * Sets the function to call when an file selector dialog
- *
- * This hook will be called when a JavaScript file selector dialog is
- * requested.
- * If no function is set or @c NULL is passed in @p func, the default
- * implementation will take place.
- *
- * @param obj The web object where to set the hook function
- * @param func The callback function to be used
- * @param data User data
- *
- * @see elm_web_inwin_mode_set()
- *
- * @ingroup Web
- */
-EAPI void              elm_web_dialog_file_selector_hook_set(Evas_Object *obj, Elm_Web_Dialog_File_Selector func, void *data);
-
-/**
- * Sets the function to call when a console message is emitted from JS
- *
- * This hook will be called when a console message is emitted from
- * JavaScript. There is no default implementation for this feature.
- *
- * @param obj The web object where to set the hook function
- * @param func The callback function to be used
- * @param data User data
- *
- * @ingroup Web
- */
-EAPI void              elm_web_console_message_hook_set(Evas_Object *obj, Elm_Web_Console_Message func, void *data);
-
-/**
- * Change useragent of a elm_web object
- *
- * @param obj The object
- * @param user_agent String for useragent
- *
- * @ingroup Web
- */
-EAPI void elm_web_useragent_set(Evas_Object *obj, const char *user_agent);
-
-/**
- * Return current useragent of elm_web object
- *
- * @param obj The object
- * @return Useragent string
- *
- * @ingroup Web
- */
-EAPI const char* elm_web_useragent_get(const Evas_Object *obj);
-
-/**
- * Get the status of the tab propagation
- *
- * @param obj The web object to query
- * @return @c EINA_TRUE if tab propagation is enabled, @c EINA_FALSE otherwise
- *
- * @see elm_web_tab_propagate_set()
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_tab_propagate_get(const Evas_Object *obj);
-
-/**
- * Sets whether to use tab propagation
- *
- * If tab propagation is enabled, whenever the user presses the Tab key,
- * Elementary will handle it and switch focus to the next widget.
- * The default value is disabled, where WebKit will handle the Tab key to
- * cycle focus though its internal objects, jumping to the next widget
- * only when that cycle ends.
- *
- * @param obj The web object
- * @param propagate Whether to propagate Tab keys to Elementary or not
- *
- * @ingroup Web
- */
-EAPI void              elm_web_tab_propagate_set(Evas_Object *obj, Eina_Bool propagate);
-
-/**
- * Sets the URL for the web object
- *
- * It must be a full URL, with resource included, in the form
- * http://www.enlightenment.org or file:///tmp/something.html
- *
- * @param obj The web object
- * @param url The URL to set
- * @return @c EINA_TRUE if the URL could be set, @c EINA_FALSE if an error occurred.
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_url_set(Evas_Object *obj, const char *url);
-
-/**
- * Loads the specified @a html string as the content of the web object
- *
- * @param obj The web object
- * @param html HTML data to load
- * @param base_url Base URL used for relative paths to external objects (optional)
- * @param unreachable_url URL that could not be reached (optional)
- *
- * @return @c EINA_TRUE if it the HTML was successfully loaded, @c EINA_FALSE otherwise
- *
- * External objects such as stylesheets or images referenced in the HTML
- * document are located relative to @a base_url.
- *
- * If an @a unreachable_url is passed it is used as the url for the loaded
- * content. This is typically used to display error pages for a failed
- * load.
- *
- * @since 1.9
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_html_string_load(Evas_Object *obj, const char *html, const char *base_url, const char *unreachable_url);
-
-/**
- * Get the current URL for the object
- *
- * The returned string must not be freed and is guaranteed to be
- * stringshared.
- *
- * @param obj The web object
- * @return A stringshared internal string with the current URL, or @c NULL on
- * failure
- *
- * @ingroup Web
- */
-EAPI const char       *elm_web_url_get(const Evas_Object *obj);
-
-/**
  * Sets the URI for the web object
  *
  * It must be a full URI, with resource included, in the form
@@ -264,451 +47,4 @@ EINA_DEPRECATED EAPI Eina_Bool         elm_web_uri_set(Evas_Object *obj, const c
  */
 EINA_DEPRECATED EAPI const char       *elm_web_uri_get(const Evas_Object *obj);
 
-/**
- * Get the current title
- *
- * The returned string must not be freed and is guaranteed to be
- * stringshared.
- *
- * @param obj The web object
- * @return A stringshared internal string with the current title, or @c NULL on
- * failure
- *
- * @ingroup Web
- */
-EAPI const char       *elm_web_title_get(const Evas_Object *obj);
-
-/**
- * Sets the background color to be used by the web object
- *
- * This is the color that will be used by default when the loaded page
- * does not set it's own. Color values are pre-multiplied.
- *
- * @param obj The web object
- * @param r Red component
- * @param g Green component
- * @param b Blue component
- * @param a Alpha component
- *
- * @ingroup Web
- */
-EAPI void              elm_web_bg_color_set(Evas_Object *obj, int r, int g, int b, int a);
-
-/**
- * Get the background color to be used by the web object
- *
- * This is the color that will be used by default when the loaded page
- * does not set it's own. Color values are pre-multiplied.
- *
- * @param obj The web object
- * @param r Red component
- * @param g Green component
- * @param b Blue component
- * @param a Alpha component
- *
- * @ingroup Web
- */
-EAPI void              elm_web_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-
-/**
- * Get a copy of the currently selected text
- *
- * The string returned must be freed by the user when it's done with it.
- *
- * @param obj The web object
- * @return A newly allocated string, or @c NULL if nothing is selected or an
- * error occurred
- *
- * @ingroup Web
- */
-EAPI const char       *elm_web_selection_get(const Evas_Object *obj);
-
-/**
- * Tells the web object which index in the currently open popup was selected
- *
- * When the user handles the popup creation from the "popup,created" signal,
- * it needs to tell the web object which item was selected by calling this
- * function with the index corresponding to the item.
- *
- * @param obj The web object
- * @param index The index selected
- *
- * @see elm_web_popup_destroy()
- *
- * @ingroup Web
- */
-EAPI void              elm_web_popup_selected_set(Evas_Object *obj, int index);
-
-/**
- * Dismisses an open dropdown popup
- *
- * When the popup from a dropdown widget is to be dismissed, either after
- * selecting an option or to cancel it, this function must be called, which
- * will later emit an "popup,willdelete" signal to notify the user that
- * any memory and objects related to this popup can be freed.
- *
- * @param obj The web object
- * @return @c EINA_TRUE if the menu was successfully destroyed, or @c EINA_FALSE
- * if there was no menu to destroy
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_popup_destroy(Evas_Object *obj);
-
-/**
- * Searches the given string in a document.
- *
- * @param obj The web object where to search the text
- * @param string String to search
- * @param case_sensitive If search should be case sensitive or not
- * @param forward If search is from cursor and on or backwards
- * @param wrap If search should wrap at the end
- *
- * @return @c EINA_TRUE if the given string was found, @c EINA_FALSE if not
- * or failure
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_text_search(const Evas_Object *obj, const char *string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap);
-
-/**
- * Marks matches of the given string in a document.
- *
- * @param obj The web object where to search text
- * @param string String to match
- * @param case_sensitive If match should be case sensitive or not
- * @param highlight If matches should be highlighted
- * @param limit Maximum amount of matches, or zero to unlimited
- *
- * @return number of matched @a string
- *
- * @ingroup Web
- */
-EAPI unsigned int      elm_web_text_matches_mark(Evas_Object *obj, const char *string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit);
-
-/**
- * Clears all marked matches in the document
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_text_matches_unmark_all(Evas_Object *obj);
-
-/**
- * Sets whether to highlight the matched marks
- *
- * If enabled, marks set with elm_web_text_matches_mark() will be
- * highlighted.
- *
- * @param obj The web object
- * @param highlight Whether to highlight the marks or not
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_text_matches_highlight_set(Evas_Object *obj, Eina_Bool highlight);
-
-/**
- * Get whether highlighting marks is enabled
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE is marks are set to be highlighted, @c EINA_FALSE
- * otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_text_matches_highlight_get(const Evas_Object *obj);
-
-/**
- * Get the overall loading progress of the page
- *
- * Returns the estimated loading progress of the page, with a value between
- * 0.0 and 1.0. This is an estimated progress accounting for all the frames
- * included in the page.
- *
- * @param obj The web object
- *
- * @return A value between 0.0 and 1.0 indicating the progress, or -1.0 on
- * failure
- *
- * @ingroup Web
- */
-EAPI double            elm_web_load_progress_get(const Evas_Object *obj);
-
-/**
- * Stops loading the current page
- *
- * Cancels the loading of the current page in the web object. This will
- * cause a "load,error" signal to be emitted, with the is_cancellation
- * flag set to @c EINA_TRUE.
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE if the cancel was successful, @c EINA_FALSE otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_stop(Evas_Object *obj);
-
-/**
- * Requests a reload of the current document in the object
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_reload(Evas_Object *obj);
-
-/**
- * Requests a reload of the current document, avoiding any existing caches
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_reload_full(Evas_Object *obj);
-
-/**
- * Goes back one step in the browsing history
- *
- * This is equivalent to calling elm_web_object_navigate(obj, -1);
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
- *
- * @see elm_web_history_enabled_set()
- * @see elm_web_back_possible()
- * @see elm_web_forward()
- * @see elm_web_navigate()
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_back(Evas_Object *obj);
-
-/**
- * Goes forward one step in the browsing history
- *
- * This is equivalent to calling elm_web_object_navigate(obj, 1);
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
- *
- * @see elm_web_history_enabled_set()
- * @see elm_web_forward_possible_get()
- * @see elm_web_back()
- * @see elm_web_navigate()
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_forward(Evas_Object *obj);
-
-/**
- * Jumps the given number of steps in the browsing history
- *
- * The @p steps value can be a negative integer to back in history, or a
- * positive to move forward.
- *
- * @param obj The web object
- * @param steps The number of steps to jump
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE on error or if not enough
- * history exists to jump the given number of steps
- *
- * @see elm_web_history_enabled_set()
- * @see elm_web_back()
- * @see elm_web_forward()
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_navigate(Evas_Object *obj, int steps);
-
-/**
- * Queries whether it's possible to go back in history
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE if it's possible to back in history, @c EINA_FALSE
- * otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_back_possible_get(const Evas_Object *obj);
-
-/**
- * Queries whether it's possible to go forward in history
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE if it's possible to forward in history, @c EINA_FALSE
- * otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_forward_possible_get(const Evas_Object *obj);
-
-/**
- * Queries whether it's possible to jump the given number of steps
- *
- * The @p steps value can be a negative integer to back in history, or a
- * positive to move forward.
- *
- * @param obj The web object
- * @param steps The number of steps to check for
- *
- * @return @c EINA_TRUE if enough history exists to perform the given jump,
- * @c EINA_FALSE otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_navigate_possible_get(Evas_Object *obj, int steps);
-
-/**
- * Get whether browsing history is enabled for the given object
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE if history is enabled, @c EINA_FALSE otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_history_enabled_get(const Evas_Object *obj);
-
-/**
- * Enables or disables the browsing history
- *
- * @param obj The web object
- * @param enabled Whether to enable or disable the browsing history
- *
- * @ingroup Web
- */
-EAPI void              elm_web_history_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-
-/**
- * Sets the zoom level of the web object
- *
- * Zoom level matches the Webkit API, so 1.0 means normal zoom, with higher
- * values meaning zoom in and lower meaning zoom out. This function will
- * only affect the zoom level if the mode set with elm_web_zoom_mode_set()
- * is ::ELM_WEB_ZOOM_MODE_MANUAL.
- *
- * @param obj The web object
- * @param zoom The zoom level to set
- *
- * @ingroup Web
- */
-EAPI void              elm_web_zoom_set(Evas_Object *obj, double zoom);
-
-/**
- * Sets the zoom mode to use
- *
- * The modes can be any of those defined in ::Elm_Web_Zoom_Mode, except
- * ::ELM_WEB_ZOOM_MODE_LAST. The default is ::ELM_WEB_ZOOM_MODE_MANUAL.
- *
- * ::ELM_WEB_ZOOM_MODE_MANUAL means the zoom level will be controlled
- * with the elm_web_zoom_set() function.
- * ::ELM_WEB_ZOOM_MODE_AUTO_FIT will calculate the needed zoom level to
- * make sure the entirety of the web object's contents are shown.
- * ::ELM_WEB_ZOOM_MODE_AUTO_FILL will calculate the needed zoom level to
- * fit the contents in the web object's size, without leaving any space
- * unused.
- *
- * @param obj The web object
- * @param mode The mode to set
- *
- * @ingroup Web
- */
-EAPI void              elm_web_zoom_mode_set(Evas_Object *obj, Elm_Web_Zoom_Mode mode);
-
-/**
- * Get the currently set zoom mode
- *
- * @param obj The web object
- *
- * @return The current zoom mode set for the object,
- * or ::ELM_WEB_ZOOM_MODE_LAST on error
- *
- * @ingroup Web
- */
-EAPI Elm_Web_Zoom_Mode elm_web_zoom_mode_get(const Evas_Object *obj);
-
-/**
- * Get the current zoom level set on the web object
- *
- * Note that this is the zoom level set on the web object and not that
- * of the underlying Webkit one. In the ::ELM_WEB_ZOOM_MODE_MANUAL mode,
- * the two zoom levels should match, but for the other two modes the
- * Webkit zoom is calculated internally to match the chosen mode without
- * changing the zoom level set for the web object.
- *
- * @param obj The web object
- *
- * @return The zoom level set on the object
- *
- * @ingroup Web
- */
-EAPI double            elm_web_zoom_get(const Evas_Object *obj);
-
-/**
- * Shows the given region in the web object
- *
- * @param obj The web object
- * @param x The x coordinate of the region to show
- * @param y The y coordinate of the region to show
- * @param w The width of the region to show
- * @param h The height of the region to show
- *
- * @ingroup Web
- */
-EAPI void              elm_web_region_show(Evas_Object *obj, int x, int y, int w, int h);
-
-/**
- * Brings in the region to the visible area
- *
- * Like elm_web_region_show(), but it animates the scrolling of the object
- * to show the area
- *
- * @param obj The web object
- * @param x The x coordinate of the region to show
- * @param y The y coordinate of the region to show
- * @param w The width of the region to show
- * @param h The height of the region to show
- *
- * @ingroup Web
- */
-EAPI void              elm_web_region_bring_in(Evas_Object *obj, int x, int y, int w, int h);
-
-/**
- * Sets the default dialogs to use an Inwin instead of a normal window
- *
- * If set, then the default implementation for the JavaScript dialogs and
- * file selector will be opened in an Inwin. Otherwise they will use a
- * normal separated window.
- *
- * @param obj The web object
- * @param value @c EINA_TRUE to use Inwin, @c EINA_FALSE to use a normal window
- *
- * @ingroup Web
- */
-EAPI void              elm_web_inwin_mode_set(Evas_Object *obj, Eina_Bool value);
-
-/**
- * Get whether Inwin mode is set for the current object
- *
- * @param obj The web object
- *
- * @return @c EINA_TRUE if Inwin mode is set, @c EINA_FALSE otherwise
- *
- * @ingroup Web
- */
-EAPI Eina_Bool         elm_web_inwin_mode_get(const Evas_Object *obj);
+#include "elm_web.eo.legacy.h"
\ No newline at end of file
diff --git a/src/lib/elm_win_eo.h b/src/lib/elm_win_eo.h
index f3cc01ba7..3a43757e1 100644
--- a/src/lib/elm_win_eo.h
+++ b/src/lib/elm_win_eo.h
@@ -3,1379 +3,9 @@
  *
  * @{
  */
-#include "elm_win.eo.h"
-#if 0
-#define ELM_OBJ_WIN_CLASS elm_obj_win_class_get()
-
-const Eo_Class *elm_obj_win_class_get(void) EINA_CONST;
-
-extern EAPI Eo_Op ELM_OBJ_WIN_BASE_ID;
-
-enum
-  {
-     ELM_OBJ_WIN_SUB_ID_WIN_CONSTRUCTOR,
-     ELM_OBJ_WIN_SUB_ID_RESIZE_OBJECT_ADD,
-     ELM_OBJ_WIN_SUB_ID_RESIZE_OBJECT_DEL,
-     ELM_OBJ_WIN_SUB_ID_TYPE_GET,
-     ELM_OBJ_WIN_SUB_ID_TITLE_SET,
-     ELM_OBJ_WIN_SUB_ID_TITLE_GET,
-     ELM_OBJ_WIN_SUB_ID_ICON_NAME_SET,
-     ELM_OBJ_WIN_SUB_ID_ICON_NAME_GET,
-     ELM_OBJ_WIN_SUB_ID_ROLE_SET,
-     ELM_OBJ_WIN_SUB_ID_ROLE_GET,
-     ELM_OBJ_WIN_SUB_ID_ICON_OBJECT_SET,
-     ELM_OBJ_WIN_SUB_ID_ICON_OBJECT_GET,
-     ELM_OBJ_WIN_SUB_ID_AUTODEL_SET,
-     ELM_OBJ_WIN_SUB_ID_AUTODEL_GET,
-     ELM_OBJ_WIN_SUB_ID_ACTIVATE,
-     ELM_OBJ_WIN_SUB_ID_LOWER,
-     ELM_OBJ_WIN_SUB_ID_RAISE,
-     ELM_OBJ_WIN_SUB_ID_CENTER,
-     ELM_OBJ_WIN_SUB_ID_BORDERLESS_SET,
-     ELM_OBJ_WIN_SUB_ID_BORDERLESS_GET,
-     ELM_OBJ_WIN_SUB_ID_SHAPED_SET,
-     ELM_OBJ_WIN_SUB_ID_SHAPED_GET,
-     ELM_OBJ_WIN_SUB_ID_ALPHA_SET,
-     ELM_OBJ_WIN_SUB_ID_ALPHA_GET,
-     ELM_OBJ_WIN_SUB_ID_OVERRIDE_SET,
-     ELM_OBJ_WIN_SUB_ID_OVERRIDE_GET,
-     ELM_OBJ_WIN_SUB_ID_FULLSCREEN_SET,
-     ELM_OBJ_WIN_SUB_ID_FULLSCREEN_GET,
-     ELM_OBJ_WIN_SUB_ID_MAIN_MENU_GET,
-     ELM_OBJ_WIN_SUB_ID_MAXIMIZED_SET,
-     ELM_OBJ_WIN_SUB_ID_MAXIMIZED_GET,
-     ELM_OBJ_WIN_SUB_ID_ICONIFIED_SET,
-     ELM_OBJ_WIN_SUB_ID_ICONIFIED_GET,
-     ELM_OBJ_WIN_SUB_ID_WITHDRAWN_SET,
-     ELM_OBJ_WIN_SUB_ID_WITHDRAWN_GET,
-     ELM_OBJ_WIN_SUB_ID_AVAILABLE_PROFILES_SET,
-     ELM_OBJ_WIN_SUB_ID_AVAILABLE_PROFILES_GET,
-     ELM_OBJ_WIN_SUB_ID_PROFILE_SET,
-     ELM_OBJ_WIN_SUB_ID_PROFILE_GET,
-     ELM_OBJ_WIN_SUB_ID_URGENT_SET,
-     ELM_OBJ_WIN_SUB_ID_URGENT_GET,
-     ELM_OBJ_WIN_SUB_ID_DEMAND_ATTENTION_SET,
-     ELM_OBJ_WIN_SUB_ID_DEMAND_ATTENTION_GET,
-     ELM_OBJ_WIN_SUB_ID_MODAL_SET,
-     ELM_OBJ_WIN_SUB_ID_MODAL_GET,
-     ELM_OBJ_WIN_SUB_ID_ASPECT_SET,
-     ELM_OBJ_WIN_SUB_ID_ASPECT_GET,
-     ELM_OBJ_WIN_SUB_ID_SIZE_BASE_SET,
-     ELM_OBJ_WIN_SUB_ID_SIZE_BASE_GET,
-     ELM_OBJ_WIN_SUB_ID_SIZE_STEP_SET,
-     ELM_OBJ_WIN_SUB_ID_SIZE_STEP_GET,
-     ELM_OBJ_WIN_SUB_ID_LAYER_SET,
-     ELM_OBJ_WIN_SUB_ID_LAYER_GET,
-     ELM_OBJ_WIN_SUB_ID_ROTATION_SET,
-     ELM_OBJ_WIN_SUB_ID_ROTATION_WITH_RESIZE_SET,
-     ELM_OBJ_WIN_SUB_ID_ROTATION_GET,
-     ELM_OBJ_WIN_SUB_ID_STICKY_SET,
-     ELM_OBJ_WIN_SUB_ID_STICKY_GET,
-     ELM_OBJ_WIN_SUB_ID_KEYBOARD_MODE_SET,
-     ELM_OBJ_WIN_SUB_ID_KEYBOARD_MODE_GET,
-     ELM_OBJ_WIN_SUB_ID_KEYBOARD_WIN_SET,
-     ELM_OBJ_WIN_SUB_ID_KEYBOARD_WIN_GET,
-     ELM_OBJ_WIN_SUB_ID_INDICATOR_MODE_SET,
-     ELM_OBJ_WIN_SUB_ID_INDICATOR_MODE_GET,
-     ELM_OBJ_WIN_SUB_ID_INDICATOR_OPACITY_SET,
-     ELM_OBJ_WIN_SUB_ID_INDICATOR_OPACITY_GET,
-     ELM_OBJ_WIN_SUB_ID_SCREEN_POSITION_GET,
-     ELM_OBJ_WIN_SUB_ID_FOCUS_GET,
-     ELM_OBJ_WIN_SUB_ID_SCREEN_CONSTRAIN_SET,
-     ELM_OBJ_WIN_SUB_ID_SCREEN_CONSTRAIN_GET,
-     ELM_OBJ_WIN_SUB_ID_SCREEN_SIZE_GET,
-     ELM_OBJ_WIN_SUB_ID_SCREEN_DPI_GET,
-     ELM_OBJ_WIN_SUB_ID_CONFORMANT_SET,
-     ELM_OBJ_WIN_SUB_ID_CONFORMANT_GET,
-     ELM_OBJ_WIN_SUB_ID_QUICKPANEL_SET,
-     ELM_OBJ_WIN_SUB_ID_QUICKPANEL_GET,
-     ELM_OBJ_WIN_SUB_ID_QUICKPANEL_PRIORITY_MAJOR_SET,
-     ELM_OBJ_WIN_SUB_ID_QUICKPANEL_PRIORITY_MAJOR_GET,
-     ELM_OBJ_WIN_SUB_ID_QUICKPANEL_PRIORITY_MINOR_SET,
-     ELM_OBJ_WIN_SUB_ID_QUICKPANEL_PRIORITY_MINOR_GET,
-     ELM_OBJ_WIN_SUB_ID_QUICKPANEL_ZONE_SET,
-     ELM_OBJ_WIN_SUB_ID_QUICKPANEL_ZONE_GET,
-     ELM_OBJ_WIN_SUB_ID_PROP_FOCUS_SKIP_SET,
-     ELM_OBJ_WIN_SUB_ID_ILLUME_COMMAND_SEND,
-     ELM_OBJ_WIN_SUB_ID_INLINED_IMAGE_OBJECT_GET,
-     ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_ENABLED_SET,
-     ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_ENABLED_GET,
-     ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_STYLE_SET,
-     ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_STYLE_GET,
-     ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_ANIMATE_SET,
-     ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_ANIMATE_GET,
-     ELM_OBJ_WIN_SUB_ID_SOCKET_LISTEN,
-     ELM_OBJ_WIN_SUB_ID_XWINDOW_GET,
-     ELM_OBJ_WIN_SUB_ID_WL_WINDOW_GET,
-     ELM_OBJ_WIN_SUB_ID_WINDOW_ID_GET,
-     ELM_OBJ_WIN_SUB_ID_WM_ROTATION_SUPPORTED_GET,
-     ELM_OBJ_WIN_SUB_ID_WM_PREFERRED_ROTATION_SET,
-     ELM_OBJ_WIN_SUB_ID_WM_PREFERRED_ROTATION_GET,
-     ELM_OBJ_WIN_SUB_ID_WM_AVAILABLE_ROTATIONS_SET,
-     ELM_OBJ_WIN_SUB_ID_WM_AVAILABLE_ROTATIONS_GET,
-     ELM_OBJ_WIN_SUB_ID_WM_MANUAL_ROTATION_DONE_SET,
-     ELM_OBJ_WIN_SUB_ID_WM_MANUAL_ROTATION_DONE_GET,
-     ELM_OBJ_WIN_SUB_ID_WM_MANUAL_ROTATION_DONE,
-     ELM_OBJ_WIN_SUB_ID_LAST
-  };
-
-#define ELM_OBJ_WIN_ID(sub_id) (ELM_OBJ_WIN_BASE_ID + sub_id)
-
-
-/**
- * @def elm_obj_win_constructor
- * @since 1.8
- *
- * No description supplied by the EAPI.
- *
- * @param[in] name
- * @param[in] type
- *
- */
-#define elm_obj_win_constructor(name, type) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WIN_CONSTRUCTOR), EO_TYPECHECK(const char *, name), EO_TYPECHECK(Elm_Win_Type, type)
-
-/**
- * @def elm_obj_win_resize_object_add
- * @since 1.8
- *
- * Add subobj as a resize object of window @p obj.
- *
- * @param[in] subobj
- *
- * @see elm_win_resize_object_add
- */
-#define elm_obj_win_resize_object_add(subobj) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_RESIZE_OBJECT_ADD), EO_TYPECHECK(Evas_Object *, subobj)
-
-/**
- * @def elm_obj_win_resize_object_del
- * @since 1.8
- *
- * Delete subobj as a resize object of window @p obj.
- *
- * @param[in] subobj
- *
- * @see elm_win_resize_object_del
- */
-#define elm_obj_win_resize_object_del(subobj) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_RESIZE_OBJECT_DEL), EO_TYPECHECK(Evas_Object *, subobj)
-
-/**
- * @def elm_obj_win_type_get
- * @since 1.9
- *
- * Get the type of the window
- *
- * @param[out] ret
- *
- * @see elm_win_type_get
- */
-#define elm_obj_win_type_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_TYPE_GET), EO_TYPECHECK(Elm_Win_Type *, ret)
-
-/**
- * @def elm_obj_win_title_set
- * @since 1.8
- *
- * Set the title of the window
- *
- * @param[in] title
- *
- * @see elm_win_title_set
- */
-#define elm_obj_win_title_set(title) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_TITLE_SET), EO_TYPECHECK(const char *, title)
-
-/**
- * @def elm_obj_win_title_get
- * @since 1.8
- *
- * Get the title of the window
- *
- * @param[out] ret
- *
- * @see elm_win_title_get
- */
-#define elm_obj_win_title_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_TITLE_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_win_icon_name_set
- * @since 1.8
- *
- * Set the icon name of the window
- *
- * @param[in] icon_name
- *
- * @see elm_win_icon_name_set
- */
-#define elm_obj_win_icon_name_set(icon_name) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ICON_NAME_SET), EO_TYPECHECK(const char *, icon_name)
-
-/**
- * @def elm_obj_win_icon_name_get
- * @since 1.8
- *
- * Get the icon name of the window
- *
- * @param[out] ret
- *
- * @see elm_win_icon_name_get
- */
-#define elm_obj_win_icon_name_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ICON_NAME_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_win_role_set
- * @since 1.8
- *
- * Set the role of the window
- *
- * @param[in] role
- *
- * @see elm_win_role_set
- */
-#define elm_obj_win_role_set(role) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ROLE_SET), EO_TYPECHECK(const char *, role)
-
-/**
- * @def elm_obj_win_role_get
- * @since 1.8
- *
- * Get the role of the window
- *
- * @param[out] ret
- *
- * @see elm_win_role_get
- */
-#define elm_obj_win_role_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ROLE_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_win_icon_object_set
- * @since 1.8
- *
- * Set a window object's icon
- *
- * @param[in] icon
- *
- * @see elm_win_icon_object_set
- */
-#define elm_obj_win_icon_object_set(icon) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ICON_OBJECT_SET), EO_TYPECHECK(Evas_Object *, icon)
-
-/**
- * @def elm_obj_win_icon_object_get
- * @since 1.8
- *
- * Get the icon object used for the window
- *
- * @param[out] ret
- *
- * @see elm_win_icon_object_get
- */
-#define elm_obj_win_icon_object_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ICON_OBJECT_GET), EO_TYPECHECK(const Evas_Object **, ret)
-
-/**
- * @def elm_obj_win_autodel_set
- * @since 1.8
- *
- * Set the window's autodel state.
- *
- * @param[in] autodel
- *
- * @see elm_win_autodel_set
- */
-#define elm_obj_win_autodel_set(autodel) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_AUTODEL_SET), EO_TYPECHECK(Eina_Bool, autodel)
-
-/**
- * @def elm_obj_win_autodel_get
- * @since 1.8
- *
- * Get the window's autodel state.
- *
- * @param[out] ret
- *
- * @see elm_win_autodel_get
- */
-#define elm_obj_win_autodel_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_AUTODEL_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_activate
- * @since 1.8
- *
- * Activate a window object.
- *
- *
- * @see elm_win_activate
- */
-#define elm_obj_win_activate() ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ACTIVATE)
-
-/**
- * @def elm_obj_win_lower
- * @since 1.8
- *
- * Lower a window object.
- *
- *
- * @see elm_win_lower
- */
-#define elm_obj_win_lower() ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_LOWER)
-
-/**
- * @def elm_obj_win_raise
- * @since 1.8
- *
- * Raise a window object.
- *
- *
- * @see elm_win_raise
- */
-#define elm_obj_win_raise() ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_RAISE)
-
-/**
- * @def elm_obj_win_center
- * @since 1.8
- *
- * Center a window on its screen
- *
- * @param[in] h
- * @param[in] v
- *
- * @see elm_win_center
- */
-#define elm_obj_win_center(h, v) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_CENTER), EO_TYPECHECK(Eina_Bool, h), EO_TYPECHECK(Eina_Bool, v)
-
-/**
- * @def elm_obj_win_borderless_set
- * @since 1.8
- *
- * Set the borderless state of a window.
- *
- * @param[in] borderless
- *
- * @see elm_win_borderless_set
- */
-#define elm_obj_win_borderless_set(borderless) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_BORDERLESS_SET), EO_TYPECHECK(Eina_Bool, borderless)
-
-/**
- * @def elm_obj_win_borderless_get
- * @since 1.8
- *
- * Get the borderless state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_borderless_get
- */
-#define elm_obj_win_borderless_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_BORDERLESS_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_shaped_set
- * @since 1.8
- *
- * Set the shaped state of a window.
- *
- * @param[in] shaped
- *
- * @see elm_win_shaped_set
- */
-#define elm_obj_win_shaped_set(shaped) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SHAPED_SET), EO_TYPECHECK(Eina_Bool, shaped)
-
-/**
- * @def elm_obj_win_shaped_get
- * @since 1.8
- *
- * Get the shaped state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_shaped_get
- */
-#define elm_obj_win_shaped_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SHAPED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_alpha_set
- * @since 1.8
- *
- * Set the alpha channel state of a window.
- *
- * @param[in] alpha
- *
- * @see elm_win_alpha_set
- */
-#define elm_obj_win_alpha_set(alpha) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ALPHA_SET), EO_TYPECHECK(Eina_Bool, alpha)
-
-/**
- * @def elm_obj_win_alpha_get
- * @since 1.8
- *
- * Get the alpha channel state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_alpha_get
- */
-#define elm_obj_win_alpha_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ALPHA_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_override_set
- * @since 1.8
- *
- * Set the override state of a window.
- *
- * @param[in] override
- *
- * @see elm_win_override_set
- */
-#define elm_obj_win_override_set(override) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_OVERRIDE_SET), EO_TYPECHECK(Eina_Bool, override)
-
-/**
- * @def elm_obj_win_override_get
- * @since 1.8
- *
- * Get the override state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_override_get
- */
-#define elm_obj_win_override_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_OVERRIDE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_fullscreen_set
- * @since 1.8
- *
- * Set the fullscreen state of a window.
- *
- * @param[in] fullscreen
- *
- * @see elm_win_fullscreen_set
- */
-#define elm_obj_win_fullscreen_set(fullscreen) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FULLSCREEN_SET), EO_TYPECHECK(Eina_Bool, fullscreen)
-
-/**
- * @def elm_obj_win_fullscreen_get
- * @since 1.8
- *
- * Get the fullscreen state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_fullscreen_get
- */
-#define elm_obj_win_fullscreen_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FULLSCREEN_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_main_menu_get
- * @since 1.8
- *
- * Get the Main Menu of a window.
- *
- * @param[out] ret Main menu.
- *
- * @see elm_win_main_menu_get
- */
-#define elm_obj_win_main_menu_get(ret)                    \
-        ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_MAIN_MENU_GET), \
-        EO_TYPECHECK(Eo **, ret)
-
-/**
- * @def elm_obj_win_maximized_set
- * @since 1.8
- *
- * Set the maximized state of a window.
- *
- * @param[in] maximized
- *
- * @see elm_win_maximized_set
- */
-#define elm_obj_win_maximized_set(maximized) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_MAXIMIZED_SET), EO_TYPECHECK(Eina_Bool, maximized)
-
-/**
- * @def elm_obj_win_maximized_get
- * @since 1.8
- *
- * Get the maximized state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_maximized_get
- */
-#define elm_obj_win_maximized_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_MAXIMIZED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_iconified_set
- * @since 1.8
- *
- * Set the iconified state of a window.
- *
- * @param[in] iconified
- *
- * @see elm_win_iconified_set
- */
-#define elm_obj_win_iconified_set(iconified) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ICONIFIED_SET), EO_TYPECHECK(Eina_Bool, iconified)
-
-/**
- * @def elm_obj_win_iconified_get
- * @since 1.8
- *
- * Get the iconified state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_iconified_get
- */
-#define elm_obj_win_iconified_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ICONIFIED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_withdrawn_set
- * @since 1.8
- *
- * Set the withdrawn state of a window.
- *
- * @param[in] withdrawn
- *
- * @see elm_win_withdrawn_set
- */
-#define elm_obj_win_withdrawn_set(withdrawn) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WITHDRAWN_SET), EO_TYPECHECK(Eina_Bool, withdrawn)
-
-/**
- * @def elm_obj_win_withdrawn_get
- * @since 1.8
- *
- * Get the withdrawn state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_withdrawn_get
- */
-#define elm_obj_win_withdrawn_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WITHDRAWN_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_available_profiles_set
- * @since 1.8
- *
- * Set the array of available profiles to a window.
- *
- * @param[in] profiles
- * @param[in] count
- *
- * @see elm_win_available_profiles_set
- */
-#define elm_obj_win_available_profiles_set(profiles, count) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_AVAILABLE_PROFILES_SET), EO_TYPECHECK(const char **, profiles), EO_TYPECHECK(unsigned int, count)
-
-/**
- * @def elm_obj_win_available_profiles_get
- * @since 1.8
- *
- * Get the array of available profiles of a window.
- *
- * @param[out] profiles
- * @param[out] count
- * @param[out] ret
- *
- * @see elm_win_available_profiles_get
- */
-#define elm_obj_win_available_profiles_get(profiles, count, ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_AVAILABLE_PROFILES_GET), EO_TYPECHECK(char ***, profiles), EO_TYPECHECK(unsigned int *, count), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_profile_set
- * @since 1.8
- *
- * Set the profile of a window.
- *
- * @param[in] profile
- *
- * @see elm_win_profile_set
- */
-#define elm_obj_win_profile_set(profile) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_PROFILE_SET), EO_TYPECHECK(const char *, profile)
-
-/**
- * @def elm_obj_win_profile_get
- * @since 1.8
- *
- * Get the profile of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_profile_get
- */
-#define elm_obj_win_profile_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_PROFILE_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_win_urgent_set
- * @since 1.8
- *
- * Set the urgent state of a window.
- *
- * @param[in] urgent
- *
- * @see elm_win_urgent_set
- */
-#define elm_obj_win_urgent_set(urgent) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_URGENT_SET), EO_TYPECHECK(Eina_Bool, urgent)
-
-/**
- * @def elm_obj_win_urgent_get
- * @since 1.8
- *
- * Get the urgent state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_urgent_get
- */
-#define elm_obj_win_urgent_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_URGENT_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_demand_attention_set
- * @since 1.8
- *
- * Set the demand_attention state of a window.
- *
- * @param[in] demand_attention
- *
- * @see elm_win_demand_attention_set
- */
-#define elm_obj_win_demand_attention_set(demand_attention) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_DEMAND_ATTENTION_SET), EO_TYPECHECK(Eina_Bool, demand_attention)
-
-/**
- * @def elm_obj_win_demand_attention_get
- * @since 1.8
- *
- * Get the demand_attention state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_demand_attention_get
- */
-#define elm_obj_win_demand_attention_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_DEMAND_ATTENTION_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_modal_set
- * @since 1.8
- *
- * Set the modal state of a window.
- *
- * @param[in] modal
- *
- * @see elm_win_modal_set
- */
-#define elm_obj_win_modal_set(modal) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_MODAL_SET), EO_TYPECHECK(Eina_Bool, modal)
-
-/**
- * @def elm_obj_win_modal_get
- * @since 1.8
- *
- * Get the modal state of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_modal_get
- */
-#define elm_obj_win_modal_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_MODAL_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_aspect_set
- * @since 1.8
- *
- * Set the aspect ratio of a window.
- *
- * @param[in] aspect
- *
- * @see elm_win_aspect_set
- */
-#define elm_obj_win_aspect_set(aspect) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ASPECT_SET), EO_TYPECHECK(double, aspect)
-
-/**
- * @def elm_obj_win_aspect_get
- * @since 1.8
- *
- * Get the aspect ratio of a window.
- *
- * @param[out] ret
- *
- * @see elm_win_aspect_get
- */
-#define elm_obj_win_aspect_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ASPECT_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @def elm_obj_win_size_base_set
- * @since 1.8
- *
- * Set the base window size used with stepping calculation
- *
- * @param[in] w
- * @param[in] h
- *
- * @see elm_win_size_base_set
- */
-#define elm_obj_win_size_base_set(w, h) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SIZE_BASE_SET), EO_TYPECHECK(int, w), EO_TYPECHECK(int, h)
-
-/**
- * @def elm_obj_win_size_base_get
- * @since 1.8
- *
- * Get the base size of a window.
- *
- * @param[out] w
- * @param[out] h
- *
- * @see elm_win_size_base_get
- */
-#define elm_obj_win_size_base_get(w, h) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SIZE_BASE_GET), EO_TYPECHECK(int *, w), EO_TYPECHECK(int *, h)
-
-/**
- * @def elm_obj_win_size_step_set
- * @since 1.8
- *
- * Set the window stepping used with sizing calculation
- *
- * @param[in] w
- * @param[in] h
- *
- * @see elm_win_size_step_set
- */
-#define elm_obj_win_size_step_set(w, h) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SIZE_STEP_SET), EO_TYPECHECK(int, w), EO_TYPECHECK(int, h)
-
-/**
- * @def elm_obj_win_size_step_get
- * @since 1.8
- *
- * Get the stepping of a window.
- *
- * @param[out] w
- * @param[out] h
- *
- * @see elm_win_size_step_get
- */
-#define elm_obj_win_size_step_get(w, h) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SIZE_STEP_GET), EO_TYPECHECK(int *, w), EO_TYPECHECK(int *, h)
 
-/**
- * @def elm_obj_win_layer_set
- * @since 1.8
- *
- * Set the layer of the window.
- *
- * @param[in] layer
- *
- * @see elm_win_layer_set
- */
-#define elm_obj_win_layer_set(layer) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_LAYER_SET), EO_TYPECHECK(int, layer)
-
-/**
- * @def elm_obj_win_layer_get
- * @since 1.8
- *
- * Get the layer of the window.
- *
- * @param[out] ret
- *
- * @see elm_win_layer_get
- */
-#define elm_obj_win_layer_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_LAYER_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_win_rotation_set
- * @since 1.8
- *
- * Set the rotation of the window.
- *
- * @param[in] rotation
- *
- * @see elm_win_rotation_set
- */
-#define elm_obj_win_rotation_set(rotation) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ROTATION_SET), EO_TYPECHECK(int, rotation)
-
-/**
- * @def elm_obj_win_rotation_with_resize_set
- * @since 1.8
- *
- * Rotates the window and resizes it.
- *
- * @param[in] rotation
- *
- * @see elm_win_rotation_with_resize_set
- */
-#define elm_obj_win_rotation_with_resize_set(rotation) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ROTATION_WITH_RESIZE_SET), EO_TYPECHECK(int, rotation)
-
-/**
- * @def elm_obj_win_rotation_get
- * @since 1.8
- *
- * Get the rotation of the window.
- *
- * @param[out] ret
- *
- * @see elm_win_rotation_get
- */
-#define elm_obj_win_rotation_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ROTATION_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_win_sticky_set
- * @since 1.8
- *
- * Set the sticky state of the window.
- *
- * @param[in] sticky
- *
- * @see elm_win_sticky_set
- */
-#define elm_obj_win_sticky_set(sticky) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_STICKY_SET), EO_TYPECHECK(Eina_Bool, sticky)
-
-/**
- * @def elm_obj_win_sticky_get
- * @since 1.8
- *
- * Get the sticky state of the window.
- *
- * @param[out] ret
- *
- * @see elm_win_sticky_get
- */
-#define elm_obj_win_sticky_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_STICKY_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_keyboard_mode_set
- * @since 1.8
- *
- * Sets the keyboard mode of the window.
- *
- * @param[in] mode
- *
- * @see elm_win_keyboard_mode_set
- */
-#define elm_obj_win_keyboard_mode_set(mode) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_KEYBOARD_MODE_SET), EO_TYPECHECK(Elm_Win_Keyboard_Mode, mode)
-
-/**
- * @def elm_obj_win_keyboard_mode_get
- * @since 1.8
- *
- * Get the keyboard mode of the window.
- *
- * @param[out] ret
- *
- * @see elm_win_keyboard_mode_get
- */
-#define elm_obj_win_keyboard_mode_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_KEYBOARD_MODE_GET), EO_TYPECHECK(Elm_Win_Keyboard_Mode *, ret)
-
-/**
- * @def elm_obj_win_keyboard_win_set
- * @since 1.8
- *
- * Sets whether the window is a keyboard.
- *
- * @param[in] is_keyboard
- *
- * @see elm_win_keyboard_win_set
- */
-#define elm_obj_win_keyboard_win_set(is_keyboard) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_KEYBOARD_WIN_SET), EO_TYPECHECK(Eina_Bool, is_keyboard)
-
-/**
- * @def elm_obj_win_keyboard_win_get
- * @since 1.8
- *
- * Get whether the window is a keyboard.
- *
- * @param[out] ret
- *
- * @see elm_win_keyboard_win_get
- */
-#define elm_obj_win_keyboard_win_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_KEYBOARD_WIN_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_indicator_mode_set
- * @since 1.8
- *
- * Sets the indicator mode of the window.
- *
- * @param[in] mode
- *
- * @see elm_win_indicator_mode_set
- */
-#define elm_obj_win_indicator_mode_set(mode) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_INDICATOR_MODE_SET), EO_TYPECHECK(Elm_Win_Indicator_Mode, mode)
-
-/**
- * @def elm_obj_win_indicator_mode_get
- * @since 1.8
- *
- * Get the indicator mode of the window.
- *
- * @param[out] ret
- *
- * @see elm_win_indicator_mode_get
- */
-#define elm_obj_win_indicator_mode_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_INDICATOR_MODE_GET), EO_TYPECHECK(Elm_Win_Indicator_Mode *, ret)
-
-/**
- * @def elm_obj_win_indicator_opacity_set
- * @since 1.8
- *
- * Sets the indicator opacity mode of the window.
- *
- * @param[in] mode
- *
- * @see elm_win_indicator_opacity_set
- */
-#define elm_obj_win_indicator_opacity_set(mode) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_INDICATOR_OPACITY_SET), EO_TYPECHECK(Elm_Win_Indicator_Opacity_Mode, mode)
-
-/**
- * @def elm_obj_win_indicator_opacity_get
- * @since 1.8
- *
- * Get the indicator opacity mode of the window.
- *
- * @param[out] ret
- *
- * @see elm_win_indicator_opacity_get
- */
-#define elm_obj_win_indicator_opacity_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_INDICATOR_OPACITY_GET), EO_TYPECHECK(Elm_Win_Indicator_Opacity_Mode *, ret)
-
-/**
- * @def elm_obj_win_screen_position_get
- * @since 1.8
- *
- * Get the screen position of a window.
- *
- * @param[out] x
- * @param[out] y
- *
- * @see elm_win_screen_position_get
- */
-#define elm_obj_win_screen_position_get(x, y) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SCREEN_POSITION_GET), EO_TYPECHECK(int *, x), EO_TYPECHECK(int *, y)
-
-/**
- * @def elm_obj_win_focus_get
- * @since 1.8
- *
- * Determine whether a window has focus
- *
- * @param[out] ret
- *
- * @see elm_win_focus_get
- */
-#define elm_obj_win_focus_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FOCUS_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_screen_constrain_set
- * @since 1.8
- *
- * Constrain the maximum width and height of a window to the width and height of its screen
- *
- * @param[in] constrain
- *
- * @see elm_win_screen_constrain_set
- */
-#define elm_obj_win_screen_constrain_set(constrain) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SCREEN_CONSTRAIN_SET), EO_TYPECHECK(Eina_Bool, constrain)
-
-/**
- * @def elm_obj_win_screen_constrain_get
- * @since 1.8
- *
- * Retrieve the constraints on the maximum width and height of a window relative to the width and height of its screen
- *
- * @param[out] ret
- *
- * @see elm_win_screen_constrain_get
- */
-#define elm_obj_win_screen_constrain_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SCREEN_CONSTRAIN_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_screen_size_get
- * @since 1.8
- *
- * Get screen geometry details for the screen that a window is on
- *
- * @param[out] x
- * @param[out] y
- * @param[out] w
- * @param[out] h
- *
- * @see elm_win_screen_size_get
- */
-#define elm_obj_win_screen_size_get(x, y, w, h) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SCREEN_SIZE_GET), EO_TYPECHECK(int *, x), EO_TYPECHECK(int *, y), EO_TYPECHECK(int *, w), EO_TYPECHECK(int *, h)
-
-/**
- * @def elm_obj_win_screen_dpi_get
- * @since 1.8
- *
- * Get screen dpi for the screen that a window is on
- *
- * @param[out] xdpi
- * @param[out] ydpi
- *
- * @see elm_win_screen_dpi_get
- */
-#define elm_obj_win_screen_dpi_get(xdpi, ydpi) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SCREEN_DPI_GET), EO_TYPECHECK(int *, xdpi), EO_TYPECHECK(int *, ydpi)
-
-/**
- * @def elm_obj_win_conformant_set
- * @since 1.8
- *
- * Set if this window is an illume conformant window
- *
- * @param[in] conformant
- *
- * @see elm_win_conformant_set
- */
-#define elm_obj_win_conformant_set(conformant) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_CONFORMANT_SET), EO_TYPECHECK(Eina_Bool, conformant)
-
-/**
- * @def elm_obj_win_conformant_get
- * @since 1.8
- *
- * Get if this window is an illume conformant window
- *
- * @param[out] ret
- *
- * @see elm_win_conformant_get
- */
-#define elm_obj_win_conformant_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_CONFORMANT_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_quickpanel_set
- * @since 1.8
- *
- * Set a window to be an illume quickpanel window
- *
- * @param[in] quickpanel
- *
- * @see elm_win_quickpanel_set
- */
-#define elm_obj_win_quickpanel_set(quickpanel) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_QUICKPANEL_SET), EO_TYPECHECK(Eina_Bool, quickpanel)
-
-/**
- * @def elm_obj_win_quickpanel_get
- * @since 1.8
- *
- * Get if this window is a quickpanel or not
- *
- * @param[out] ret
- *
- * @see elm_win_quickpanel_get
- */
-#define elm_obj_win_quickpanel_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_QUICKPANEL_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_quickpanel_priority_major_set
- * @since 1.8
- *
- * Set the major priority of a quickpanel window
- *
- * @param[in] priority
- *
- * @see elm_win_quickpanel_priority_major_set
- */
-#define elm_obj_win_quickpanel_priority_major_set(priority) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_QUICKPANEL_PRIORITY_MAJOR_SET), EO_TYPECHECK(int, priority)
-
-/**
- * @def elm_obj_win_quickpanel_priority_major_get
- * @since 1.8
- *
- * Get the major priority of a quickpanel window
- *
- * @param[out] ret
- *
- * @see elm_win_quickpanel_priority_major_get
- */
-#define elm_obj_win_quickpanel_priority_major_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_QUICKPANEL_PRIORITY_MAJOR_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_win_quickpanel_priority_minor_set
- * @since 1.8
- *
- * Set the minor priority of a quickpanel window
- *
- * @param[in] priority
- *
- * @see elm_win_quickpanel_priority_minor_set
- */
-#define elm_obj_win_quickpanel_priority_minor_set(priority) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_QUICKPANEL_PRIORITY_MINOR_SET), EO_TYPECHECK(int, priority)
-
-/**
- * @def elm_obj_win_quickpanel_priority_minor_get
- * @since 1.8
- *
- * Get the minor priority of a quickpanel window
- *
- * @param[out] ret
- *
- * @see elm_win_quickpanel_priority_minor_get
- */
-#define elm_obj_win_quickpanel_priority_minor_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_QUICKPANEL_PRIORITY_MINOR_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_win_quickpanel_zone_set
- * @since 1.8
- *
- * Set which zone this quickpanel should appear in
- *
- * @param[in] zone
- *
- * @see elm_win_quickpanel_zone_set
- */
-#define elm_obj_win_quickpanel_zone_set(zone) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_QUICKPANEL_ZONE_SET), EO_TYPECHECK(int, zone)
-
-/**
- * @def elm_obj_win_quickpanel_zone_get
- * @since 1.8
- *
- * Get which zone this quickpanel should appear in
- *
- * @param[out] ret
- *
- * @see elm_win_quickpanel_zone_get
- */
-#define elm_obj_win_quickpanel_zone_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_QUICKPANEL_ZONE_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_win_prop_focus_skip_set
- * @since 1.8
- *
- * Set the window to be skipped by keyboard focus
- *
- * @param[in] skip
- *
- * @see elm_win_prop_focus_skip_set
- */
-#define elm_obj_win_prop_focus_skip_set(skip) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_PROP_FOCUS_SKIP_SET), EO_TYPECHECK(Eina_Bool, skip)
-
-/**
- * @def elm_obj_win_illume_command_send
- * @since 1.8
- *
- * Send a command to the windowing environment
- *
- * @param[in] command
- * @param[in] params
- *
- * @see elm_win_illume_command_send
- */
-#define elm_obj_win_illume_command_send(command, params) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_ILLUME_COMMAND_SEND), EO_TYPECHECK(Elm_Illume_Command, command), EO_TYPECHECK(void *, params)
-
-/**
- * @def elm_obj_win_inlined_image_object_get
- * @since 1.8
- *
- * Get the inlined image object handle
- *
- * @param[out] ret
- *
- * @see elm_win_inlined_image_object_get
- */
-#define elm_obj_win_inlined_image_object_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_INLINED_IMAGE_OBJECT_GET), EO_TYPECHECK(Evas_Object **, ret)
-
-/**
- * @def elm_obj_win_focus_highlight_enabled_set
- * @since 1.8
- *
- * Set the enabled status for the focus highlight in a window
- *
- * @param[in] enabled
- *
- * @see elm_win_focus_highlight_enabled_set
- */
-#define elm_obj_win_focus_highlight_enabled_set(enabled) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_ENABLED_SET), EO_TYPECHECK(Eina_Bool, enabled)
-
-/**
- * @def elm_obj_win_focus_highlight_enabled_get
- * @since 1.8
- *
- * Get the enabled value of the focus highlight for this window
- *
- * @param[out] ret
- *
- * @see elm_win_focus_highlight_enabled_get
- */
-#define elm_obj_win_focus_highlight_enabled_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_ENABLED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_focus_highlight_style_set
- * @since 1.8
- *
- * Set the style for the focus highlight on this window
- *
- * @param[in] style
- *
- * @see elm_win_focus_highlight_style_set
- */
-#define elm_obj_win_focus_highlight_style_set(style) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_STYLE_SET), EO_TYPECHECK(const char *, style)
-
-/**
- * @def elm_obj_win_focus_highlight_style_get
- * @since 1.8
- *
- * Get the style set for the focus highlight object
- *
- * @param[out] ret
- *
- * @see elm_win_focus_highlight_style_get
- */
-#define elm_obj_win_focus_highlight_style_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_STYLE_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @def elm_obj_win_focus_highlight_animate_set
- * @since 1.8
- *
- * Set the animate status for the focus highlight for this window.
- *
- * @param[in] animate
- *
- * @see elm_win_focus_highlight_animate_get
- */
-#define elm_obj_win_focus_highlight_animate_set(animate) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_ANIMATE_SET), EO_TYPECHECK(Eina_Bool, animate)
-
-/**
- * @def elm_obj_win_focus_highlight_animate_get
- * @since 1.8
- *
- * Get the animate status for the focus highlight for this window.
- *
- * @param[out] ret
- *
- * @see elm_win_focus_highlight_animate_get
- */
-#define elm_obj_win_focus_highlight_animate_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_ANIMATE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_socket_listen
- * @since 1.8
- *
- * Create a socket to provide the service for Plug widget
- *
- * @param[in] svcname
- * @param[in] svcnum
- * @param[in] svcsys
- * @param[out] ret
- *
- * @see elm_win_socket_listen
- */
-#define elm_obj_win_socket_listen(svcname, svcnum, svcsys, ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SOCKET_LISTEN), EO_TYPECHECK(const char *, svcname), EO_TYPECHECK(int, svcnum), EO_TYPECHECK(Eina_Bool, svcsys), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_xwindow_get
- * @since 1.8
- *
- * Get the Ecore_X_Window of an Evas_Object
- *
- * @param[out] ret
- *
- * @see elm_win_xwindow_get
- */
-#define elm_obj_win_xwindow_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_XWINDOW_GET), EO_TYPECHECK(Ecore_X_Window *, ret)
-
-/**
- * @def elm_obj_win_wl_window_get
- * @since 1.8
- *
- * Get the Ecore_Wl_Window of an Evas_Object
- *
- * @param[out] ret
- *
- * @see elm_win_wl_window_get
- */
-#define elm_obj_win_wl_window_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WL_WINDOW_GET), EO_TYPECHECK(Ecore_Wl_Window **, ret)
-
-/**
- * @def elm_obj_win_window_id_get
- * @since 1.8
- *
- * Get the Ecore_Window of an Evas_Object
- *
- * @param[out] ret
- *
- * @see elm_win_window_id_get
- */
-#define elm_obj_win_window_id_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WINDOW_ID_GET), EO_TYPECHECK(Ecore_Window *, ret)
-
-/**
- * @def elm_obj_win_wm_rotation_supported_get
- * @since 1.9
- *
- * Query whether window manager supports window rotation or not.
- *
- * @param[out] ret
- *
- * @see elm_win_wm_rotation_supported_get
- */
-#define elm_obj_win_wm_rotation_supported_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WM_ROTATION_SUPPORTED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_wm_preferred_rotation_set
- * @since 1.9
- *
- * Set the preferred rotation value.
- *
- * @param[in] rotation
- *
- * @see elm_win_wm_rotation_preferred_rotation_set
- */
-#define elm_obj_win_wm_preferred_rotation_set(rotation) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WM_PREFERRED_ROTATION_SET), EO_TYPECHECK(int, rotation)
-
-/**
- * @def elm_obj_win_wm_preferred_rotation_get
- * @since 1.9
- *
- * Get the preferred rotation value.
- *
- * @param[out] ret
- *
- * @see elm_win_wm_rotation_preferred_rotation_get
- */
-#define elm_obj_win_wm_preferred_rotation_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WM_PREFERRED_ROTATION_GET), EO_TYPECHECK(int *, ret)
-
-/**
- * @def elm_obj_win_wm_available_rotations_set
- * @since 1.9
- *
- * Set the array of available rotations.
- *
- * @param[in] rotations
- * @param[in] count
- *
- * @see elm_win_wm_rotation_available_rotations_set
- */
-#define elm_obj_win_wm_available_rotations_set(rotation, count) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WM_AVAILABLE_ROTATIONS_SET), EO_TYPECHECK(const int *, rotations), EO_TYPECHECK(unsigned int, count)
-
-/**
- * @def elm_obj_win_wm_available_rotations_get
- * @since 1.9
- *
- * Get the array of available window rotation value.
- *
- * @param[out] rotations
- * @param[out] count
- * @param[out] ret
- *
- * @see elm_win_wm_rotation_available_rotations_get
- */
-#define elm_obj_win_wm_available_rotations_get(rotations, count, ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WM_AVAILABLE_ROTATIONS_GET), EO_TYPECHECK(int **, rotations), EO_TYPECHECK(unsigned int *, count), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_wm_manual_rotation_done_set
- * @since 1.9
- *
- * Set manual rotation done mode
- *
- * @param[in] set
- *
- * @see elm_win_wm_rotation_manual_rotation_done_set
- */
-#define elm_obj_win_wm_manual_rotation_done_set(set) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WM_MANUAL_ROTATION_DONE_SET), EO_TYPECHECK(Eina_Bool, set)
-
-/**
- * @def elm_obj_win_wm_manual_rotation_done_get
- * @since 1.9
- *
- * Get manual rotation done mode state
- *
- * @param[out] ret
- *
- * @see elm_win_wm_rotation_manual_rotation_done_get
- */
-#define elm_obj_win_wm_manual_rotation_done_get(ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WM_MANUAL_ROTATION_DONE_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @def elm_obj_win_wm_manual_rotation_done
- * @since 1.9
- *
- * Set rotation finish manually
- *
- * @see elm_win_wm_rotation_manual_rotation_done
- */
-#define elm_obj_win_wm_manual_rotation_done() ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WM_MANUAL_ROTATION_DONE)
+#include "elm_win.eo.h"
 
-#endif
 /**
  * @}
  */
diff --git a/src/lib/elm_win_legacy.h b/src/lib/elm_win_legacy.h
index 2c5c340d2..602dd2674 100644
--- a/src/lib/elm_win_legacy.h
+++ b/src/lib/elm_win_legacy.h
@@ -17,17 +17,6 @@
 EAPI Evas_Object          *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
 
 /**
- * Get the type of a window.
- *
- * @param obj The window object for which it gets the type.
- *
- * @return The type of a window object. If the object is not window object, return ELM_WIN_UNKNOWN.
- *
- * @ingroup Win
- */
-EAPI Elm_Win_Type          elm_win_type_get(const Evas_Object *obj);
-
-/**
  * Adds a window object with standard setup
  *
  * @param name The name of the window
@@ -47,679 +36,34 @@ EAPI Elm_Win_Type          elm_win_type_get(const Evas_Object *obj);
 EAPI Evas_Object          *elm_win_util_standard_add(const char *name, const char *title);
 
 /**
- * Add @p subobj as a resize object of window @p obj.
- *
- *
- * Setting an object as a resize object of the window means that the
- * @p subobj child's size and position will be controlled by the window
- * directly. That is, the object will be resized to match the window size
- * and should never be moved or resized manually by the developer.
- *
- * In addition, resize objects of the window control what the minimum size
- * of it will be, as well as whether it can or not be resized by the user.
- *
- * For the end user to be able to resize a window by dragging the handles
- * or borders provided by the Window Manager, or using any other similar
- * mechanism, all of the resize objects in the window should have their
- * evas_object_size_hint_weight_set() set to EVAS_HINT_EXPAND.
- *
- * Also notice that the window can get resized to the current size of the
- * object if the EVAS_HINT_EXPAND is set @b after the call to
- * elm_win_resize_object_add(). So if the object should get resized to the
- * size of the window, set this hint @b before adding it as a resize object
- * (this happens because the size of the window and the object are evaluated
- * as soon as the object is added to the window).
- *
- * @param obj The window object
- * @param subobj The resize object to add
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj);
-
-/**
- * Delete @p subobj as a resize object of window @p obj.
- *
- * This function removes the object @p subobj from the resize objects of
- * the window @p obj. It will not delete the object itself, which will be
- * left unmanaged and should be deleted by the developer, manually handled
- * or set as child of some other container.
- *
- * @param obj The window object
- * @param subobj The resize object to add
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj);
-
-/**
- * Set the title of the window
- *
- * @param obj The window object
- * @param title The title to set
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_title_set(Evas_Object *obj, const char *title);
-
-/**
- * Get the title of the window
- *
- * The returned string is an internal one and should not be freed or
- * modified. It will also be invalid if a new title is set or if
- * the window is destroyed.
- *
- * @param obj The window object
- * @return The title
- *
- * @ingroup Win
- */
-EAPI const char           *elm_win_title_get(const Evas_Object *obj);
-
-/**
- * Set the icon name of the window
- *
- * @param obj The window object
- * @param icon_name The icon name to set
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_icon_name_set(Evas_Object *obj, const char *icon_name);
-
-/**
- * Get the icon name of the window
- *
- * The returned string is an internal one and should not be freed or
- * modified. It will also be invalid if a new icon name is set or if
- * the window is destroyed.
- *
- * @param obj The window object
- * @return The icon name
- *
- * @ingroup Win
- */
-EAPI const char           *elm_win_icon_name_get(const Evas_Object *obj);
-
-/**
- * Set the role of the window
- *
- * @param obj The window object
- * @param role The role to set
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_role_set(Evas_Object *obj, const char *role);
-
-/**
- * Get the role of the window
- *
- * The returned string is an internal one and should not be freed or
- * modified. It will also be invalid if a new role is set or if
- * the window is destroyed.
- *
- * @param obj The window object
- * @return The role
- *
- * @ingroup Win
- */
-EAPI const char           *elm_win_role_get(const Evas_Object *obj);
-
-/**
- * Set a window object's icon
- *
- * This sets an image to be used as the icon for the given window, in
- * the window manager decoration part. The exact pixel dimensions of
- * the object (not object size) will be used, and the image pixels
- * will be used as-is when this function is called. If the image
- * object has been updated, then call this function again to source
- * the image pixels and put them on the window's icon. Note that
- * <b>only Evas image objects are allowed</b>, for
- *
- * @param obj The window object to get an icon
- * @param icon The Evas image object to use for an icon
- *
- * Example of usage:
- * @code
- *  icon = evas_object_image_add(evas_object_evas_get(elm_window));
- *  evas_object_image_file_set(icon, "/path/to/the/icon", NULL);
- *  elm_win_icon_object_set(elm_window, icon);
- *  evas_object_show(icon);
- * @endcode
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_icon_object_set(Evas_Object *obj, Evas_Object *icon);
-
-/**
- * Get the icon object used for the window
- *
- * The object returns is the one marked by elm_win_icon_object_set() as the
- * object to use for the window icon.
- *
- * @param obj The window object
- * @return The icon object set
- *
- * @ingroup Win
- */
-EAPI const Evas_Object    *elm_win_icon_object_get(const Evas_Object *obj);
-
-/**
- * Set the window's autodel state.
- *
- * When closing the window in any way outside of the program control, like
- * pressing the X button in the titlebar or using a command from the
- * Window Manager, a "delete,request" signal is emitted to indicate that
- * this event occurred and the developer can take any action, which may
- * include, or not, destroying the window object.
- *
- * When the @p autodel parameter is set, the window will be automatically
- * destroyed when this event occurs, after the signal is emitted.
- * If @p autodel is @c EINA_FALSE, then the window will not be destroyed
- * and is up to the program to do so when it's required.
- *
- * @param obj The window object
- * @param autodel If true, the window will automatically delete itself when
- * closed
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel);
-
-/**
- * Get the window's autodel state.
- *
- * @param obj The window object
- * @return If the window will automatically delete itself when closed
- *
- * @see elm_win_autodel_set()
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_autodel_get(const Evas_Object *obj);
-
-/**
- * Activate a window object.
- *
- * This function sends a request to the Window Manager to activate the
- * window pointed by @p obj. If honored by the WM, the window will receive
- * the keyboard focus.
- *
- * @note This is just a request that a Window Manager may ignore, so calling
- * this function does not ensure in any way that the window will be the
- * active one after it.
- *
- * @param obj The window object
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_activate(Evas_Object *obj);
-
-/**
- * Lower a window object.
- *
- * Places the window pointed by @p obj at the bottom of the stack, so that
- * no other window is covered by it.
- *
- * If elm_win_override_set() is not set, the Window Manager may ignore this
- * request.
- *
- * @param obj The window object
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_lower(Evas_Object *obj);
-
-/**
- * Raise a window object.
- *
- * Places the window pointed by @p obj at the top of the stack, so that it's
- * not covered by any other window.
- *
- * If elm_win_override_set() is not set, the Window Manager may ignore this
- * request.
- *
- * @param obj The window object
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_raise(Evas_Object *obj);
-
-/**
- * Center a window on its screen
- *
- * This function centers window @p obj horizontally and/or vertically based on the values
- * of @p h and @p v.
- * @param obj The window object
- * @param h If true, center horizontally. If false, do not change horizontal location.
- * @param v If true, center vertically. If false, do not change vertical location.
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_center(Evas_Object *obj, Eina_Bool h, Eina_Bool v);
-
-/**
- * Set the borderless state of a window.
- *
- * This function requests the Window Manager to not draw any decoration
- * around the window.
- *
- * @param obj The window object
- * @param borderless If true, the window is borderless
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless);
-
-/**
- * Get the borderless state of a window.
- *
- * @param obj The window object
- * @return If true, the window is borderless
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_borderless_get(const Evas_Object *obj);
-
-/**
- * Set the shaped state of a window.
- *
- * Shaped windows, when supported, will render the parts of the window that
- * has no content, transparent.
- *
- * If @p shaped is EINA_FALSE, then it is strongly advised to have some
- * background object or cover the entire window in any other way, or the
- * parts of the canvas that have no data will show framebuffer artifacts.
- *
- * @param obj The window object
- * @param shaped If true, the window is shaped
- *
- * @see elm_win_alpha_set()
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_shaped_set(Evas_Object *obj, Eina_Bool shaped);
-
-/**
- * Get the shaped state of a window.
- *
- * @param obj The window object
- * @return If true, the window is shaped
- *
- * @see elm_win_shaped_set()
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_shaped_get(const Evas_Object *obj);
-
-/**
- * Set the alpha channel state of a window.
- *
- * If @p alpha is EINA_TRUE, the alpha channel of the canvas will be enabled
- * possibly making parts of the window completely or partially transparent.
- * This is also subject to the underlying system supporting it, like for
- * example, running under a compositing manager. If no compositing is
- * available, enabling this option will instead fallback to using shaped
- * windows, with elm_win_shaped_set().
- *
- * @param obj The window object
- * @param enabled EINA_TRUE if the window alpha channel is enabled, EINA_FALSE otherwise
- *
- * @see elm_win_alpha_set()
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_alpha_set(Evas_Object *obj, Eina_Bool enabled);
-
-/**
- * Get the alpha channel state of a window.
- *
- * @param obj The window object
- * @return EINA_TRUE if the window alpha channel is enabled, EINA_FALSE
- * otherwise
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_alpha_get(const Evas_Object *obj);
-
-/**
- * Set the override state of a window.
- *
- * A window with @p override set to EINA_TRUE will not be managed by the
- * Window Manager. This means that no decorations of any kind will be shown
- * for it, moving and resizing must be handled by the application, as well
- * as the window visibility.
- *
- * This should not be used for normal windows, and even for not so normal
- * ones, it should only be used when there's a good reason and with a lot
- * of care. Mishandling override windows may result situations that
- * disrupt the normal workflow of the end user.
- *
- * @param obj The window object
- * @param override If true, the window is overridden
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_override_set(Evas_Object *obj, Eina_Bool override);
-
-/**
- * Get the override state of a window.
- *
- * @param obj The window object
- * @return If true, the window is overridden
- *
- * @see elm_win_override_set()
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_override_get(const Evas_Object *obj);
-
-/**
- * Set the fullscreen state of a window.
- *
- * @param obj The window object
- * @param fullscreen If true, the window is fullscreen
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen);
-
-/**
- * Get the fullscreen state of a window.
- *
- * @param obj The window object
- * @return If true, the window is fullscreen
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_fullscreen_get(const Evas_Object *obj);
-
-/**
- * Get the Main Menu of a window.
- *
- * @param obj The window object
- * @return The Main Menu of the window (NULL if error).
- *
- * @ingroup Win
- */
-EAPI Evas_Object          *elm_win_main_menu_get(const Evas_Object *obj);
-
-/**
- * Set the maximized state of a window.
- *
- * @param obj The window object
- * @param maximized If true, the window is maximized
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized);
-
-/**
- * Get the maximized state of a window.
- *
- * @param obj The window object
- * @return If true, the window is maximized
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_maximized_get(const Evas_Object *obj);
-
-/**
- * Set the iconified state of a window.
- *
- * @param obj The window object
- * @param iconified If true, the window is iconified
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified);
-
-/**
- * Get the iconified state of a window.
- *
- * @param obj The window object
- * @return If true, the window is iconified
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_iconified_get(const Evas_Object *obj);
-
-/**
- * Set the withdrawn state of a window.
- *
- * @param obj The window object
- * @param withdrawn If true, the window is withdrawn
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_withdrawn_set(Evas_Object *obj, Eina_Bool withdrawn);
-
-/**
- * Get the withdrawn state of a window.
- *
- * @param obj The window object
- * @return If true, the window is withdrawn
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_withdrawn_get(const Evas_Object *obj);
-
-/**
- * Set the array of available profiles to a window.
- *
- * @param obj The window object
- * @param profiles The string array of available profiles
- * @param count The number of members in profiles
- *
- * @ingroup Win
- * @since 1.8
- */
-EAPI void                  elm_win_available_profiles_set(Evas_Object *obj, const char **profiles, unsigned int count);
-
-/**
- * Get the array of available profiles of a window.
+ * Set the floating mode of a window.
  *
  * @param obj The window object
- * @param profiles Where to return the string array of available profiles
- * @param count Where to return the number of members in profiles
- * @return EINA_TRUE if available profiles exist, EINA_FALSE otherwise
- *
- * @ingroup Win
- * @since 1.8
- */
-EAPI Eina_Bool             elm_win_available_profiles_get(const Evas_Object *obj, char ***profiles, unsigned int *count);
-
-/**
- * Set the profile of a window.
+ * @param floating If true, the window is floating mode
  *
- * @param obj The window object
- * @param profile The string value of a window profile
+ * The floating mode can be used on mobile environment. For example, if the
+ * video-player window sets the floating mode, then e (enlightenment window
+ * manager) changes its geometry and handles it like a popup. This is similar to
+ * a multi window concept in a mobile phone. The way of handling floating mode
+ * window is decided by enlightenment window manager.
  *
  * @ingroup Win
+ * @see elm_win_floating_mode_get()
  * @since 1.8
  */
-EAPI void                  elm_win_profile_set(Evas_Object *obj, const char *profile);
+EAPI void                  elm_win_floating_mode_set(Evas_Object *obj, Eina_Bool floating);
 
 /**
- * Get the profile of a window.
+ * Get the floating mode of a window.
  *
  * @param obj The window object
- * @return The string value of a window profile, or NULL if none exists
+ * @return If true, the window is floating mode
  *
  * @ingroup Win
+ * @see elm_win_floating_mode_set()
  * @since 1.8
  */
-EAPI const char           *elm_win_profile_get(const Evas_Object *obj);
-
-/**
- * Set the urgent state of a window.
- *
- * @param obj The window object
- * @param urgent If true, the window is urgent
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_urgent_set(Evas_Object *obj, Eina_Bool urgent);
-
-/**
- * Get the urgent state of a window.
- *
- * @param obj The window object
- * @return If true, the window is urgent
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_urgent_get(const Evas_Object *obj);
-
-/**
- * Set the demand_attention state of a window.
- *
- * @param obj The window object
- * @param demand_attention If true, the window is demand_attention
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_demand_attention_set(Evas_Object *obj, Eina_Bool demand_attention);
-
-/**
- * Get the demand_attention state of a window.
- *
- * @param obj The window object
- * @return If true, the window is demand_attention
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_demand_attention_get(const Evas_Object *obj);
-
-/**
- * Set the modal state of a window.
- *
- * @param obj The window object
- * @param modal If true, the window is modal
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_modal_set(Evas_Object *obj, Eina_Bool modal);
-
-/**
- * Get the modal state of a window.
- *
- * @param obj The window object
- * @return If true, the window is modal
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_modal_get(const Evas_Object *obj);
-
-/**
- * Set the aspect ratio of a window.
- *
- * @param obj The window object
- * @param aspect If 0, the window has no aspect limits, otherwise it is
- * width divided by height
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_aspect_set(Evas_Object *obj, double aspect);
-
-/**
- * Get the aspect ratio of a window.
- *
- * @param obj The window object
- * @return The aspect ratio set (0 by default)
- *
- * @ingroup Win
- */
-EAPI double                elm_win_aspect_get(const Evas_Object *obj);
-
-/**
- * Set the base window size used with stepping calculation
- *
- * Base size + stepping is what is calculated for window sizing restrictions.
- *
- * @param obj The window object
- * @param w The base width
- * @param h The base height
- *
- * @ingroup Win
- * @see elm_win_size_step_set
- * @see elm_win_size_base_get
- * @since 1.7
- */
-EAPI void                  elm_win_size_base_set(Evas_Object *obj, int w, int h);
-
-/**
- * Get the base size of a window.
- *
- * @param obj The window object
- * @param w Pointer in which to store returned base width
- * @param h Pointer in which to store returned base height
- *
- * @ingroup Win
- * @see elm_win_size_base_set
- * @see elm_win_size_step_set
- * @since 1.7
- */
-EAPI void                  elm_win_size_base_get(const Evas_Object *obj, int *w, int *h);
-
-/**
- * Set the window stepping used with sizing calculation
- *
- * Base size + stepping is what is calculated for window sizing restrictions.
- *
- * @param obj The window object
- * @param w The stepping width (0 disables)
- * @param h The stepping height (0 disables)
- *
- * @ingroup Win
- * @see elm_win_size_step_get
- * @see elm_win_size_base_set
- * @since 1.7
- */
-EAPI void                  elm_win_size_step_set(Evas_Object *obj, int w, int h);
-
-/**
- * Get the stepping of a window.
- *
- * @param obj The window object
- * @param w Pointer in which to store returned stepping width
- * @param h Pointer in which to store returned stepping height
- *
- * @ingroup Win
- * @see elm_win_size_base_set
- * @see elm_win_size_step_set
- * @since 1.7
- */
-EAPI void                  elm_win_size_step_get(const Evas_Object *obj, int *w, int *h);
-
-/**
- * Set the layer of the window.
- *
- * What this means exactly will depend on the underlying engine used.
- *
- * In the case of X11 backed engines, the value in @p layer has the
- * following meanings:
- * @li < 3: The window will be placed below all others.
- * @li > 5: The window will be placed above all others.
- * @li other: The window will be placed in the default layer.
- *
- * @param obj The window object
- * @param layer The layer of the window
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_layer_set(Evas_Object *obj, int layer);
-
-/**
- * Get the layer of the window.
- *
- * @param obj The window object
- * @return The layer of the window
- *
- * @see elm_win_layer_set()
- *
- * @ingroup Win
- */
-EAPI int                   elm_win_layer_get(const Evas_Object *obj);
+EAPI Eina_Bool             elm_win_floating_mode_get(const Evas_Object *obj);
 
 /**
  * This pushes (increments) the norender counter on the window
@@ -795,72 +139,17 @@ EAPI int                   elm_win_norender_get(Evas_Object *obj);
  */
 EAPI void                  elm_win_render(Evas_Object *obj);
 
+/* Wayland specific call - returns NULL on non-Wayland engines */
 /**
- * Set the rotation of the window.
- *
- * Most engines only work with multiples of 90.
- *
- * This function is used to set the orientation of the window @p obj to
- * match that of the screen. The window itself will be resized to adjust
- * to the new geometry of its contents. If you want to keep the window size,
- * see elm_win_rotation_with_resize_set().
- *
- * @param obj The window object
- * @param rotation The rotation of the window, in degrees (0-360),
- * counter-clockwise.
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_rotation_set(Evas_Object *obj, int rotation);
-
-/**
- * Rotates the window and resizes it.
- *
- * Like elm_win_rotation_set(), but it also resizes the window's contents so
- * that they fit inside the current window geometry.
- *
- * @param obj The window object
- * @param rotation The rotation of the window in degrees (0-360),
- * counter-clockwise.
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_rotation_with_resize_set(Evas_Object *obj, int rotation);
-
-/**
- * Get the rotation of the window.
- *
- * @param obj The window object
- * @return The rotation of the window in degrees (0-360)
- *
- * @see elm_win_rotation_set()
- * @see elm_win_rotation_with_resize_set()
- *
- * @ingroup Win
- */
-EAPI int                   elm_win_rotation_get(const Evas_Object *obj);
-
-/**
- * Query whether window manager supports window rotation or not.
- *
- * The window manager rotation allows the WM to controls the rotation of application windows.
- * It is designed to support synchronized rotation for the multiple application windows at same time.
+ * Get the Ecore_Wl_Window of an Evas_Object
  *
- * @return @c EINA_TRUE if the window manager rotation is supported, @c EINA_FALSE otherwise.
+ * @param obj the object
  *
- * @see elm_win_wm_rotation_supported_get()
- * @see elm_win_wm_rotation_preferred_rotation_set()
- * @see elm_win_wm_rotation_preferred_rotation_get()
- * @see elm_win_wm_rotation_available_rotations_set()
- * @see elm_win_wm_rotation_available_rotations_get()
- * @see elm_win_wm_rotation_manual_rotation_done_set()
- * @see elm_win_wm_rotation_manual_rotation_done_get()
- * @see elm_win_wm_rotation_manual_rotation_done()
+ * @return The Ecore_Wl_Window of @p obj
  *
  * @ingroup Win
- * @since 1.9
  */
-EAPI Eina_Bool             elm_win_wm_rotation_supported_get(const Evas_Object *obj);
+EAPI Ecore_Wl_Window *elm_win_wl_window_get(const Evas_Object *obj);
 
 /**
  * Set the preferred rotation value.
@@ -879,578 +168,6 @@ EAPI Eina_Bool             elm_win_wm_rotation_supported_get(const Evas_Object *
 EAPI void                  elm_win_wm_rotation_preferred_rotation_set(const Evas_Object *obj, int rotation);
 
 /**
- * Get the preferred rotation value.
- *
- * This function is used to get the preferred rotoation value.
- *
- * @param obj The window object
- * @return The preferred rotation of the window in degrees (0-360),
- * counter-clockwise.
- *
- * @see elm_win_wm_rotation_preferred_rotation_set()
- *
- * ingroup Win
- * @since 1.9
- */
-EAPI int                   elm_win_wm_rotation_preferred_rotation_get(const Evas_Object *obj);
-
-/**
- * Set the array of available window rotations.
- *
- * This function is used to set the available rotations to give the hints to WM.
- * WM will refer this hints and set the orientation window properly.
- *
- * @param obj The window object
- * @param *rotations The array of rotation value.
- * @param count The number of array of rotations
- *
- * @see elm_win_wm_rotation_available_rotations_get()
- *
- * ingroup Win
- * @since 1.9
- */
-EAPI void                  elm_win_wm_rotation_available_rotations_set(Evas_Object *obj, const int   *rotations, unsigned int count);
-
-/**
- * Get the array of available window rotations.
- *
- * This function is used to get the available rotations.
- *
- * @param obj The window object
- * @param rotations To store the available rotations.
- * @param count To store the number of rotations.
- *
- * @see elm_win_wm_rotation_available_rotations_set()
- *
- * ingroup Win
- * @since 1.9
- */
-EAPI Eina_Bool             elm_win_wm_rotation_available_rotations_get(const Evas_Object *obj, int **rotations, unsigned int *count);
-
-/**
- * Set the manual rotation done mode.
- *
- * This function is used to set or reset the manual rotation done mode.
- * the message of rotation done is sent to WM after rendering its canvas in Ecore_Evas.
- * but if set the manual rotation done mode,
- * it's disabled and user should call the "elm_win_wm_rotation_manual_done" explicitly to sends the message.
- *
- * @param obj The window object
- * @param set EINA_TRUE means to set manual rotation done mode EINA_FALSE otherwise.
- *
- * @see elm_win_wm_rotation_manual_rotation_done_get()
- * @see elm_win_wm_rotation_manual_rotation_done()
- *
- * ingroup Win
- * @since 1.9
- */
-EAPI void                  elm_win_wm_rotation_manual_rotation_done_set(Evas_Object *obj, Eina_Bool set);
-
-/**
- * Get the state of manual rotation done mode.
- *
- * This function is used to get the state of manual rotation done mode.
- *
- * @param obj The window object
- * @return @c EINA_TRUE manual rotationn done mode, @c EINA_FALSE otherwise.
- *
- * @see elm_win_wm_rotation_manual_rotation_done_set()
- * @see elm_win_wm_rotation_manual_rotation_done()
- *
- * ingroup Win
- * @since 1.9
- */
-EAPI Eina_Bool             elm_win_wm_rotation_manual_rotation_done_get(const Evas_Object *obj);
-
-/**
- * To notify the rotation done to WM manually.
- *
- * This function is used to notify the rotation done to WM manually.
- *
- * @param obj The window object
- *
- * @see elm_win_wm_rotation_manual_rotation_done_set()
- * @see elm_win_wm_rotation_manual_rotation_done_get()
- *
- * ingroup Win
- * @since 1.9
- */
-EAPI void                  elm_win_wm_rotation_manual_rotation_done(Evas_Object *obj);
-
-/**
- * Set the sticky state of the window.
- *
- * Hints the Window Manager that the window in @p obj should be left fixed
- * at its position even when the virtual desktop it's on moves or changes.
- *
- * @param obj The window object
- * @param sticky If true, the window's sticky state is enabled
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky);
-
-/**
- * Get the sticky state of the window.
- *
- * @param obj The window object
- * @return If true, the window's sticky state is enabled
- *
- * @see elm_win_sticky_set()
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_sticky_get(const Evas_Object *obj);
-
-/**
- * Set if this window is an illume conformant window
- *
- * @param obj The window object
- * @param conformant The conformant flag (1 = conformant, 0 = non-conformant)
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_conformant_set(Evas_Object *obj, Eina_Bool conformant);
-
-/**
- * Get if this window is an illume conformant window
- *
- * @param obj The window object
- * @return A boolean if this window is illume conformant or not
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_conformant_get(const Evas_Object *obj);
-
-/**
- * Set a window to be an illume quickpanel window
- *
- * By default window objects are not quickpanel windows.
- *
- * @param obj The window object
- * @param quickpanel The quickpanel flag (1 = quickpanel, 0 = normal window)
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_quickpanel_set(Evas_Object *obj, Eina_Bool quickpanel);
-
-/**
- * Get if this window is a quickpanel or not
- *
- * @param obj The window object
- * @return A boolean if this window is a quickpanel or not
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_quickpanel_get(const Evas_Object *obj);
-
-/**
- * Set the major priority of a quickpanel window
- *
- * @param obj The window object
- * @param priority The major priority for this quickpanel
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_quickpanel_priority_major_set(Evas_Object *obj, int priority);
-
-/**
- * Get the major priority of a quickpanel window
- *
- * @param obj The window object
- * @return The major priority of this quickpanel
- *
- * @ingroup Win
- */
-EAPI int                   elm_win_quickpanel_priority_major_get(const Evas_Object *obj);
-
-/**
- * Set the minor priority of a quickpanel window
- *
- * @param obj The window object
- * @param priority The minor priority for this quickpanel
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_quickpanel_priority_minor_set(Evas_Object *obj, int priority);
-
-/**
- * Get the minor priority of a quickpanel window
- *
- * @param obj The window object
- * @return The minor priority of this quickpanel
- *
- * @ingroup Win
- */
-EAPI int                   elm_win_quickpanel_priority_minor_get(const Evas_Object *obj);
-
-/**
- * Set which zone this quickpanel should appear in
- *
- * @param obj The window object
- * @param zone The requested zone for this quickpanel
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_quickpanel_zone_set(Evas_Object *obj, int zone);
-
-/**
- * Get which zone this quickpanel should appear in
- *
- * @param obj The window object
- * @return The requested zone for this quickpanel
- *
- * @ingroup Win
- */
-EAPI int                   elm_win_quickpanel_zone_get(const Evas_Object *obj);
-
-/**
- * Set the window to be skipped by keyboard focus
- *
- * This sets the window to be skipped by normal keyboard input. This means
- * a window manager will be asked to not focus this window as well as omit
- * it from things like the taskbar, pager, "alt-tab" list etc. etc.
- *
- * Call this and enable it on a window BEFORE you show it for the first time,
- * otherwise it may have no effect.
- *
- * Use this for windows that have only output information or might only be
- * interacted with by the mouse or fingers, and never for typing input.
- * Be careful that this may have side-effects like making the window
- * non-accessible in some cases unless the window is specially handled. Use
- * this with care.
- *
- * @param obj The window object
- * @param skip The skip flag state (EINA_TRUE if it is to be skipped)
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip);
-
-/**
- * Send a command to the windowing environment
- *
- * This is intended to work in touchscreen or small screen device
- * environments where there is a more simplistic window management policy in
- * place. This uses the window object indicated to select which part of the
- * environment to control (the part that this window lives in), and provides
- * a command and an optional parameter structure (use NULL for this if not
- * needed).
- *
- * @param obj The window object that lives in the environment to control
- * @param command The command to send
- * @param params Optional parameters for the command
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_illume_command_send(Evas_Object *obj, Elm_Illume_Command command, void *params);
-
-/**
- * Get the inlined image object handle
- *
- * When you create a window with elm_win_add() of type ELM_WIN_INLINED_IMAGE,
- * then the window is in fact an evas image object inlined in the parent
- * canvas. You can get this object (be careful to not manipulate it as it
- * is under control of elementary), and use it to do things like get pixel
- * data, save the image to a file, etc.
- *
- * @param obj The window object to get the inlined image from
- * @return The inlined image object, or NULL if none exists
- *
- * @ingroup Win
- */
-EAPI Evas_Object          *elm_win_inlined_image_object_get(const Evas_Object *obj);
-
-/**
- * Determine whether a window has focus
- * @param obj The window to query
- * @return EINA_TRUE if the window exists and has focus, else EINA_FALSE
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_focus_get(const Evas_Object *obj);
-
-/**
- * Constrain the maximum width and height of a window to the width and height of its screen
- *
- * When @p constrain is true, @p obj will never resize larger than the screen.
- * @param obj The window object
- * @param constrain EINA_TRUE to restrict the window's maximum size, EINA_FALSE to disable restriction
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_screen_constrain_set(Evas_Object *obj, Eina_Bool constrain);
-
-/**
- * Retrieve the constraints on the maximum width and height of a window relative to the width and height of its screen
- *
- * When this function returns true, @p obj will never resize larger than the screen.
- * @param obj The window object
- * @return EINA_TRUE to restrict the window's maximum size, EINA_FALSE to disable restriction
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_screen_constrain_get(const Evas_Object *obj);
-
-/**
- * Get screen geometry details for the screen that a window is on
- * @param obj The window to query
- * @param x where to return the horizontal offset value. May be NULL.
- * @param y where to return the vertical offset value. May be NULL.
- * @param w where to return the width value. May be NULL.
- * @param h where to return the height value. May be NULL.
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_screen_size_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
-
-/**
- * Get screen dpi for the screen that a window is on
- * @param obj The window to query
- * @param xdpi Pointer to value to store return horizontal dpi. May be NULL.
- * @param ydpi Pointer to value to store return vertical dpi. May be NULL.
- *
- * @ingroup Win
- * @since 1.7
- */
-EAPI void                  elm_win_screen_dpi_get(const Evas_Object *obj, int *xdpi, int *ydpi);
-
-/**
- * Set the enabled status for the focus highlight in a window
- *
- * This function will enable or disable the focus highlight only for the
- * given window, regardless of the global setting for it
- *
- * @param obj The window where to enable the highlight
- * @param enabled The enabled value for the highlight
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_focus_highlight_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-
-/**
- * Get the enabled value of the focus highlight for this window
- *
- * @param obj The window in which to check if the focus highlight is enabled
- *
- * @return EINA_TRUE if enabled, EINA_FALSE otherwise
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_focus_highlight_enabled_get(const Evas_Object *obj);
-
-/**
- * Set the style for the focus highlight on this window
- *
- * Sets the style to use for theming the highlight of focused objects on
- * the given window. If @p style is NULL, the default will be used.
- *
- * @param obj The window where to set the style
- * @param style The style to set
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_focus_highlight_style_set(Evas_Object *obj, const char *style);
-
-/**
- * Get the style set for the focus highlight object
- *
- * Get the style set for this windows highlight object, or NULL if none
- * is set.
- *
- * @param obj The window to retrieve the highlights style from
- *
- * @return The style set or NULL if none was. Default is used in that case.
- *
- * @ingroup Win
- */
-EAPI const char           *elm_win_focus_highlight_style_get(const Evas_Object *obj);
-
-/**
- * Set the animate status for the focus highlight for this window.
- *
- * This function will enable or disable the animation of focus highlight only
- * for the given window, regardless of the global setting for it
- *
- * @param obj The window where to enable the highlight animation
- * @param enabled The enabled value for the highlight animation
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_focus_highlight_animate_set(Evas_Object *obj, Eina_Bool enabled);
-
-/**
- * Get the animate value of the focus highlight for this window
- *
- * @param obj The window in which to check if the focus highlight animation is
- * enabled
- *
- * @return EINA_TRUE if animation is enabled, EINA_FALSE otherwise
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_focus_highlight_animate_get(const Evas_Object *obj);
-
-
-/**
- * Sets the keyboard mode of the window.
- *
- * @param obj The window object
- * @param mode The mode to set, one of #Elm_Win_Keyboard_Mode
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode);
-
-/**
- * Get the keyboard mode of the window.
- *
- * @param obj The window object
- * @return The mode, one of #Elm_Win_Keyboard_Mode
- *
- * @ingroup Win
- */
-EAPI Elm_Win_Keyboard_Mode elm_win_keyboard_mode_get(const Evas_Object *obj);
-
-/**
- * Sets whether the window is a keyboard.
- *
- * @param obj The window object
- * @param is_keyboard If true, the window is a virtual keyboard
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard);
-
-/**
- * Get whether the window is a keyboard.
- *
- * @param obj The window object
- * @return If the window is a virtual keyboard
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_keyboard_win_get(const Evas_Object *obj);
-
-/**
- * Sets the indicator mode of the window.
- *
- * @param obj The window object
- * @param mode The mode to set, one of #Elm_Win_Indicator_Mode
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_indicator_mode_set(Evas_Object *obj, Elm_Win_Indicator_Mode mode);
-
-/**
- * Get the indicator mode of the window.
- *
- * @param obj The window object
- * @return The mode, one of #Elm_Win_Indicator_Mode
- *
- * @ingroup Win
- */
-EAPI Elm_Win_Indicator_Mode elm_win_indicator_mode_get(const Evas_Object *obj);
-
-/**
- * Sets the indicator opacity mode of the window.
- *
- * @param obj The window object
- * @param mode The mode to set, one of #Elm_Win_Indicator_Opacity_Mode
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_indicator_opacity_set(Evas_Object *obj, Elm_Win_Indicator_Opacity_Mode mode);
-
-/**
- * Get the indicator opacity mode of the window.
- *
- * @param obj The window object
- * @return The mode, one of #Elm_Win_Indicator_Opacity_Mode
- *
- * @ingroup Win
- */
-EAPI Elm_Win_Indicator_Opacity_Mode elm_win_indicator_opacity_get(const Evas_Object *obj);
-
-/**
- * Get the screen position of a window.
- *
- * @param obj The window object
- * @param x The int to store the x coordinate to
- * @param y The int to store the y coordinate to
- *
- * @ingroup Win
- */
-EAPI void                  elm_win_screen_position_get(const Evas_Object *obj, int *x, int *y);
-
-/**
- * Create a socket to provide the service for Plug widget
- *
- * @param obj The window object
- * @param svcname The name of the service to be advertised. ensure that it is unique (when combined with @p svcnum) otherwise creation may fail.
- * @param svcnum A number (any value, 0 being the common default) to differentiate multiple instances of services with the same name.
- * @param svcsys A boolean that if true, specifies to create a system-wide service all users can connect to, otherwise the service is private to the user id that created the service.
- * @return If socket creation is successful
- *
- * @ingroup Win
- */
-EAPI Eina_Bool             elm_win_socket_listen(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys);
-
-/* X specific calls - won't work on non-x engines (return 0) */
-/**
- * Get the Ecore_X_Window of an Evas_Object
- *
- * @param obj The object
- *
- * @return The Ecore_X_Window of @p obj
- *
- * @ingroup Win
- */
-EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj);
-
-/* Wayland specific call - returns NULL on non-Wayland engines */
-/**
- * Get the Ecore_Wl_Window of an Evas_Object
- *
- * @param obj the object
- *
- * @return The Ecore_Wl_Window of @p obj
- *
- * @ingroup Win
- */
-EAPI Ecore_Wl_Window *elm_win_wl_window_get(const Evas_Object *obj);
-
-/**
- * Set the floating mode of a window.
- *
- * @param obj The window object
- * @param floating If true, the window is floating mode
- *
- * The floating mode can be used on mobile environment. For example, if the
- * video-player window sets the floating mode, then e (enlightenment window
- * manager) changes its geometry and handles it like a popup. This is similar to
- * a multi window concept in a mobile phone. The way of handling floating mode
- * window is decided by enlightenment window manager.
- *
- * @ingroup Win
- * @see elm_win_floating_mode_get()
- * @since 1.8
- */
-EAPI void                  elm_win_floating_mode_set(Evas_Object *obj, Eina_Bool floating);
-
-/**
- * Get the floating mode of a window.
- *
- * @param obj The window object
- * @return If true, the window is floating mode
- *
- * @ingroup Win
- * @see elm_win_floating_mode_set()
- * @since 1.8
- */
-EAPI Eina_Bool             elm_win_floating_mode_get(const Evas_Object *obj);
-
-/**
  * Get the Ecore_Window of an Evas_Object
  *
  * When Elementary is using a Wayland engine, this function will return the surface id of the elm window's surface.
@@ -1462,3 +179,5 @@ EAPI Eina_Bool             elm_win_floating_mode_get(const Evas_Object *obj);
  * @since 1.8
  */
 EAPI Ecore_Window          elm_win_window_id_get(const Evas_Object *obj);
+
+#include "elm_win.eo.legacy.h"
\ No newline at end of file