From: raster Date: Fri, 30 Dec 2011 09:41:11 +0000 (+0000) Subject: move lots of deprecated stuff into deprecated files. need 2 right now. X-Git-Tag: REL_F_I9500_20120323_1~17^2~1005 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6cc900457cd375fdbe08c8b8c5a2231f15967371;p=framework%2Fuifw%2Felementary.git move lots of deprecated stuff into deprecated files. need 2 right now. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@66679 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index a9957e6..a4ae4cf 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -156,6 +156,9 @@ EAPI extern Elm_Version * elm_version; #include #include +/* include deprecated before headers - things may still rely on definitions */ +#include + /* other includes */ #include #include @@ -182,7 +185,6 @@ EAPI extern Elm_Version * elm_version; #include #include #include -#include #include #include #include @@ -236,6 +238,9 @@ EAPI extern Elm_Version * elm_version; #include #include +/* include deprecated calls last of all */ +#include + #ifdef __cplusplus } #endif diff --git a/src/lib/elc_anchorblock.h b/src/lib/elc_anchorblock.h index 713e6e4..eef1f86 100644 --- a/src/lib/elc_anchorblock.h +++ b/src/lib/elc_anchorblock.h @@ -82,39 +82,7 @@ struct _Elm_Entry_Anchorblock_Info * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_anchorblock_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the text to show in the anchorblock - * - * Sets the text of the anchorblock to @p text. This text can include markup - * format tags, including \ to begin a segment - * of text that will be specially styled and react to click events, ended - * with either of \ or \. When clicked, the anchor will emit an - * "anchor,clicked" signal that you can attach a callback to with - * evas_object_smart_callback_add(). The name of the anchor given in the - * event info struct will be the one set in the href attribute, in this - * case, anchorname. - * - * Other markup can be used to style the text in different ways, but it's - * up to the style defined in the theme which tags do what. - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_anchorblock_text_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); - -/** - * Get the markup text set for the anchorblock - * - * Retrieves the text set on the anchorblock, with markup tags included. - * - * @param obj The anchorblock object - * @return The markup text set or @c NULL if nothing was set or an error - * occurred - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_anchorblock_text_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_anchorblock_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the parent of the hover popup diff --git a/src/lib/elc_anchorview.h b/src/lib/elc_anchorview.h index 8abb7da..18cac8a 100644 --- a/src/lib/elc_anchorview.h +++ b/src/lib/elc_anchorview.h @@ -85,39 +85,7 @@ struct _Elm_Entry_Anchorview_Info * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_anchorview_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the text to show in the anchorview - * - * Sets the text of the anchorview to @p text. This text can include markup - * format tags, including \ to begin a segment of - * text that will be specially styled and react to click events, ended with - * either of \ or \. When clicked, the anchor will emit an - * "anchor,clicked" signal that you can attach a callback to with - * evas_object_smart_callback_add(). The name of the anchor given in the - * event info struct will be the one set in the href attribute, in this - * case, anchorname. - * - * Other markup can be used to style the text in different ways, but it's - * up to the style defined in the theme which tags do what. - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); - -/** - * Get the markup text set for the anchorview - * - * Retrieves the text set on the anchorview, with markup tags included. - * - * @param obj The anchorview object - * @return The markup text set or @c NULL if nothing was set or an error - * occurred - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_anchorview_text_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_anchorview_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the parent of the hover popup diff --git a/src/lib/elc_ctxpopup.h b/src/lib/elc_ctxpopup.h index 5a64f72..771c278 100644 --- a/src/lib/elc_ctxpopup.h +++ b/src/lib/elc_ctxpopup.h @@ -128,7 +128,7 @@ EAPI Eina_Bool elm_ctxpopup_horizontal_get(const Evas_Object * * @ingroup Ctxpopup */ -Elm_Object_Item *elm_ctxpopup_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data) EINA_ARG_NONNULL(1); +EAPI Elm_Object_Item *elm_ctxpopup_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data) EINA_ARG_NONNULL(1); /** * @brief Delete the given item in a ctxpopup object. @@ -142,131 +142,6 @@ Elm_Object_Item *elm_ctxpopup_item_append(Evas_Object *obj, con EAPI void elm_ctxpopup_item_del(Elm_Object_Item *it) EINA_ARG_NONNULL(1); /** - * @brief Set the ctxpopup item's state as disabled or enabled. - * - * @param it Ctxpopup item to be enabled/disabled - * @param disabled @c EINA_TRUE to disable it, @c EINA_FALSE to enable it - * - * When disabled the item is greyed out to indicate it's state. - * @deprecated use elm_object_item_disabled_set() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI void elm_ctxpopup_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) EINA_ARG_NONNULL(1); - -/** - * @brief Get the ctxpopup item's disabled/enabled state. - * - * @param it Ctxpopup item to be enabled/disabled - * @return disabled @c EINA_TRUE, if disabled, @c EINA_FALSE otherwise - * - * @see elm_ctxpopup_item_disabled_set() - * @deprecated use elm_object_item_disabled_get() instead - * - * @ingroup Ctxpopup - */ -EAPI Eina_Bool elm_ctxpopup_item_disabled_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** - * @brief Get the icon object for the given ctxpopup item. - * - * @param it Ctxpopup item - * @return icon object or @c NULL, if the item does not have icon or an error - * occurred - * - * @see elm_ctxpopup_item_append() - * @see elm_ctxpopup_item_icon_set() - * - * @deprecated use elm_object_item_part_content_get() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_item_icon_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** - * @brief Sets the side icon associated with the ctxpopup item - * - * @param it Ctxpopup item - * @param icon Icon object to be set - * - * Once the icon object is set, a previously set one will be deleted. - * @warning Setting the same icon for two items will cause the icon to - * dissapear from the first item. - * - * @see elm_ctxpopup_item_append() - * - * @deprecated use elm_object_item_part_content_set() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI void elm_ctxpopup_item_icon_set(Elm_Object_Item *it, Evas_Object *icon) EINA_ARG_NONNULL(1); - -/** - * @brief Get the label for the given ctxpopup item. - * - * @param it Ctxpopup item - * @return label string or @c NULL, if the item does not have label or an - * error occured - * - * @see elm_ctxpopup_item_append() - * @see elm_ctxpopup_item_label_set() - * - * @deprecated use elm_object_item_text_get() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI const char *elm_ctxpopup_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** - * @brief (Re)set the label on the given ctxpopup item. - * - * @param it Ctxpopup item - * @param label String to set as label - * - * @deprecated use elm_object_item_text_set() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI void elm_ctxpopup_item_label_set(Elm_Object_Item *it, const char *label) EINA_ARG_NONNULL(1); - -/** - * @brief Set an elm widget as the content of the ctxpopup. - * - * @param obj Ctxpopup object - * @param content Content to be swallowed - * - * If the content object is already set, a previous one will bedeleted. If - * you want to keep that old content object, use the - * elm_ctxpopup_content_unset() function. - * - * @warning Ctxpopup can't hold both a item list and a content at the same - * time. When a content is set, any previous items will be removed. - * - * @deprecated use elm_object_content_set() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI void elm_ctxpopup_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1, 2); - -/** - * @brief Unset the ctxpopup content - * - * @param obj Ctxpopup object - * @return The content that was being used - * - * Unparent and return the content object which was set for this widget. - * - * @deprecated use elm_object_content_unset() - * - * @see elm_ctxpopup_content_set() - * - * @deprecated use elm_object_content_unset() instead - * - * @ingroup Ctxpopup - */ -EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** * @brief Set the direction priority of a ctxpopup. * * @param obj Ctxpopup object diff --git a/src/lib/elc_fileselector.h b/src/lib/elc_fileselector.h index eafcbea..8a56274 100644 --- a/src/lib/elc_fileselector.h +++ b/src/lib/elc_fileselector.h @@ -54,7 +54,7 @@ * Defines how a file selector widget is to layout its contents * (file system entries). */ -typedef enum _Elm_Fileselector_Mode +typedef enum { ELM_FILESELECTOR_LIST = 0, /**< layout as a list */ ELM_FILESELECTOR_GRID, /**< layout as a grid */ @@ -72,9 +72,7 @@ typedef enum _Elm_Fileselector_Mode * * @ingroup Fileselector */ -EAPI Evas_Object * - elm_fileselector_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_fileselector_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Enable/disable the file name entry box where the user can type diff --git a/src/lib/elc_fileselector_button.h b/src/lib/elc_fileselector_button.h index d0e78b3..9486b85 100644 --- a/src/lib/elc_fileselector_button.h +++ b/src/lib/elc_fileselector_button.h @@ -44,29 +44,7 @@ * @return a new file selector button widget handle or @c NULL, on * errors */ -EAPI Evas_Object * - elm_fileselector_button_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the label for a given file selector button widget - * - * @param obj The file selector button widget - * @param label The text label to be displayed on @p obj - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_fileselector_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * Get the label set for a given file selector button widget - * - * @param obj The file selector button widget - * @return The button label - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_fileselector_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_fileselector_button_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the icon on a given file selector button widget diff --git a/src/lib/elc_fileselector_entry.h b/src/lib/elc_fileselector_entry.h index b60b190..e3c5d0a 100644 --- a/src/lib/elc_fileselector_entry.h +++ b/src/lib/elc_fileselector_entry.h @@ -56,30 +56,7 @@ * @return a new file selector entry widget handle or @c NULL, on * errors */ -EAPI Evas_Object * - elm_fileselector_entry_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the label for a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @param label The text label to be displayed on @p obj widget's - * button - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * Get the label set for a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @return The widget button's label - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_fileselector_entry_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_fileselector_entry_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the icon on a given file selector entry widget's button diff --git a/src/lib/elc_hoversel.h b/src/lib/elc_hoversel.h index eb99109..7175e4f 100644 --- a/src/lib/elc_hoversel.h +++ b/src/lib/elc_hoversel.h @@ -47,9 +47,7 @@ * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_hoversel_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief This sets the hoversel to expand horizontally. @@ -97,74 +95,6 @@ EAPI void elm_hoversel_hover_parent_set(Evas_Object *obj EAPI Evas_Object *elm_hoversel_hover_parent_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** - * @brief Set the hoversel button label - * - * @param obj The hoversel object - * @param label The label text. - * - * This sets the label of the button that is always visible (before it is - * clicked and expanded). - * - * @deprecated elm_object_text_set() - */ -EINA_DEPRECATED EAPI void elm_hoversel_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * @brief Get the hoversel button label - * - * @param obj The hoversel object - * @return The label text. - * - * @deprecated elm_object_text_get() - */ -EINA_DEPRECATED EAPI const char *elm_hoversel_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Set the icon of the hoversel button - * - * @param obj The hoversel object - * @param icon The icon object - * - * Sets the icon of the button that is always visible (before it is clicked - * and expanded). Once the icon object is set, a previously set one will be - * deleted, if you want to keep that old content object, use the - * elm_hoversel_icon_unset() function. - * - * @see elm_object_content_set() for the button widget - * @deprecated Use elm_object_item_part_content_set() instead - */ -EINA_DEPRECATED EAPI void elm_hoversel_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); - -/** - * @brief Get the icon of the hoversel button - * - * @param obj The hoversel object - * @return The icon object - * - * Get the icon of the button that is always visible (before it is clicked - * and expanded). Also see elm_object_content_get() for the button widget. - * - * @see elm_hoversel_icon_set() - * @deprecated Use elm_object_item_part_content_get() instead - */ -EINA_DEPRECATED EAPI Evas_Object *elm_hoversel_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Get and unparent the icon of the hoversel button - * - * @param obj The hoversel object - * @return The icon object that was being used - * - * Unparent and return the icon of the button that is always visible - * (before it is clicked and expanded). - * - * @see elm_hoversel_icon_set() - * @see elm_object_content_unset() for the button widget - * @deprecated Use elm_object_item_part_content_unset() instead - */ -EINA_DEPRECATED EAPI Evas_Object *elm_hoversel_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** * @brief This triggers the hoversel popup from code, the same as if the user * had clicked the button. * @@ -264,29 +194,6 @@ EAPI void elm_hoversel_item_del(Elm_Object_Item *it) EIN EAPI void elm_hoversel_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func) EINA_ARG_NONNULL(1); /** - * @brief This returns the data pointer supplied with elm_hoversel_item_add() - * that will be passed to associated function callbacks. - * - * @param it The item to get the data from - * @return The data pointer set with elm_hoversel_item_add() - * - * @see elm_hoversel_item_add() - * @deprecated Use elm_object_item_data_get() instead - */ -EINA_DEPRECATED EAPI void *elm_hoversel_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** - * @brief This returns the label text of the given hoversel item. - * - * @param it The item to get the label - * @return The label text of the hoversel item - * - * @see elm_hoversel_item_add() - * @deprecated Use elm_object_item_text_get() instead - */ -EINA_DEPRECATED EAPI const char *elm_hoversel_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** * @brief This sets the icon for the given hoversel item. * * @param it The item to set the icon diff --git a/src/lib/elc_multibuttonentry.h b/src/lib/elc_multibuttonentry.h index 3c4ae09..14496aa 100644 --- a/src/lib/elc_multibuttonentry.h +++ b/src/lib/elc_multibuttonentry.h @@ -35,9 +35,7 @@ typedef Eina_Bool (*Elm_Multibuttonentry_Item_Filter_callback) * @return The new object or NULL if it cannot be created * */ -EAPI Evas_Object * - elm_multibuttonentry_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_multibuttonentry_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Get the label diff --git a/src/lib/elc_naviframe.h b/src/lib/elc_naviframe.h index 1b9133c..9ea8a5e 100644 --- a/src/lib/elc_naviframe.h +++ b/src/lib/elc_naviframe.h @@ -60,9 +60,7 @@ * * @ingroup Naviframe */ -EAPI Evas_Object * - elm_naviframe_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_naviframe_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Push a new item to the top of the naviframe stack (and show it). diff --git a/src/lib/elm_actionslider.h b/src/lib/elm_actionslider.h index e1db17f..d218a65 100644 --- a/src/lib/elm_actionslider.h +++ b/src/lib/elm_actionslider.h @@ -31,7 +31,7 @@ * See an example of actionslider usage @ref actionslider_example_page "here" * @{ */ -typedef enum _Elm_Actionslider_Pos +typedef enum { ELM_ACTIONSLIDER_NONE = 0, ELM_ACTIONSLIDER_LEFT = 1 << 0, @@ -46,31 +46,7 @@ typedef enum _Elm_Actionslider_Pos * @param parent The parent object * @return The new actionslider object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_actionslider_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set actionslider labels. - * - * @param obj The actionslider object - * @param left_label The label to be set on the left. - * @param center_label The label to be set on the center. - * @param right_label The label to be set on the right. - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_actionslider_labels_set(Evas_Object *obj, const char *left_label, const char *center_label, const char *right_label) EINA_ARG_NONNULL(1); - -/** - * Get actionslider labels. - * - * @param obj The actionslider object - * @param left_label A char** to place the left_label of @p obj into. - * @param center_label A char** to place the center_label of @p obj into. - * @param right_label A char** to place the right_label of @p obj into. - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_actionslider_labels_get(const Evas_Object *obj, const char **left_label, const char **center_label, const char **right_label) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_actionslider_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Get actionslider selected label. @@ -133,23 +109,5 @@ EAPI void elm_actionslider_enabled_pos_set(Evas_Object *o EAPI Elm_Actionslider_Pos elm_actionslider_enabled_pos_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** - * Set the label used on the indicator. - * - * @param obj The actionslider object - * @param label The label to be set on the indicator. - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_actionslider_indicator_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * Get the label used on the indicator object. - * - * @param obj The actionslider object - * @return The indicator label - * @deprecated use elm_object_text_get() instead. - */ -EINA_DEPRECATED EAPI const char *elm_actionslider_indicator_label_get(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** * @} */ diff --git a/src/lib/elm_bg.h b/src/lib/elm_bg.h index cfdebaa..0602a2e 100644 --- a/src/lib/elm_bg.h +++ b/src/lib/elm_bg.h @@ -22,7 +22,7 @@ */ /* bg */ -typedef enum _Elm_Bg_Option +typedef enum { ELM_BG_OPTION_CENTER, /**< center the background */ ELM_BG_OPTION_SCALE, /**< scale the background retaining aspect ratio */ @@ -38,9 +38,7 @@ typedef enum _Elm_Bg_Option * * @ingroup Bg */ -EAPI Evas_Object * - elm_bg_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_bg_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the file (image or edje) used for the background @@ -120,52 +118,6 @@ EAPI void elm_bg_color_set(Evas_Object *obj, int r, int EAPI void elm_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b) EINA_ARG_NONNULL(1); /** - * Set the overlay object used for the background object. - * - * @param obj The bg object - * @param overlay The overlay object - * - * This provides a way for elm_bg to have an 'overlay' that will be on top - * of the bg. Once the over object is set, a previously set one will be - * deleted, even if you set the new one to NULL. If you want to keep that - * old content object, use the elm_bg_overlay_unset() function. - * - * @deprecated use elm_object_part_content_set() instead - * - * @ingroup Bg - */ - -EINA_DEPRECATED EAPI void elm_bg_overlay_set(Evas_Object *obj, Evas_Object *overlay) EINA_ARG_NONNULL(1); - -/** - * Get the overlay object used for the background object. - * - * @param obj The bg object - * @return The content that is being used - * - * Return the content object which is set for this widget - * - * @deprecated use elm_object_part_content_get() instead - * - * @ingroup Bg - */ -EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Get the overlay object used for the background object. - * - * @param obj The bg object - * @return The content that was being used - * - * Unparent and return the overlay object which was set for this widget - * - * @deprecated use elm_object_part_content_unset() instead - * - * @ingroup Bg - */ -EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** * Set the size of the pixmap representation of the image. * * This option just makes sense if an image is going to be set in the bg. diff --git a/src/lib/elm_box.h b/src/lib/elm_box.h index bc45693..a544a69 100644 --- a/src/lib/elm_box.h +++ b/src/lib/elm_box.h @@ -87,9 +87,7 @@ typedef struct _Elm_Box_Transition Elm_Box_Transition; * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_box_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_box_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the horizontal orientation diff --git a/src/lib/elm_bubble.h b/src/lib/elm_bubble.h index 25385f2..fc6c8ac 100644 --- a/src/lib/elm_bubble.h +++ b/src/lib/elm_bubble.h @@ -51,140 +51,7 @@ * * This function adds a text bubble to the given parent evas object. */ -EAPI Evas_Object * - elm_bubble_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the label of the bubble - * - * @param obj The bubble object - * @param label The string to set in the label - * - * This function sets the title of the bubble. Where this appears depends on - * the selected corner. - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_bubble_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * Get the label of the bubble - * - * @param obj The bubble object - * @return The string of set in the label - * - * This function gets the title of the bubble. - * @deprecated use elm_object_text_get() instead. - */ -EINA_DEPRECATED EAPI const char *elm_bubble_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Set the info of the bubble - * - * @param obj The bubble object - * @param info The given info about the bubble - * - * This function sets the info of the bubble. Where this appears depends on - * the selected corner. - * @deprecated use elm_object_part_text_set() instead. (with "info" as the parameter). - */ -EINA_DEPRECATED EAPI void elm_bubble_info_set(Evas_Object *obj, const char *info) EINA_ARG_NONNULL(1); - -/** - * Get the info of the bubble - * - * @param obj The bubble object - * - * @return The "info" string of the bubble - * - * This function gets the info text. - * @deprecated use elm_object_part_text_get() instead. (with "info" as the parameter). - */ -EINA_DEPRECATED EAPI const char *elm_bubble_info_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Set the content to be shown in the bubble - * - * Once the content object is set, a previously set one will be deleted. - * If you want to keep the old content object, use the - * elm_bubble_content_unset() function. - * - * @param obj The bubble object - * @param content The given content of the bubble - * - * This function sets the content shown on the middle of the bubble. - * - * @deprecated use elm_object_content_set() instead - * - */ -EINA_DEPRECATED EAPI void elm_bubble_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); - -/** - * Get the content shown in the bubble - * - * Return the content object which is set for this widget. - * - * @param obj The bubble object - * @return The content that is being used - * - * @deprecated use elm_object_content_get() instead - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_bubble_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Unset the content shown in the bubble - * - * Unparent and return the content object which was set for this widget. - * - * @param obj The bubble object - * @return The content that was being used - * - * @deprecated use elm_object_content_unset() instead - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_bubble_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Set the icon of the bubble - * - * Once the icon object is set, a previously set one will be deleted. - * If you want to keep the old content object, use the - * elm_icon_content_unset() function. - * - * @param obj The bubble object - * @param icon The given icon for the bubble - * - * @deprecated use elm_object_part_content_set() instead - * - */ -EINA_DEPRECATED EAPI void elm_bubble_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); - -/** - * Get the icon of the bubble - * - * @param obj The bubble object - * @return The icon for the bubble - * - * This function gets the icon shown on the top left of bubble. - * - * @deprecated use elm_object_part_content_get() instead - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_bubble_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Unset the icon of the bubble - * - * Unparent and return the icon object which was set for this widget. - * - * @param obj The bubble object - * @return The icon that was being used - * - * @deprecated use elm_object_part_content_unset() instead - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_bubble_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_bubble_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the corner of the bubble diff --git a/src/lib/elm_button.h b/src/lib/elm_button.h index d0c4f5e..f5ea8f8 100644 --- a/src/lib/elm_button.h +++ b/src/lib/elm_button.h @@ -44,77 +44,7 @@ * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_button_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the label used in the button - * - * The passed @p label can be NULL to clean any existing text in it and - * leave the button as an icon only object. - * - * @param obj The button object - * @param label The text will be written on the button - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * Get the label set for the button - * - * The string returned is an internal pointer and should not be freed or - * altered. It will also become invalid when the button is destroyed. - * The string returned, if not NULL, is a stringshare, so if you need to - * keep it around even after the button is destroyed, you can use - * eina_stringshare_ref(). - * - * @param obj The button object - * @return The text set to the label, or NULL if nothing is set - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Set the icon used for the button - * - * Setting a new icon will delete any other that was previously set, making - * any reference to them invalid. If you need to maintain the previous - * object alive, unset it first with elm_button_icon_unset(). - * - * @param obj The button object - * @param icon The icon object for the button - * @deprecated use elm_object_part_content_set() instead. - */ -EINA_DEPRECATED EAPI void elm_button_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); - -/** - * Get the icon used for the button - * - * Return the icon object which is set for this widget. If the button is - * destroyed or another icon is set, the returned object will be deleted - * and any reference to it will be invalid. - * - * @param obj The button object - * @return The icon object that is being used - * - * @deprecated use elm_object_part_content_get() instead - */ -EINA_DEPRECATED EAPI Evas_Object *elm_button_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Remove the icon set without deleting it and return the object - * - * This function drops the reference the button holds of the icon object - * and returns this last object. It is used in case you want to remove any - * icon, or set another one, without deleting the actual object. The button - * will be left without an icon set. - * - * @param obj The button object - * @return The icon object that was being used - * @deprecated use elm_object_part_content_unset() instead. - */ -EINA_DEPRECATED EAPI Evas_Object *elm_button_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_button_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Turn on/off the autorepeat event generated when the button is kept pressed diff --git a/src/lib/elm_calendar.h b/src/lib/elm_calendar.h index 52c259e..9985bee 100644 --- a/src/lib/elm_calendar.h +++ b/src/lib/elm_calendar.h @@ -20,7 +20,7 @@ * * @ingroup Calendar */ -typedef enum _Elm_Calendar_Mark_Repeat +typedef enum { ELM_CALENDAR_UNIQUE, /**< Default value. Marks will be displayed only on event day. */ ELM_CALENDAR_DAILY, /**< Marks will be displayed everyday after event day (inclusive). */ @@ -44,9 +44,7 @@ typedef struct _Elm_Calendar_Mark Elm_Calendar_Mark; /**< Item handle for a c * * @ingroup Calendar */ -EAPI Evas_Object * - elm_calendar_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_calendar_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Get weekdays names displayed by the calendar. @@ -361,75 +359,6 @@ EAPI const Eina_List *elm_calendar_marks_get(const Evas_Object *obj) EINA_AR EAPI void elm_calendar_marks_draw(Evas_Object *obj) EINA_ARG_NONNULL(1); /** - * Set a day text color to the same that represents Saturdays. - * - * @param obj The calendar object. - * @param pos The text position. Position is the cell counter, from left - * to right, up to down. It starts on 0 and ends on 41. - * - * @deprecated use elm_calendar_mark_add() instead like: - * - * @code - * struct tm t = { 0, 0, 12, 6, 0, 0, 6, 6, -1 }; - * elm_calendar_mark_add(obj, "sat", &t, ELM_CALENDAR_WEEKLY); - * @endcode - * - * @see elm_calendar_mark_add() - * - * @ingroup Calendar - */ -EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); - -/** - * Set a day text color to the same that represents Sundays. - * - * @param obj The calendar object. - * @param pos The text position. Position is the cell counter, from left - * to right, up to down. It starts on 0 and ends on 41. - - * @deprecated use elm_calendar_mark_add() instead like: - * - * @code - * struct tm t = { 0, 0, 12, 7, 0, 0, 0, 0, -1 }; - * elm_calendar_mark_add(obj, "sat", &t, ELM_CALENDAR_WEEKLY); - * @endcode - * - * @see elm_calendar_mark_add() - * - * @ingroup Calendar - */ -EINA_DEPRECATED EAPI void elm_calendar_text_sunday_color_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); - -/** - * Set a day text color to the same that represents Weekdays. - * - * @param obj The calendar object - * @param pos The text position. Position is the cell counter, from left - * to right, up to down. It starts on 0 and ends on 41. - * - * @deprecated use elm_calendar_mark_add() instead like: - * - * @code - * struct tm t = { 0, 0, 12, 1, 0, 0, 0, 0, -1 }; - * - * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // monday - * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; - * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // tuesday - * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; - * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // wednesday - * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; - * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // thursday - * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; - * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // friday - * @endcode - * - * @see elm_calendar_mark_add() - * - * @ingroup Calendar - */ -EINA_DEPRECATED EAPI void elm_calendar_text_weekday_color_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); - -/** * Set the interval on time updates for an user mouse button hold * on calendar widgets' month selection. * diff --git a/src/lib/elm_check.h b/src/lib/elm_check.h index 622a292..06de708 100644 --- a/src/lib/elm_check.h +++ b/src/lib/elm_check.h @@ -43,65 +43,6 @@ EAPI Evas_Object * elm_check_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** - * @brief Set the text label of the check object - * - * @param obj The check object - * @param label The text label string in UTF-8 - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_check_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * @brief Get the text label of the check object - * - * @param obj The check object - * @return The text label string in UTF-8 - * - * @deprecated use elm_object_text_get() instead. - */ -EINA_DEPRECATED EAPI const char *elm_check_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Set the icon object of the check object - * - * @param obj The check object - * @param icon The icon object - * - * Once the icon object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_object_content_unset() function. - * - * @deprecated use elm_object_part_content_set() instead. - * - */ -EINA_DEPRECATED EAPI void elm_check_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); - -/** - * @brief Get the icon object of the check object - * - * @param obj The check object - * @return The icon object - * - * @deprecated use elm_object_part_content_get() instead. - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Unset the icon used for the check object - * - * @param obj The check object - * @return The icon object that was being used - * - * Unparent and return the icon object which was set for this widget. - * - * @deprecated use elm_object_part_content_unset() instead. - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** * @brief Set the on/off state of the check object * * @param obj The check object @@ -135,8 +76,6 @@ EAPI Eina_Bool elm_check_state_get(const Evas_Object *obj) EI * elm_check_state_set(). */ EAPI void elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep) EINA_ARG_NONNULL(1); -EINA_DEPRECATED EAPI void elm_check_states_labels_set(Evas_Object *obj, const char *ontext, const char *offtext) EINA_ARG_NONNULL(1, 2, 3); -EINA_DEPRECATED EAPI void elm_check_states_labels_get(const Evas_Object *obj, const char **ontext, const char **offtext) EINA_ARG_NONNULL(1, 2, 3); /** * @} diff --git a/src/lib/elm_clock.h b/src/lib/elm_clock.h index 69f1348..46780e4 100644 --- a/src/lib/elm_clock.h +++ b/src/lib/elm_clock.h @@ -49,7 +49,7 @@ * @see elm_clock_edit_set() * @see elm_clock_digit_edit_set() */ -typedef enum _Elm_Clock_Digedit +typedef enum { ELM_CLOCK_NONE = 0, /**< Default value. Means that all digits are editable, when in edition mode. */ ELM_CLOCK_HOUR_DECIMAL = 1 << 0, /**< Decimal algarism of hours value should be editable */ @@ -72,9 +72,7 @@ typedef enum _Elm_Clock_Digedit * * @ingroup Clock */ -EAPI Evas_Object * - elm_clock_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_clock_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set a clock widget's time, programmatically diff --git a/src/lib/elm_cnp.h b/src/lib/elm_cnp.h index 9b88c9b..0b5775d 100644 --- a/src/lib/elm_cnp.h +++ b/src/lib/elm_cnp.h @@ -6,7 +6,7 @@ typedef struct _Elm_Selection_Data Elm_Selection_Data; typedef Eina_Bool (*Elm_Drop_Cb)(void *d, Evas_Object *o, Elm_Selection_Data *data); -typedef enum _Elm_Sel_Type +typedef enum { ELM_SEL_TYPE_PRIMARY, ELM_SEL_TYPE_SECONDARY, @@ -16,7 +16,7 @@ typedef enum _Elm_Sel_Type ELM_SEL_TYPE_MAX, } Elm_Sel_Type; -typedef enum _Elm_Sel_Format +typedef enum { /** Targets: for matching every atom requesting */ ELM_SEL_FORMAT_TARGETS = -1, diff --git a/src/lib/elm_colorselector.h b/src/lib/elm_colorselector.h index 6e93fc4..9b013f7 100644 --- a/src/lib/elm_colorselector.h +++ b/src/lib/elm_colorselector.h @@ -13,6 +13,7 @@ * * See @ref tutorial_colorselector. */ + /** * @brief Add a new colorselector to the parent * @@ -21,9 +22,8 @@ * * @ingroup Colorselector */ -EAPI Evas_Object * - elm_colorselector_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_colorselector_add(Evas_Object *parent) EINA_ARG_NONNULL(1); + /** * Set a color for the colorselector * @@ -36,6 +36,7 @@ EINA_ARG_NONNULL(1); * @ingroup Colorselector */ EAPI void elm_colorselector_color_set(Evas_Object *obj, int r, int g, int b, int a) EINA_ARG_NONNULL(1); + /** * Get a color from the colorselector * @@ -48,6 +49,7 @@ EAPI void elm_colorselector_color_set(Evas_Object *obj, int r, int g, int b, int * @ingroup Colorselector */ EAPI void elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) EINA_ARG_NONNULL(1); + /** * @} */ diff --git a/src/lib/elm_conform.h b/src/lib/elm_conform.h index cffbf53..645456d 100644 --- a/src/lib/elm_conform.h +++ b/src/lib/elm_conform.h @@ -42,68 +42,7 @@ * * @ingroup Conformant */ -EAPI Evas_Object * - elm_conformant_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the content of the conformant widget. - * - * @param obj The conformant object. - * @param content The content to be displayed by the conformant. - * - * Content will be sized and positioned considering the space required - * to display a virtual keyboard. So it won't fill all the conformant - * size. This way is possible to be sure that content won't resize - * or be re-positioned after the keyboard is displayed. - * - * Once the content object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_object_content_unset() function. - * - * @see elm_object_content_unset() - * @see elm_object_content_get() - * - * @deprecated use elm_object_content_set() instead - * - * @ingroup Conformant - */ -EINA_DEPRECATED EAPI void elm_conformant_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); - -/** - * Get the content of the conformant widget. - * - * @param obj The conformant object. - * @return The content that is being used. - * - * Return the content object which is set for this widget. - * It won't be unparent from conformant. For that, use - * elm_object_content_unset(). - * - * @see elm_object_content_set(). - * @see elm_object_content_unset() - * - * @deprecated use elm_object_content_get() instead - * - * @ingroup Conformant - */ -EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Unset the content of the conformant widget. - * - * @param obj The conformant object. - * @return The content that was being used. - * - * Unparent and return the content object which was set for this widget. - * - * @see elm_object_content_set(). - * - * @deprecated use elm_object_content_unset() instead - * - * @ingroup Conformant - */ -EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_conformant_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Returns the Evas_Object that represents the content area. diff --git a/src/lib/elm_cursor.h b/src/lib/elm_cursor.h index 8010401..a40a3d6 100644 --- a/src/lib/elm_cursor.h +++ b/src/lib/elm_cursor.h @@ -37,9 +37,7 @@ * * @ingroup Cursors */ -EAPI void - elm_object_cursor_set(Evas_Object *obj, const char *cursor) -EINA_ARG_NONNULL(1); +EAPI void elm_object_cursor_set(Evas_Object *obj, const char *cursor) EINA_ARG_NONNULL(1); /** * Get the cursor to be shown when mouse is over the object diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h index d2cce5a..c988b76 100644 --- a/src/lib/elm_deprecated.h +++ b/src/lib/elm_deprecated.h @@ -1,23 +1,3 @@ -/* TEMPORARY: DOCS WILL BE FILLED IN WITH CNP/SED */ -// XXX: elm_gen -> kill. -typedef struct Elm_Gen_Item Elm_Gen_Item; -typedef struct _Elm_Gen_Item_Class Elm_Gen_Item_Class; -typedef struct _Elm_Gen_Item_Class_Func Elm_Gen_Item_Class_Func; /**< Class functions for gen item classes. */ -typedef char *(*Elm_Gen_Item_Text_Get_Cb)(void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for gen item classes. */ -typedef Evas_Object *(*Elm_Gen_Item_Content_Get_Cb)(void *data, Evas_Object *obj, const char *part); /**< Content(swallowed object) fetching class function for gen item classes. */ -typedef Eina_Bool (*Elm_Gen_Item_State_Get_Cb)(void *data, Evas_Object *obj, const char *part); /**< State fetching class function for gen item classes. */ -typedef void (*Elm_Gen_Item_Del_Cb)(void *data, Evas_Object *obj); /**< Deletion class function for gen item classes. */ -struct _Elm_Gen_Item_Class -{ - const char *item_style; - struct _Elm_Gen_Item_Class_Func - { - Elm_Gen_Item_Text_Get_Cb text_get; - Elm_Gen_Item_Content_Get_Cb content_get; - Elm_Gen_Item_State_Get_Cb state_get; - Elm_Gen_Item_Del_Cb del; - } func; -}; EINA_DEPRECATED EAPI void elm_gen_clear(Evas_Object *obj); EINA_DEPRECATED EAPI void elm_gen_item_selected_set(Elm_Gen_Item *it, Eina_Bool selected); EINA_DEPRECATED EAPI Eina_Bool elm_gen_item_selected_get(const Elm_Gen_Item *it); @@ -82,9 +62,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_gen_item_widget_get(const Elm_Gen_Item *i * * @return The toggle object */ -EINA_DEPRECATED EAPI Evas_Object * - elm_toggle_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EINA_DEPRECATED EAPI Evas_Object *elm_toggle_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Sets the label to be displayed with the toggle. @@ -269,3 +247,2135 @@ EINA_DEPRECATED EAPI void elm_scrolled_entry_autosave_set(Evas_Object *o EINA_DEPRECATED EAPI Eina_Bool elm_scrolled_entry_autosave_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EINA_DEPRECATED EAPI void elm_scrolled_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly) EINA_ARG_NONNULL(1); EINA_DEPRECATED EAPI Eina_Bool elm_scrolled_entry_cnp_textonly_get(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * This sets the text displayed within the entry to @p entry. + * + * @param obj The entry object + * @param entry The text to be displayed + * + * @deprecated Use elm_object_text_set() instead. + * @note Using this function bypasses text filters + */ +EINA_DEPRECATED EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry) EINA_ARG_NONNULL(1); + +/** + * This returns the text currently shown in object @p entry. + * See also elm_entry_entry_set(). + * + * @param obj The entry object + * @return The currently displayed text or NULL on failure + * + * @deprecated Use elm_object_text_get() instead. + */ +EINA_DEPRECATED EAPI const char *elm_entry_entry_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the text to show in the anchorblock + * + * Sets the text of the anchorblock to @p text. This text can include markup + * format tags, including \ to begin a segment + * of text that will be specially styled and react to click events, ended + * with either of \ or \. When clicked, the anchor will emit an + * "anchor,clicked" signal that you can attach a callback to with + * evas_object_smart_callback_add(). The name of the anchor given in the + * event info struct will be the one set in the href attribute, in this + * case, anchorname. + * + * Other markup can be used to style the text in different ways, but it's + * up to the style defined in the theme which tags do what. + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_anchorblock_text_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); + +/** + * Get the markup text set for the anchorblock + * + * Retrieves the text set on the anchorblock, with markup tags included. + * + * @param obj The anchorblock object + * @return The markup text set or @c NULL if nothing was set or an error + * occurred + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI const char *elm_anchorblock_text_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the text to show in the anchorview + * + * Sets the text of the anchorview to @p text. This text can include markup + * format tags, including \ to begin a segment of + * text that will be specially styled and react to click events, ended with + * either of \ or \. When clicked, the anchor will emit an + * "anchor,clicked" signal that you can attach a callback to with + * evas_object_smart_callback_add(). The name of the anchor given in the + * event info struct will be the one set in the href attribute, in this + * case, anchorname. + * + * Other markup can be used to style the text in different ways, but it's + * up to the style defined in the theme which tags do what. + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); + +/** + * Get the markup text set for the anchorview + * + * Retrieves the text set on the anchorview, with markup tags included. + * + * @param obj The anchorview object + * @return The markup text set or @c NULL if nothing was set or an error + * occurred + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI const char *elm_anchorview_text_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Get the ctxpopup item's disabled/enabled state. + * + * @param it Ctxpopup item to be enabled/disabled + * @return disabled @c EINA_TRUE, if disabled, @c EINA_FALSE otherwise + * + * @see elm_ctxpopup_item_disabled_set() + * @deprecated use elm_object_item_disabled_get() instead + * + * @ingroup Ctxpopup + */ +EINA_DEPRECATED EAPI Eina_Bool elm_ctxpopup_item_disabled_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * @brief Set the ctxpopup item's state as disabled or enabled. + * + * @param it Ctxpopup item to be enabled/disabled + * @param disabled @c EINA_TRUE to disable it, @c EINA_FALSE to enable it + * + * When disabled the item is greyed out to indicate it's state. + * @deprecated use elm_object_item_disabled_set() instead + * + * @ingroup Ctxpopup + */ +EINA_DEPRECATED EAPI void elm_ctxpopup_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) EINA_ARG_NONNULL(1); + +/** + * @brief Get the icon object for the given ctxpopup item. + * + * @param it Ctxpopup item + * @return icon object or @c NULL, if the item does not have icon or an error + * occurred + * + * @see elm_ctxpopup_item_append() + * @see elm_ctxpopup_item_icon_set() + * + * @deprecated use elm_object_item_part_content_get() instead + * + * @ingroup Ctxpopup + */ +EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_item_icon_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * @brief Sets the side icon associated with the ctxpopup item + * + * @param it Ctxpopup item + * @param icon Icon object to be set + * + * Once the icon object is set, a previously set one will be deleted. + * @warning Setting the same icon for two items will cause the icon to + * dissapear from the first item. + * + * @see elm_ctxpopup_item_append() + * + * @deprecated use elm_object_item_part_content_set() instead + * + * @ingroup Ctxpopup + */ +EINA_DEPRECATED EAPI void elm_ctxpopup_item_icon_set(Elm_Object_Item *it, Evas_Object *icon) EINA_ARG_NONNULL(1); + +/** + * @brief Get the label for the given ctxpopup item. + * + * @param it Ctxpopup item + * @return label string or @c NULL, if the item does not have label or an + * error occured + * + * @see elm_ctxpopup_item_append() + * @see elm_ctxpopup_item_label_set() + * + * @deprecated use elm_object_item_text_get() instead + * + * @ingroup Ctxpopup + */ +EINA_DEPRECATED EAPI const char *elm_ctxpopup_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * @brief (Re)set the label on the given ctxpopup item. + * + * @param it Ctxpopup item + * @param label String to set as label + * + * @deprecated use elm_object_item_text_set() instead + * + * @ingroup Ctxpopup + */ +EINA_DEPRECATED EAPI void elm_ctxpopup_item_label_set(Elm_Object_Item *it, const char *label) EINA_ARG_NONNULL(1); + +/** + * @brief Set an elm widget as the content of the ctxpopup. + * + * @param obj Ctxpopup object + * @param content Content to be swallowed + * + * If the content object is already set, a previous one will bedeleted. If + * you want to keep that old content object, use the + * elm_ctxpopup_content_unset() function. + * + * @warning Ctxpopup can't hold both a item list and a content at the same + * time. When a content is set, any previous items will be removed. + * + * @deprecated use elm_object_content_set() instead + * + * @ingroup Ctxpopup + */ +EINA_DEPRECATED EAPI void elm_ctxpopup_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1, 2); + +/** + * @brief Unset the ctxpopup content + * + * @param obj Ctxpopup object + * @return The content that was being used + * + * Unparent and return the content object which was set for this widget. + * + * @deprecated use elm_object_content_unset() + * + * @see elm_ctxpopup_content_set() + * + * @deprecated use elm_object_content_unset() instead + * + * @ingroup Ctxpopup + */ +EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the label for a given file selector button widget + * + * @param obj The file selector button widget + * @param label The text label to be displayed on @p obj + * + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_fileselector_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * Get the label set for a given file selector button widget + * + * @param obj The file selector button widget + * @return The button label + * + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI const char *elm_fileselector_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the label for a given file selector entry widget's button + * + * @param obj The file selector entry widget + * @param label The text label to be displayed on @p obj widget's + * button + * + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * Get the label set for a given file selector entry widget's button + * + * @param obj The file selector entry widget + * @return The widget button's label + * + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI const char *elm_fileselector_entry_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the hoversel button label + * + * @param obj The hoversel object + * @param label The label text. + * + * This sets the label of the button that is always visible (before it is + * clicked and expanded). + * + * @deprecated elm_object_text_set() + */ +EINA_DEPRECATED EAPI void elm_hoversel_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * @brief Get the hoversel button label + * + * @param obj The hoversel object + * @return The label text. + * + * @deprecated elm_object_text_get() + */ +EINA_DEPRECATED EAPI const char *elm_hoversel_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the icon of the hoversel button + * + * @param obj The hoversel object + * @param icon The icon object + * + * Sets the icon of the button that is always visible (before it is clicked + * and expanded). Once the icon object is set, a previously set one will be + * deleted, if you want to keep that old content object, use the + * elm_hoversel_icon_unset() function. + * + * @see elm_object_content_set() for the button widget + * @deprecated Use elm_object_item_part_content_set() instead + */ +EINA_DEPRECATED EAPI void elm_hoversel_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); + +/** + * @brief Get the icon of the hoversel button + * + * @param obj The hoversel object + * @return The icon object + * + * Get the icon of the button that is always visible (before it is clicked + * and expanded). Also see elm_object_content_get() for the button widget. + * + * @see elm_hoversel_icon_set() + * @deprecated Use elm_object_item_part_content_get() instead + */ +EINA_DEPRECATED EAPI Evas_Object *elm_hoversel_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Get and unparent the icon of the hoversel button + * + * @param obj The hoversel object + * @return The icon object that was being used + * + * Unparent and return the icon of the button that is always visible + * (before it is clicked and expanded). + * + * @see elm_hoversel_icon_set() + * @see elm_object_content_unset() for the button widget + * @deprecated Use elm_object_item_part_content_unset() instead + */ +EINA_DEPRECATED EAPI Evas_Object *elm_hoversel_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief This returns the data pointer supplied with elm_hoversel_item_add() + * that will be passed to associated function callbacks. + * + * @param it The item to get the data from + * @return The data pointer set with elm_hoversel_item_add() + * + * @see elm_hoversel_item_add() + * @deprecated Use elm_object_item_data_get() instead + */ +EINA_DEPRECATED EAPI void *elm_hoversel_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * @brief This returns the label text of the given hoversel item. + * + * @param it The item to get the label + * @return The label text of the hoversel item + * + * @see elm_hoversel_item_add() + * @deprecated Use elm_object_item_text_get() instead + */ +EINA_DEPRECATED EAPI const char *elm_hoversel_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * Set actionslider labels. + * + * @param obj The actionslider object + * @param left_label The label to be set on the left. + * @param center_label The label to be set on the center. + * @param right_label The label to be set on the right. + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_actionslider_labels_set(Evas_Object *obj, const char *left_label, const char *center_label, const char *right_label) EINA_ARG_NONNULL(1); + +/** + * Get actionslider labels. + * + * @param obj The actionslider object + * @param left_label A char** to place the left_label of @p obj into. + * @param center_label A char** to place the center_label of @p obj into. + * @param right_label A char** to place the right_label of @p obj into. + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_actionslider_labels_get(const Evas_Object *obj, const char **left_label, const char **center_label, const char **right_label) EINA_ARG_NONNULL(1); + +/** + * Set the label used on the indicator. + * + * @param obj The actionslider object + * @param label The label to be set on the indicator. + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_actionslider_indicator_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * Get the label used on the indicator object. + * + * @param obj The actionslider object + * @return The indicator label + * @deprecated use elm_object_text_get() instead. + */ +EINA_DEPRECATED EAPI const char *elm_actionslider_indicator_label_get(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the overlay object used for the background object. + * + * @param obj The bg object + * @param overlay The overlay object + * + * This provides a way for elm_bg to have an 'overlay' that will be on top + * of the bg. Once the over object is set, a previously set one will be + * deleted, even if you set the new one to NULL. If you want to keep that + * old content object, use the elm_bg_overlay_unset() function. + * + * @deprecated use elm_object_part_content_set() instead + * + * @ingroup Bg + */ + +EINA_DEPRECATED EAPI void elm_bg_overlay_set(Evas_Object *obj, Evas_Object *overlay) EINA_ARG_NONNULL(1); + +/** + * Get the overlay object used for the background object. + * + * @param obj The bg object + * @return The content that is being used + * + * Return the content object which is set for this widget + * + * @deprecated use elm_object_part_content_get() instead + * + * @ingroup Bg + */ +EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Get the overlay object used for the background object. + * + * @param obj The bg object + * @return The content that was being used + * + * Unparent and return the overlay object which was set for this widget + * + * @deprecated use elm_object_part_content_unset() instead + * + * @ingroup Bg + */ +EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + + +/** + * Set the label of the bubble + * + * @param obj The bubble object + * @param label The string to set in the label + * + * This function sets the title of the bubble. Where this appears depends on + * the selected corner. + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_bubble_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * Get the label of the bubble + * + * @param obj The bubble object + * @return The string of set in the label + * + * This function gets the title of the bubble. + * @deprecated use elm_object_text_get() instead. + */ +EINA_DEPRECATED EAPI const char *elm_bubble_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the info of the bubble + * + * @param obj The bubble object + * @param info The given info about the bubble + * + * This function sets the info of the bubble. Where this appears depends on + * the selected corner. + * @deprecated use elm_object_part_text_set() instead. (with "info" as the parameter). + */ +EINA_DEPRECATED EAPI void elm_bubble_info_set(Evas_Object *obj, const char *info) EINA_ARG_NONNULL(1); + +/** + * Get the info of the bubble + * + * @param obj The bubble object + * + * @return The "info" string of the bubble + * + * This function gets the info text. + * @deprecated use elm_object_part_text_get() instead. (with "info" as the parameter). + */ +EINA_DEPRECATED EAPI const char *elm_bubble_info_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the content to be shown in the bubble + * + * Once the content object is set, a previously set one will be deleted. + * If you want to keep the old content object, use the + * elm_bubble_content_unset() function. + * + * @param obj The bubble object + * @param content The given content of the bubble + * + * This function sets the content shown on the middle of the bubble. + * + * @deprecated use elm_object_content_set() instead + * + */ +EINA_DEPRECATED EAPI void elm_bubble_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); + +/** + * Get the content shown in the bubble + * + * Return the content object which is set for this widget. + * + * @param obj The bubble object + * @return The content that is being used + * + * @deprecated use elm_object_content_get() instead + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_bubble_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Unset the content shown in the bubble + * + * Unparent and return the content object which was set for this widget. + * + * @param obj The bubble object + * @return The content that was being used + * + * @deprecated use elm_object_content_unset() instead + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_bubble_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the icon of the bubble + * + * Once the icon object is set, a previously set one will be deleted. + * If you want to keep the old content object, use the + * elm_icon_content_unset() function. + * + * @param obj The bubble object + * @param icon The given icon for the bubble + * + * @deprecated use elm_object_part_content_set() instead + * + */ +EINA_DEPRECATED EAPI void elm_bubble_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); + +/** + * Get the icon of the bubble + * + * @param obj The bubble object + * @return The icon for the bubble + * + * This function gets the icon shown on the top left of bubble. + * + * @deprecated use elm_object_part_content_get() instead + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_bubble_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Unset the icon of the bubble + * + * Unparent and return the icon object which was set for this widget. + * + * @param obj The bubble object + * @return The icon that was being used + * + * @deprecated use elm_object_part_content_unset() instead + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_bubble_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + + +/** + * Set the label used in the button + * + * The passed @p label can be NULL to clean any existing text in it and + * leave the button as an icon only object. + * + * @param obj The button object + * @param label The text will be written on the button + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * Get the label set for the button + * + * The string returned is an internal pointer and should not be freed or + * altered. It will also become invalid when the button is destroyed. + * The string returned, if not NULL, is a stringshare, so if you need to + * keep it around even after the button is destroyed, you can use + * eina_stringshare_ref(). + * + * @param obj The button object + * @return The text set to the label, or NULL if nothing is set + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI const char *elm_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the icon used for the button + * + * Setting a new icon will delete any other that was previously set, making + * any reference to them invalid. If you need to maintain the previous + * object alive, unset it first with elm_button_icon_unset(). + * + * @param obj The button object + * @param icon The icon object for the button + * @deprecated use elm_object_part_content_set() instead. + */ +EINA_DEPRECATED EAPI void elm_button_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); + +/** + * Get the icon used for the button + * + * Return the icon object which is set for this widget. If the button is + * destroyed or another icon is set, the returned object will be deleted + * and any reference to it will be invalid. + * + * @param obj The button object + * @return The icon object that is being used + * + * @deprecated use elm_object_part_content_get() instead + */ +EINA_DEPRECATED EAPI Evas_Object *elm_button_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Remove the icon set without deleting it and return the object + * + * This function drops the reference the button holds of the icon object + * and returns this last object. It is used in case you want to remove any + * icon, or set another one, without deleting the actual object. The button + * will be left without an icon set. + * + * @param obj The button object + * @return The icon object that was being used + * @deprecated use elm_object_part_content_unset() instead. + */ +EINA_DEPRECATED EAPI Evas_Object *elm_button_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set a day text color to the same that represents Saturdays. + * + * @param obj The calendar object. + * @param pos The text position. Position is the cell counter, from left + * to right, up to down. It starts on 0 and ends on 41. + * + * @deprecated use elm_calendar_mark_add() instead like: + * + * @code + * struct tm t = { 0, 0, 12, 6, 0, 0, 6, 6, -1 }; + * elm_calendar_mark_add(obj, "sat", &t, ELM_CALENDAR_WEEKLY); + * @endcode + * + * @see elm_calendar_mark_add() + * + * @ingroup Calendar + */ +EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); + +/** + * Set a day text color to the same that represents Sundays. + * + * @param obj The calendar object. + * @param pos The text position. Position is the cell counter, from left + * to right, up to down. It starts on 0 and ends on 41. + + * @deprecated use elm_calendar_mark_add() instead like: + * + * @code + * struct tm t = { 0, 0, 12, 7, 0, 0, 0, 0, -1 }; + * elm_calendar_mark_add(obj, "sat", &t, ELM_CALENDAR_WEEKLY); + * @endcode + * + * @see elm_calendar_mark_add() + * + * @ingroup Calendar + */ +EINA_DEPRECATED EAPI void elm_calendar_text_sunday_color_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); + +/** + * Set a day text color to the same that represents Weekdays. + * + * @param obj The calendar object + * @param pos The text position. Position is the cell counter, from left + * to right, up to down. It starts on 0 and ends on 41. + * + * @deprecated use elm_calendar_mark_add() instead like: + * + * @code + * struct tm t = { 0, 0, 12, 1, 0, 0, 0, 0, -1 }; + * + * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // monday + * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; + * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // tuesday + * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; + * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // wednesday + * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; + * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // thursday + * t.tm_tm_mday++; t.tm_wday++; t.tm_yday++; + * elm_calendar_mark_add(obj, "week", &t, ELM_CALENDAR_WEEKLY); // friday + * @endcode + * + * @see elm_calendar_mark_add() + * + * @ingroup Calendar + */ +EINA_DEPRECATED EAPI void elm_calendar_text_weekday_color_set(Evas_Object *obj, int pos) EINA_ARG_NONNULL(1); + + +/** + * @brief Set the text label of the check object + * + * @param obj The check object + * @param label The text label string in UTF-8 + * + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_check_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * @brief Get the text label of the check object + * + * @param obj The check object + * @return The text label string in UTF-8 + * + * @deprecated use elm_object_text_get() instead. + */ +EINA_DEPRECATED EAPI const char *elm_check_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the icon object of the check object + * + * @param obj The check object + * @param icon The icon object + * + * Once the icon object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_object_content_unset() function. + * + * @deprecated use elm_object_part_content_set() instead. + * + */ +EINA_DEPRECATED EAPI void elm_check_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); + +/** + * @brief Get the icon object of the check object + * + * @param obj The check object + * @return The icon object + * + * @deprecated use elm_object_part_content_get() instead. + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Unset the icon used for the check object + * + * @param obj The check object + * @return The icon object that was being used + * + * Unparent and return the icon object which was set for this widget. + * + * @deprecated use elm_object_part_content_unset() instead. + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the text label of the check object + * + * @param obj The check object + * @param label The text label string in UTF-8 + * + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_check_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * @brief Get the text label of the check object + * + * @param obj The check object + * @return The text label string in UTF-8 + * + * @deprecated use elm_object_text_get() instead. + */ +EINA_DEPRECATED EAPI const char *elm_check_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the icon object of the check object + * + * @param obj The check object + * @param icon The icon object + * + * Once the icon object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_object_content_unset() function. + * + * @deprecated use elm_object_part_content_set() instead. + * + */ +EINA_DEPRECATED EAPI void elm_check_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); + +/** + * @brief Get the icon object of the check object + * + * @param obj The check object + * @return The icon object + * + * @deprecated use elm_object_part_content_get() instead. + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Unset the icon used for the check object + * + * @param obj The check object + * @return The icon object that was being used + * + * Unparent and return the icon object which was set for this widget. + * + * @deprecated use elm_object_part_content_unset() instead. + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +EINA_DEPRECATED EAPI void elm_check_states_labels_set(Evas_Object *obj, const char *ontext, const char *offtext) EINA_ARG_NONNULL(1, 2, 3); +EINA_DEPRECATED EAPI void elm_check_states_labels_get(const Evas_Object *obj, const char **ontext, const char **offtext) EINA_ARG_NONNULL(1, 2, 3); + + +/** + * Set the content of the conformant widget. + * + * @param obj The conformant object. + * @param content The content to be displayed by the conformant. + * + * Content will be sized and positioned considering the space required + * to display a virtual keyboard. So it won't fill all the conformant + * size. This way is possible to be sure that content won't resize + * or be re-positioned after the keyboard is displayed. + * + * Once the content object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_object_content_unset() function. + * + * @see elm_object_content_unset() + * @see elm_object_content_get() + * + * @deprecated use elm_object_content_set() instead + * + * @ingroup Conformant + */ +EINA_DEPRECATED EAPI void elm_conformant_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); + +/** + * Get the content of the conformant widget. + * + * @param obj The conformant object. + * @return The content that is being used. + * + * Return the content object which is set for this widget. + * It won't be unparent from conformant. For that, use + * elm_object_content_unset(). + * + * @see elm_object_content_set(). + * @see elm_object_content_unset() + * + * @deprecated use elm_object_content_get() instead + * + * @ingroup Conformant + */ +EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Unset the content of the conformant widget. + * + * @param obj The conformant object. + * @return The content that was being used. + * + * Unparent and return the content object which was set for this widget. + * + * @see elm_object_content_set(). + * + * @deprecated use elm_object_content_unset() instead + * + * @ingroup Conformant + */ +EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Get the side labels max length. + * + * @deprecated use elm_diskselector_side_label_length_get() instead: + * + * @param obj The diskselector object. + * @return The max length defined for side labels, or 0 if not a valid + * diskselector. + * + * @ingroup Diskselector + */ +EINA_DEPRECATED EAPI int elm_diskselector_side_label_lenght_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the side labels max length. + * + * @deprecated use elm_diskselector_side_label_length_set() instead: + * + * @param obj The diskselector object. + * @param len The max length defined for side labels. + * + * @ingroup Diskselector + */ +EINA_DEPRECATED EAPI void elm_diskselector_side_label_lenght_set(Evas_Object *obj, int len) EINA_ARG_NONNULL(1); + +EINA_DEPRECATED EAPI void elm_factory_content_set(Evas_Object *obj, Evas_Object *content); +EINA_DEPRECATED EAPI Evas_Object *elm_factory_content_get(const Evas_Object *obj); + +/** + * Get the label of a given flip selector widget's item. + * + * @param it The item to get label from + * @return The text label of @p item or @c NULL, on errors + * + * @see elm_object_item_text_set() + * + * @deprecated see elm_object_item_text_get() instead + * @ingroup Flipselector + */ +EINA_DEPRECATED EAPI const char *elm_flipselector_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * Set the label of a given flip selector widget's item. + * + * @param it The item to set label on + * @param label The text label string, in UTF-8 encoding + * + * @see elm_object_item_text_get() + * + * @deprecated see elm_object_item_text_set() instead + * @ingroup Flipselector + */ +EINA_DEPRECATED EAPI void elm_flipselector_item_label_set(Elm_Object_Item *it, const char *label) EINA_ARG_NONNULL(1); + +/** + * Make a given Elementary object the focused one. + * + * @param obj The Elementary object to make focused. + * + * @note This object, if it can handle focus, will take the focus + * away from the one who had it previously and will, for now on, be + * the one receiving input events. + * + * @see elm_object_focus_get() + * @deprecated use elm_object_focus_set() instead. + * + * @ingroup Focus + */ +EINA_DEPRECATED EAPI void elm_object_focus(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Remove the focus from an Elementary object + * + * @param obj The Elementary to take focus from + * + * This removes the focus from @p obj, passing it back to the + * previous element in the focus chain list. + * + * @see elm_object_focus() and elm_object_focus_custom_chain_get() + * @deprecated use elm_object_focus_set() instead. + * + * @ingroup Focus + */ +EINA_DEPRECATED EAPI void elm_object_unfocus(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the frame label + * + * @param obj The frame object + * @param label The label of this frame object + * + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_frame_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * @brief Get the frame label + * + * @param obj The frame object + * + * @return The label of this frame objet or NULL if unable to get frame + * + * @deprecated use elm_object_text_get() instead. + */ +EINA_DEPRECATED EAPI const char *elm_frame_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the content of the frame widget + * + * Once the content object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_frame_content_unset() function. + * + * @param obj The frame object + * @param content The content will be filled in this frame object + * + * @deprecated use elm_object_content_set() instead. + */ +EINA_DEPRECATED EAPI void elm_frame_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); + +/** + * @brief Get the content of the frame widget + * + * Return the content object which is set for this widget + * + * @param obj The frame object + * @return The content that is being used + * + * @deprecated use elm_object_content_get() instead. + */ +EINA_DEPRECATED EAPI Evas_Object *elm_frame_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Unset the content of the frame widget + * + * Unparent and return the content object which was set for this widget + * + * @param obj The frame object + * @return The content that was being used + * + * @deprecated use elm_object_content_unset() instead. + */ +EINA_DEPRECATED EAPI Evas_Object *elm_frame_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +EINA_DEPRECATED EAPI void elm_genlist_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode) EINA_ARG_NONNULL(1); +EINA_DEPRECATED EAPI Elm_List_Mode elm_genlist_horizontal_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EINA_DEPRECATED EAPI void elm_genlist_item_icons_orphan(Elm_Genlist_Item *it) EINA_ARG_NONNULL(1); + +#define ELM_IMAGE_ROTATE_90_CW 1 +#define ELM_IMAGE_ROTATE_180_CW 2 +#define ELM_IMAGE_ROTATE_90_CCW 3 + +/** + * Return the data associated with a given index widget item + * + * @param it The index widget item handle + * @return The data associated with @p it + * @deprecated Use elm_object_item_data_get() instead + * + * @see elm_index_item_data_set() + * + * @ingroup Index + */ +EINA_DEPRECATED EAPI void *elm_index_item_data_get(const Elm_Object_Item *item) EINA_ARG_NONNULL(1); + +/** + * Set the data associated with a given index widget item + * + * @param it The index widget item handle + * @param data The new data pointer to set to @p it + * + * This sets new item data on @p it. + * + * @warning The old data pointer won't be touched by this function, so + * the user had better to free that old data himself/herself. + * + * @deprecated Use elm_object_item_data_set() instead + * @ingroup Index + */ +EINA_DEPRECATED EAPI void elm_index_item_data_set(Elm_Object_Item *it, const void *data) EINA_ARG_NONNULL(1); + +/** + * @brief Set the label on the label object + * + * @param obj The label object + * @param label The label will be used on the label object + * @deprecated See elm_object_text_set() + */ +EINA_DEPRECATED EAPI void elm_label_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * @brief Get the label used on the label object + * + * @param obj The label object + * @return The string inside the label + * @deprecated See elm_object_text_get() + */ +EINA_DEPRECATED EAPI const char *elm_label_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + + +/** + * Set the layout content. + * + * @param obj The layout object + * @param swallow The swallow part name in the edje file + * @param content The child that will be added in this layout object + * + * Once the content object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_object_part_content_unset() function. + * + * @note In an Edje theme, the part used as a content container is called @c + * SWALLOW. This is why the parameter name is called @p swallow, but it is + * expected to be a part name just like the second parameter of + * elm_layout_box_append(). + * + * @see elm_layout_box_append() + * @see elm_object_part_content_get() + * @see elm_object_part_content_unset() + * @see @ref secBox + * @deprecated use elm_object_part_content_set() instead + * + * @ingroup Layout + */ +EINA_DEPRECATED EAPI void elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) EINA_ARG_NONNULL(1); + +/** + * Get the child object in the given content part. + * + * @param obj The layout object + * @param swallow The SWALLOW part to get its content + * + * @return The swallowed object or NULL if none or an error occurred + * + * @deprecated use elm_object_part_content_get() instead + * + * @ingroup Layout + */ +EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1); + +/** + * Unset the layout content. + * + * @param obj The layout object + * @param swallow The swallow part name in the edje file + * @return The content that was being used + * + * Unparent and return the content object which was set for this part. + * + * @deprecated use elm_object_part_content_unset() instead + * + * @ingroup Layout + */ +EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1); + +/** + * Set the text of the given part + * + * @param obj The layout object + * @param part The TEXT part where to set the text + * @param text The text to set + * + * @ingroup Layout + * @deprecated use elm_object_part_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_layout_text_set(Evas_Object *obj, const char *part, const char *text) EINA_ARG_NONNULL(1); + +/** + * Get the text set in the given part + * + * @param obj The layout object + * @param part The TEXT part to retrieve the text off + * + * @return The text set in @p part + * + * @ingroup Layout + * @deprecated use elm_object_part_text_get() instead. + */ +EINA_DEPRECATED EAPI const char *elm_layout_text_get(const Evas_Object *obj, const char *part) EINA_ARG_NONNULL(1); + +/** + * @def elm_layout_label_set + * Convienience macro to set the label in a layout that follows the + * Elementary naming convention for its parts. + * + * @ingroup Layout + * @deprecated use elm_object_text_set() instead. + */ +#define elm_layout_label_set(_ly, _txt) \ + elm_layout_text_set((_ly), "elm.text", (_txt)) + +/** + * @def elm_layout_label_get + * Convenience macro to get the label in a layout that follows the + * Elementary naming convention for its parts. + * + * @ingroup Layout + * @deprecated use elm_object_text_set() instead. + */ +#define elm_layout_label_get(_ly) \ + elm_layout_text_get((_ly), "elm.text") + +EINA_DEPRECATED EAPI Evas_Object *elm_list_item_base_get(const Elm_List_Item *item) EINA_ARG_NONNULL(1); + + +/** + * Set the content of the mapbuf. + * + * @param obj The mapbuf object. + * @param content The content that will be filled in this mapbuf object. + * + * Once the content object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_mapbuf_content_unset() function. + * + * To enable map, elm_mapbuf_enabled_set() should be used. + * + * @deprecated use elm_object_content_set() instead + * + * @ingroup Mapbuf + */ +EINA_DEPRECATED EAPI void elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); + +/** + * Get the content of the mapbuf. + * + * @param obj The mapbuf object. + * @return The content that is being used. + * + * Return the content object which is set for this widget. + * + * @see elm_mapbuf_content_set() for details. + * + * @deprecated use elm_object_content_get() instead + * + * @ingroup Mapbuf + */ +EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Unset the content of the mapbuf. + * + * @param obj The mapbuf object. + * @return The content that was being used. + * + * Unparent and return the content object which was set for this widget. + * + * @see elm_mapbuf_content_set() for details. + * + * @deprecated use elm_object_content_unset() instead + * + * @ingroup Mapbuf + */ +EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the label of a menu item + * + * @param it The menu item object. + * @param label The label to set for @p item + * + * @warning Don't use this funcion on items created with + * elm_menu_item_add_object() or elm_menu_item_separator_add(). + * + * @deprecated Use elm_object_item_text_set() instead + */ +EINA_DEPRECATED EAPI void elm_menu_item_label_set(Elm_Object_Item *it, const char *label) EINA_ARG_NONNULL(1); + +/** + * @brief Get the label of a menu item + * + * @param it The menu item object. + * @return The label of @p item + * @deprecated Use elm_object_item_text_get() instead + */ +EINA_DEPRECATED EAPI const char *elm_menu_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * @brief Set the content object of a menu item + * + * @param it The menu item object + * @param The content object or NULL + * @return EINA_TRUE on success, else EINA_FALSE + * + * Use this function to change the object swallowed by a menu item, deleting + * any previously swallowed object. + * + * @deprecated Use elm_object_item_content_set() instead + */ +EINA_DEPRECATED EAPI Eina_Bool elm_menu_item_object_content_set(Elm_Object_Item *it, Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Get the content object of a menu item + * + * @param it The menu item object + * @return The content object or NULL + * @note If @p item was added with elm_menu_item_add_object, this + * function will return the object passed, else it will return the + * icon object. + * + * @see elm_menu_item_object_content_set() + * + * @deprecated Use elm_object_item_content_get() instead + */ +EINA_DEPRECATED EAPI Evas_Object *elm_menu_item_object_content_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * @brief Set the disabled state of @p item. + * + * @param it The menu item object. + * @param disabled The enabled/disabled state of the item + * @deprecated Use elm_object_item_disabled_set() instead + */ +EINA_DEPRECATED EAPI void elm_menu_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) EINA_ARG_NONNULL(1); + +/** + * @brief Get the disabled state of @p item. + * + * @param it The menu item object. + * @return The enabled/disabled state of the item + * + * @see elm_menu_item_disabled_set() + * @deprecated Use elm_object_item_disabled_get() instead + */ +EINA_DEPRECATED EAPI Eina_Bool elm_menu_item_disabled_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * @brief Returns the data associated with menu item @p item. + * + * @param it The item + * @return The data associated with @p item or NULL if none was set. + * + * This is the data set with elm_menu_add() or elm_menu_item_data_set(). + * + * @deprecated Use elm_object_item_data_get() instead + */ +EINA_DEPRECATED EAPI void *elm_menu_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * @brief Sets the data to be associated with menu item @p item. + * + * @param it The item + * @param data The data to be associated with @p item + * + * @deprecated Use elm_object_item_data_set() instead + */ +EINA_DEPRECATED EAPI void elm_menu_item_data_set(Elm_Object_Item *it, const void *data) EINA_ARG_NONNULL(1); + +/** + * @brief Set the content of the notify widget + * + * @param obj The notify object + * @param content The content will be filled in this notify object + * + * Once the content object is set, a previously set one will be deleted. If + * you want to keep that old content object, use the + * elm_notify_content_unset() function. + * + * @deprecated use elm_object_content_set() instead + * + */ +EINA_DEPRECATED EAPI void elm_notify_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); + +/** + * @brief Unset the content of the notify widget + * + * @param obj The notify object + * @return The content that was being used + * + * Unparent and return the content object which was set for this widget + * + * @see elm_notify_content_set() + * @deprecated use elm_object_content_unset() instead + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_notify_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Return the content of the notify widget + * + * @param obj The notify object + * @return The content that is being used + * + * @see elm_notify_content_set() + * @deprecated use elm_object_content_get() instead + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_notify_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set a label of an object + * + * @param obj The Elementary object + * @param part The text part name to set (NULL for the default label) + * @param label The new text of the label + * + * @note Elementary objects may have many labels (e.g. Action Slider) + * @deprecated Use elm_object_part_text_set() instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI void elm_object_text_part_set(Evas_Object *obj, const char *part, const char *label); + +/** + * Get a label of an object + * + * @param obj The Elementary object + * @param part The text part name to get (NULL for the default label) + * @return text of the label or NULL for any error + * + * @note Elementary objects may have many labels (e.g. Action Slider) + * @deprecated Use elm_object_part_text_get() instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI const char *elm_object_text_part_get(const Evas_Object *obj, const char *part); + +/** + * Set a content of an object + * + * @param obj The Elementary object + * @param part The content part name to set (NULL for the default content) + * @param content The new content of the object + * + * @note Elementary objects may have many contents + * @deprecated Use elm_object_part_content_set instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI void elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content); + +/** + * Get a content of an object + * + * @param obj The Elementary object + * @param part The content part name to get (NULL for the default content) + * @return content of the object or NULL for any error + * + * @note Elementary objects may have many contents + * @deprecated Use elm_object_part_content_get instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *part); + +/** + * Unset a content of an object + * + * @param obj The Elementary object + * @param part The content part name to unset (NULL for the default content) + * + * @note Elementary objects may have many contents + * @deprecated Use elm_object_part_content_unset instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *part); + +/** + * Set a content of an object item + * + * @param it The Elementary object item + * @param part The content part name to set (NULL for the default content) + * @param content The new content of the object item + * + * @note Elementary object items may have many contents + * @deprecated Use elm_object_item_part_content_set instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI void elm_object_item_content_part_set(Elm_Object_Item *it, const char *part, Evas_Object *content); + +/** + * Get a content of an object item + * + * @param it The Elementary object item + * @param part The content part name to unset (NULL for the default content) + * @return content of the object item or NULL for any error + * + * @note Elementary object items may have many contents + * @deprecated Use elm_object_item_part_content_get instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI Evas_Object *elm_object_item_content_part_get(const Elm_Object_Item *it, const char *part); + +/** + * Unset a content of an object item + * + * @param it The Elementary object item + * @param part The content part name to unset (NULL for the default content) + * + * @note Elementary object items may have many contents + * @deprecated Use elm_object_item_part_content_unset instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI Evas_Object *elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part); + +/** + * Get a label of an object item + * + * @param it The Elementary object item + * @param part The text part name to get (NULL for the default label) + * @return text of the label or NULL for any error + * + * @note Elementary object items may have many labels + * @deprecated Use elm_object_item_part_text_get instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI const char *elm_object_item_text_part_get(const Elm_Object_Item *it, const char *part); + +/** + * Set a label of an object item + * + * @param it The Elementary object item + * @param part The text part name to set (NULL for the default label) + * @param label The new text of the label + * + * @note Elementary object items may have many labels + * @deprecated Use elm_object_item_part_text_set instead. + * @ingroup General + */ +EINA_DEPRECATED EAPI void elm_object_item_text_part_set(Elm_Object_Item *it, const char *part, const char *label); + +/** + * @brief Set the content of the panel. + * + * @param obj The panel object + * @param content The panel content + * + * Once the content object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_panel_content_unset() function. + * + * @deprecated use elm_object_content_set() instead + * + */ +EINA_DEPRECATED EAPI void elm_panel_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); + +/** + * @brief Get the content of the panel. + * + * @param obj The panel object + * @return The content that is being used + * + * Return the content object which is set for this widget. + * + * @see elm_panel_content_set() + * + * @deprecated use elm_object_content_get() instead + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_panel_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Unset the content of the panel. + * + * @param obj The panel object + * @return The content that was being used + * + * Unparent and return the content object which was set for this widget. + * + * @see elm_panel_content_set() + * + * @deprecated use elm_object_content_unset() instead + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_panel_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the left content of the panes widget. + * + * @param obj The panes object. + * @param content The new left content object. + * + * Once the content object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_panes_content_left_unset() function. + * + * If panes is displayed vertically, left content will be displayed at + * top. + * + * @see elm_panes_content_left_get() + * @see elm_panes_content_right_set() to set content on the other side. + * + * @deprecated use elm_object_part_content_set() instead + * + * @ingroup Panes + */ +EINA_DEPRECATED EAPI void elm_panes_content_left_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); + +/** + * Set the right content of the panes widget. + * + * @param obj The panes object. + * @param content The new right content object. + * + * Once the content object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_panes_content_right_unset() function. + * + * If panes is displayed vertically, left content will be displayed at + * bottom. + * + * @see elm_panes_content_right_get() + * @see elm_panes_content_left_set() to set content on the other side. + * + * @deprecated use elm_object_part_content_set() instead + * + * @ingroup Panes + */ +EINA_DEPRECATED EAPI void elm_panes_content_right_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); + +/** + * Get the left content of the panes. + * + * @param obj The panes object. + * @return The left content object that is being used. + * + * Return the left content object which is set for this widget. + * + * @see elm_panes_content_left_set() for details. + * + * @deprecated use elm_object_part_content_get() instead + * + * @ingroup Panes + */ +EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Get the right content of the panes. + * + * @param obj The panes object + * @return The right content object that is being used + * + * Return the right content object which is set for this widget. + * + * @see elm_panes_content_right_set() for details. + * + * @deprecated use elm_object_part_content_get() instead + * + * @ingroup Panes + */ +EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_right_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Unset the left content used for the panes. + * + * @param obj The panes object. + * @return The left content object that was being used. + * + * Unparent and return the left content object which was set for this widget. + * + * @see elm_panes_content_left_set() for details. + * @see elm_panes_content_left_get(). + * + * @deprecated use elm_object_part_content_unset() instead + * + * @ingroup Panes + */ +EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Unset the right content used for the panes. + * + * @param obj The panes object. + * @return The right content object that was being used. + * + * Unparent and return the right content object which was set for this + * widget. + * + * @see elm_panes_content_right_set() for details. + * @see elm_panes_content_right_get(). + * + * @deprecated use elm_object_part_content_unset() instead + * + * @ingroup Panes + */ +EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_right_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); +/** + * Set the label of a given progress bar widget + * + * @param obj The progress bar object + * @param label The text label string, in UTF-8 + * + * @ingroup Progressbar + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_progressbar_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * Get the label of a given progress bar widget + * + * @param obj The progressbar object + * @return The text label string, in UTF-8 + * + * @ingroup Progressbar + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI const char *elm_progressbar_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the icon object of a given progress bar widget + * + * @param obj The progress bar object + * @param icon The icon object + * + * Use this call to decorate @p obj with an icon next to it. + * + * @note Once the icon object is set, a previously set one will be + * deleted. If you want to keep that old content object, use the + * elm_progressbar_icon_unset() function. + * + * @see elm_progressbar_icon_get() + * @deprecated use elm_object_part_content_set() instead. + * + * @ingroup Progressbar + */ +EINA_DEPRECATED EAPI void elm_progressbar_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); + +/** + * Retrieve the icon object set for a given progress bar widget + * + * @param obj The progress bar object + * @return The icon object's handle, if @p obj had one set, or @c NULL, + * otherwise (and on errors) + * + * @see elm_progressbar_icon_set() for more details + * @deprecated use elm_object_part_content_get() instead. + * + * @ingroup Progressbar + */ +EINA_DEPRECATED EAPI Evas_Object *elm_progressbar_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Unset an icon set on a given progress bar widget + * + * @param obj The progress bar object + * @return The icon object that was being used, if any was set, or + * @c NULL, otherwise (and on errors) + * + * This call will unparent and return the icon object which was set + * for this widget, previously, on success. + * + * @see elm_progressbar_icon_set() for more details + * @deprecated use elm_object_part_content_unset() instead. + * + * @ingroup Progressbar + */ +EINA_DEPRECATED EAPI Evas_Object *elm_progressbar_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the text label of the radio object + * + * @param obj The radio object + * @param label The text label string in UTF-8 + * + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_radio_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * @brief Get the text label of the radio object + * + * @param obj The radio object + * @return The text label string in UTF-8 + * + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI const char *elm_radio_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the icon object of the radio object + * + * @param obj The radio object + * @param icon The icon object + * + * Once the icon object is set, a previously set one will be deleted. If you + * want to keep that old content object, use the elm_radio_icon_unset() + * function. + * + * @deprecated use elm_object_part_content_set() instead. + * + */ +EINA_DEPRECATED EAPI void elm_radio_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); + +/** + * @brief Get the icon object of the radio object + * + * @param obj The radio object + * @return The icon object + * + * @see elm_radio_icon_set() + * + * @deprecated use elm_object_part_content_get() instead. + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_radio_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Unset the icon used for the radio object + * + * @param obj The radio object + * @return The icon object that was being used + * + * Unparent and return the icon object which was set for this widget. + * + * @see elm_radio_icon_set() + * @deprecated use elm_object_part_content_unset() instead. + * + */ +EINA_DEPRECATED EAPI Evas_Object *elm_radio_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Set the content of the scroller widget (the object to be scrolled around). + * + * @param obj The scroller object + * @param content The new content object + * + * Once the content object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_scroller_content_unset() function. + * @deprecated use elm_object_content_set() instead + */ +EINA_DEPRECATED EAPI void elm_scroller_content_set(Evas_Object *obj, Evas_Object *child) EINA_ARG_NONNULL(1); + +/** + * @brief Get the content of the scroller widget + * + * @param obj The slider object + * @return The content that is being used + * + * Return the content object which is set for this widget + * + * @see elm_scroller_content_set() + * @deprecated use elm_object_content_get() instead. + */ +EINA_DEPRECATED EAPI Evas_Object *elm_scroller_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Unset the content of the scroller widget + * + * @param obj The slider object + * @return The content that was being used + * + * Unparent and return the content object which was set for this widget + * + * @see elm_scroller_content_set() + * @deprecated use elm_object_content_unset() instead. + */ +EINA_DEPRECATED EAPI Evas_Object *elm_scroller_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the label of a given slider widget + * + * @param obj The progress bar object + * @param label The text label string, in UTF-8 + * + * @ingroup Slider + * @deprecated use elm_object_text_set() instead. + */ +EINA_DEPRECATED EAPI void elm_slider_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); + +/** + * Get the label of a given slider widget + * + * @param obj The progressbar object + * @return The text label string, in UTF-8 + * + * @ingroup Slider + * @deprecated use elm_object_text_get() instead. + */ +EINA_DEPRECATED EAPI const char *elm_slider_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the icon object of the slider object. + * + * @param obj The slider object. + * @param icon The icon object. + * + * On horizontal mode, icon is placed at left, and on vertical mode, + * placed at top. + * + * @note Once the icon object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_slider_icon_unset() function. + * + * @warning If the object being set does not have minimum size hints set, + * it won't get properly displayed. + * + * @ingroup Slider + * @deprecated use elm_object_part_content_set() instead. + */ +EINA_DEPRECATED EAPI void elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); + +/** + * Unset an icon set on a given slider widget. + * + * @param obj The slider object. + * @return The icon object that was being used, if any was set, or + * @c NULL, otherwise (and on errors). + * + * On horizontal mode, icon is placed at left, and on vertical mode, + * placed at top. + * + * This call will unparent and return the icon object which was set + * for this widget, previously, on success. + * + * @see elm_slider_icon_set() for more details + * @see elm_slider_icon_get() + * @deprecated use elm_object_part_content_unset() instead. + * + * @ingroup Slider + */ +EINA_DEPRECATED EAPI Evas_Object *elm_slider_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Retrieve the icon object set for a given slider widget. + * + * @param obj The slider object. + * @return The icon object's handle, if @p obj had one set, or @c NULL, + * otherwise (and on errors). + * + * On horizontal mode, icon is placed at left, and on vertical mode, + * placed at top. + * + * @see elm_slider_icon_set() for more details + * @see elm_slider_icon_unset() + * + * @deprecated use elm_object_part_content_get() instead. + * + * @ingroup Slider + */ +EINA_DEPRECATED EAPI Evas_Object *elm_slider_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Set the end object of the slider object. + * + * @param obj The slider object. + * @param end The end object. + * + * On horizontal mode, end is placed at left, and on vertical mode, + * placed at bottom. + * + * @note Once the icon object is set, a previously set one will be deleted. + * If you want to keep that old content object, use the + * elm_slider_end_unset() function. + * + * @warning If the object being set does not have minimum size hints set, + * it won't get properly displayed. + * + * @deprecated use elm_object_part_content_set() instead. + * + * @ingroup Slider + */ +EINA_DEPRECATED EAPI void elm_slider_end_set(Evas_Object *obj, Evas_Object *end) EINA_ARG_NONNULL(1); + +/** + * Unset an end object set on a given slider widget. + * + * @param obj The slider object. + * @return The end object that was being used, if any was set, or + * @c NULL, otherwise (and on errors). + * + * On horizontal mode, end is placed at left, and on vertical mode, + * placed at bottom. + * + * This call will unparent and return the icon object which was set + * for this widget, previously, on success. + * + * @see elm_slider_end_set() for more details. + * @see elm_slider_end_get() + * + * @deprecated use elm_object_part_content_unset() instead + * instead. + * + * @ingroup Slider + */ +EINA_DEPRECATED EAPI Evas_Object *elm_slider_end_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Retrieve the end object set for a given slider widget. + * + * @param obj The slider object. + * @return The end object's handle, if @p obj had one set, or @c NULL, + * otherwise (and on errors). + * + * On horizontal mode, icon is placed at right, and on vertical mode, + * placed at bottom. + * + * @see elm_slider_end_set() for more details. + * @see elm_slider_end_unset() + * + * + * @deprecated use elm_object_part_content_get() instead + * instead. + * + * @ingroup Slider + */ +EINA_DEPRECATED EAPI Evas_Object *elm_slider_end_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * Return the data associated with a given slideshow item + * + * @param it The slideshow item + * @return Returns the data associated to this item + * + * @deprecated use elm_object_item_data_get() instead + * @ingroup Slideshow + */ +EINA_DEPRECATED EAPI void *elm_slideshow_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * Get the toolbar object from an item. + * + * @param it The item. + * @return The toolbar object. + * + * This returns the toolbar object itself that an item belongs to. + * + * @deprecated use elm_object_item_object_get() instead. + * @ingroup Toolbar + */ +EINA_DEPRECATED EAPI Evas_Object *elm_toolbar_item_toolbar_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * Get the label of item. + * + * @param it The item of toolbar. + * @return The label of item. + * + * The return value is a pointer to the label associated to @p item when + * it was created, with function elm_toolbar_item_append() or similar, + * or later, + * with function elm_toolbar_item_label_set. If no label + * was passed as argument, it will return @c NULL. + * + * @see elm_toolbar_item_label_set() for more details. + * @see elm_toolbar_item_append() + * + * @deprecated use elm_object_item_text_get() instead. + * @ingroup Toolbar + */ +EINA_DEPRECATED EAPI const char *elm_toolbar_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * Set the label of item. + * + * @param it The item of toolbar. + * @param text The label of item. + * + * The label to be displayed by the item. + * Label will be placed at icons bottom (if set). + * + * If a label was passed as argument on item creation, with function + * elm_toolbar_item_append() or similar, it will be already + * displayed by the item. + * + * @see elm_toolbar_item_label_get() + * @see elm_toolbar_item_append() + * + * @deprecated use elm_object_item_text_set() instead + * @ingroup Toolbar + */ +EINA_DEPRECATED EAPI void elm_toolbar_item_label_set(Elm_Object_Item *it, const char *label) EINA_ARG_NONNULL(1); + +/** + * Return the data associated with a given toolbar widget item. + * + * @param it The toolbar widget item handle. + * @return The data associated with @p item. + * + * @see elm_toolbar_item_data_set() + * + * @deprecated use elm_object_item_data_get() instead. + * @ingroup Toolbar + */ +EINA_DEPRECATED EAPI void *elm_toolbar_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * Set the data associated with a given toolbar widget item. + * + * @param it The toolbar widget item handle + * @param data The new data pointer to set to @p item. + * + * This sets new item data on @p item. + * + * @warning The old data pointer won't be touched by this function, so + * the user had better to free that old data himself/herself. + * + * @deprecated use elm_object_item_data_set() instead. + * @ingroup Toolbar + */ +EINA_DEPRECATED EAPI void elm_toolbar_item_data_set(Elm_Object_Item *it, const void *data) EINA_ARG_NONNULL(1); + +/** + * Get a value whether toolbar item is disabled or not. + * + * @param it The item. + * @return The disabled state. + * + * @see elm_toolbar_item_disabled_set() for more details. + * + * @deprecated use elm_object_item_disabled_get() instead. + * @ingroup Toolbar + */ +EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_item_disabled_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + +/** + * Sets the disabled/enabled state of a toolbar item. + * + * @param it The item. + * @param disabled The disabled state. + * + * A disabled item cannot be selected or unselected. It will also + * change its appearance (generally greyed out). This sets the + * disabled state (@c EINA_TRUE for disabled, @c EINA_FALSE for + * enabled). + * + * @deprecated use elm_object_item_disabled_set() instead. + * @ingroup Toolbar + */ +EINA_DEPRECATED EAPI void elm_toolbar_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) EINA_ARG_NONNULL(1); + +/** + * Change a toolbar's orientation + * @param obj The toolbar object + * @param vertical If @c EINA_TRUE, the toolbar is vertical + * By default, a toolbar will be horizontal. Use this function to create a vertical toolbar. + * @ingroup Toolbar + * @deprecated use elm_toolbar_horizontal_set() instead. + */ +EINA_DEPRECATED EAPI void elm_toolbar_orientation_set(Evas_Object *obj, Eina_Bool vertical) EINA_ARG_NONNULL(1); + +/** + * Get a toolbar's orientation + * @param obj The toolbar object + * @return If @c EINA_TRUE, the toolbar is vertical + * By default, a toolbar will be horizontal. Use this function to determine whether a toolbar is vertical. + * @ingroup Toolbar + * @deprecated use elm_toolbar_horizontal_get() instead. + */ +EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_orientation_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); + +/** + * @brief Link a Elm_Payer with an Elm_Video object. + * + * @param player the Elm_Player object. + * @param video The Elm_Video object. + * + * This mean that action on the player widget will affect the + * video object and the state of the video will be reflected in + * the player itself. + * + * @see elm_player_add() + * @see elm_video_add() + * @deprecated use elm_object_part_content_set() instead + * + * @ingroup Video + */ +EINA_DEPRECATED EAPI void elm_player_video_set(Evas_Object *player, Evas_Object *video); diff --git a/src/lib/elm_deprecated_before.h b/src/lib/elm_deprecated_before.h new file mode 100644 index 0000000..86ac8f9 --- /dev/null +++ b/src/lib/elm_deprecated_before.h @@ -0,0 +1,20 @@ +/* TEMPORARY: DOCS WILL BE FILLED IN WITH CNP/SED */ +// XXX: elm_gen -> kill. +typedef struct Elm_Gen_Item Elm_Gen_Item; +typedef struct _Elm_Gen_Item_Class Elm_Gen_Item_Class; +typedef struct _Elm_Gen_Item_Class_Func Elm_Gen_Item_Class_Func; /**< Class functions for gen item classes. */ +typedef char *(*Elm_Gen_Item_Text_Get_Cb)(void *data, Evas_Object *obj, const char *part); /**< Label fetching class function for gen item classes. */ +typedef Evas_Object *(*Elm_Gen_Item_Content_Get_Cb)(void *data, Evas_Object *obj, const char *part); /**< Content(swallowed object) fetching class function for gen item classes. */ +typedef Eina_Bool (*Elm_Gen_Item_State_Get_Cb)(void *data, Evas_Object *obj, const char *part); /**< State fetching class function for gen item classes. */ +typedef void (*Elm_Gen_Item_Del_Cb)(void *data, Evas_Object *obj); /**< Deletion class function for gen item classes. */ +struct _Elm_Gen_Item_Class +{ + const char *item_style; + struct _Elm_Gen_Item_Class_Func + { + Elm_Gen_Item_Text_Get_Cb text_get; + Elm_Gen_Item_Content_Get_Cb content_get; + Elm_Gen_Item_State_Get_Cb state_get; + Elm_Gen_Item_Del_Cb del; + } func; +}; diff --git a/src/lib/elm_diskselector.h b/src/lib/elm_diskselector.h index 77e7a48..7c0d393 100644 --- a/src/lib/elm_diskselector.h +++ b/src/lib/elm_diskselector.h @@ -74,31 +74,6 @@ EAPI Eina_Bool elm_diskselector_round_get(const Evas_Object *obj) E /** * Get the side labels max length. * - * @deprecated use elm_diskselector_side_label_length_get() instead: - * - * @param obj The diskselector object. - * @return The max length defined for side labels, or 0 if not a valid - * diskselector. - * - * @ingroup Diskselector - */ -EINA_DEPRECATED EAPI int elm_diskselector_side_label_lenght_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Set the side labels max length. - * - * @deprecated use elm_diskselector_side_label_length_set() instead: - * - * @param obj The diskselector object. - * @param len The max length defined for side labels. - * - * @ingroup Diskselector - */ -EINA_DEPRECATED EAPI void elm_diskselector_side_label_lenght_set(Evas_Object *obj, int len) EINA_ARG_NONNULL(1); - -/** - * Get the side labels max length. - * * @see elm_diskselector_side_label_length_set() for details. * * @param obj The diskselector object. diff --git a/src/lib/elm_entry.h b/src/lib/elm_entry.h index b5c7a11..8c57c73 100644 --- a/src/lib/elm_entry.h +++ b/src/lib/elm_entry.h @@ -1,4 +1,4 @@ -typedef enum _Elm_Text_Format +typedef enum { ELM_TEXT_FORMAT_PLAIN_UTF8, ELM_TEXT_FORMAT_MARKUP_UTF8 @@ -314,9 +314,7 @@ typedef Edje_Entry_Change_Info Elm_Entry_Change_Info; * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_entry_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_entry_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Sets the entry to single line mode. @@ -369,28 +367,6 @@ EAPI void elm_entry_password_set(Evas_Object *obj, Eina_Bool passw EAPI Eina_Bool elm_entry_password_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** - * This sets the text displayed within the entry to @p entry. - * - * @param obj The entry object - * @param entry The text to be displayed - * - * @deprecated Use elm_object_text_set() instead. - * @note Using this function bypasses text filters - */ -EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry) EINA_ARG_NONNULL(1); - -/** - * This returns the text currently shown in object @p entry. - * See also elm_entry_entry_set(). - * - * @param obj The entry object - * @return The currently displayed text or NULL on failure - * - * @deprecated Use elm_object_text_get() instead. - */ -EAPI const char *elm_entry_entry_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** * Appends @p entry to the text of the entry. * * Adds the text in @p entry to the end of any text already present in the @@ -1157,8 +1133,7 @@ struct _Elm_Entry_Filter_Limit_Size * valid ones and avoid half unicode characters making it in. * * This filter, like any others, does not apply when setting the entry text - * directly with elm_object_text_set() (or the deprecated - * elm_entry_entry_set()). + * directly with elm_object_text_set(). */ EAPI void elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text) EINA_ARG_NONNULL(1, 2, 3); @@ -1196,8 +1171,7 @@ struct _Elm_Entry_Filter_Accept_Set * raw markup text, so it can be used to remove formatting tags. * * This filter, like any others, does not apply when setting the entry text - * directly with elm_object_text_set() (or the deprecated - * elm_entry_entry_set()). + * directly with elm_object_text_set() */ EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text) EINA_ARG_NONNULL(1, 3); /** diff --git a/src/lib/elm_factory.h b/src/lib/elm_factory.h index e3b0fa4..dc7fb38 100644 --- a/src/lib/elm_factory.h +++ b/src/lib/elm_factory.h @@ -1,6 +1,4 @@ EAPI Evas_Object *elm_factory_add(Evas_Object *parent); -EINA_DEPRECATED EAPI void elm_factory_content_set(Evas_Object *obj, Evas_Object *content); -EINA_DEPRECATED EAPI Evas_Object *elm_factory_content_get(const Evas_Object *obj); EAPI void elm_factory_maxmin_mode_set(Evas_Object *obj, Eina_Bool enabled); EAPI Eina_Bool elm_factory_maxmin_mode_get(const Evas_Object *obj); EAPI void elm_factory_maxmin_reset_set(Evas_Object *obj); diff --git a/src/lib/elm_flipselector.h b/src/lib/elm_flipselector.h index 3085cd6..5b2438d 100644 --- a/src/lib/elm_flipselector.h +++ b/src/lib/elm_flipselector.h @@ -49,9 +49,7 @@ * * @ingroup Flipselector */ -EAPI Evas_Object * - elm_flipselector_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_flipselector_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Programmatically select the next item of a flip selector widget @@ -239,32 +237,6 @@ EAPI Eina_Bool elm_flipselector_item_selected_get(const Elm_Ob EAPI void elm_flipselector_item_del(Elm_Object_Item *it) EINA_ARG_NONNULL(1); /** - * Get the label of a given flip selector widget's item. - * - * @param it The item to get label from - * @return The text label of @p item or @c NULL, on errors - * - * @see elm_object_item_text_set() - * - * @deprecated see elm_object_item_text_get() instead - * @ingroup Flipselector - */ -EINA_DEPRECATED EAPI const char *elm_flipselector_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** - * Set the label of a given flip selector widget's item. - * - * @param it The item to set label on - * @param label The text label string, in UTF-8 encoding - * - * @see elm_object_item_text_get() - * - * @deprecated see elm_object_item_text_set() instead - * @ingroup Flipselector - */ -EINA_DEPRECATED EAPI void elm_flipselector_item_label_set(Elm_Object_Item *it, const char *label) EINA_ARG_NONNULL(1); - -/** * Gets the item before @p item in a flip selector widget's * internal list of items. * diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h index e5a7c80..1e1a051 100644 --- a/src/lib/elm_focus.h +++ b/src/lib/elm_focus.h @@ -107,37 +107,6 @@ EAPI Eina_Bool elm_object_focus_get(const Evas_Object *obj) EINA_ARG_ EAPI void elm_object_focus_set(Evas_Object *obj, Eina_Bool focus) EINA_ARG_NONNULL(1); /** - * Make a given Elementary object the focused one. - * - * @param obj The Elementary object to make focused. - * - * @note This object, if it can handle focus, will take the focus - * away from the one who had it previously and will, for now on, be - * the one receiving input events. - * - * @see elm_object_focus_get() - * @deprecated use elm_object_focus_set() instead. - * - * @ingroup Focus - */ -EINA_DEPRECATED EAPI void elm_object_focus(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Remove the focus from an Elementary object - * - * @param obj The Elementary to take focus from - * - * This removes the focus from @p obj, passing it back to the - * previous element in the focus chain list. - * - * @see elm_object_focus() and elm_object_focus_custom_chain_get() - * @deprecated use elm_object_focus_set() instead. - * - * @ingroup Focus - */ -EINA_DEPRECATED EAPI void elm_object_unfocus(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** * Set the ability for an Element object to be focused * * @param obj The Elementary object to operate on diff --git a/src/lib/elm_fonts.h b/src/lib/elm_fonts.h index b4795f2..aa55946 100644 --- a/src/lib/elm_fonts.h +++ b/src/lib/elm_fonts.h @@ -125,9 +125,7 @@ EAPI void elm_font_overlay_all_apply(void); * elm_font_fontconfig_name_get(), for one style only (single font * instance, not family). */ -EAPI Elm_Font_Properties * - elm_font_properties_get(const char *font) -EINA_ARG_NONNULL(1); +EAPI Elm_Font_Properties *elm_font_properties_get(const char *font) EINA_ARG_NONNULL(1); /** * Free font properties return by elm_font_properties_get(). diff --git a/src/lib/elm_frame.h b/src/lib/elm_frame.h index 4b5c247..d6e4d9c 100644 --- a/src/lib/elm_frame.h +++ b/src/lib/elm_frame.h @@ -35,68 +35,7 @@ * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_frame_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * @brief Set the frame label - * - * @param obj The frame object - * @param label The label of this frame object - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_frame_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * @brief Get the frame label - * - * @param obj The frame object - * - * @return The label of this frame objet or NULL if unable to get frame - * - * @deprecated use elm_object_text_get() instead. - */ -EINA_DEPRECATED EAPI const char *elm_frame_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Set the content of the frame widget - * - * Once the content object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_frame_content_unset() function. - * - * @param obj The frame object - * @param content The content will be filled in this frame object - * - * @deprecated use elm_object_content_set() instead. - */ -EINA_DEPRECATED EAPI void elm_frame_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); - -/** - * @brief Get the content of the frame widget - * - * Return the content object which is set for this widget - * - * @param obj The frame object - * @return The content that is being used - * - * @deprecated use elm_object_content_get() instead. - */ -EINA_DEPRECATED EAPI Evas_Object *elm_frame_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Unset the content of the frame widget - * - * Unparent and return the content object which was set for this widget - * - * @param obj The frame object - * @return The content that was being used - * - * @deprecated use elm_object_content_unset() instead. - */ -EINA_DEPRECATED EAPI Evas_Object *elm_frame_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_frame_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @} diff --git a/src/lib/elm_gen_common.h b/src/lib/elm_gen_common.h index c747b97..08cdc97 100644 --- a/src/lib/elm_gen_common.h +++ b/src/lib/elm_gen_common.h @@ -14,7 +14,7 @@ typedef struct Elm_Gen_Item_Type Elm_Gen_Item_Type; typedef struct Elm_Gen_Item_Tooltip Elm_Gen_Item_Tooltip; typedef struct _Widget_Data Widget_Data; -typedef enum _Elm_Genlist_Item_Scrollto_Type +typedef enum { ELM_GENLIST_ITEM_SCROLLTO_NONE = 0, /**< no scrollto */ ELM_GENLIST_ITEM_SCROLLTO_IN = (1 << 0), /**< show, bring in */ diff --git a/src/lib/elm_gengrid.h b/src/lib/elm_gengrid.h index 5f5a798..df7271a 100644 --- a/src/lib/elm_gengrid.h +++ b/src/lib/elm_gengrid.h @@ -287,9 +287,7 @@ struct _Elm_Gengrid_Item_Class * * @ingroup Gengrid */ -EAPI Evas_Object * - elm_gengrid_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_gengrid_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the size for the items of a given gengrid widget diff --git a/src/lib/elm_genlist.h b/src/lib/elm_genlist.h index 6ec5562..5353201 100644 --- a/src/lib/elm_genlist.h +++ b/src/lib/elm_genlist.h @@ -330,21 +330,19 @@ */ /** - * @enum _Elm_Genlist_Item_Flags - * @typedef Elm_Genlist_Item_Flags - * * Defines if the item is of any special type (has subitems or it's the * index of a group), or is just a simple item. * * @ingroup Genlist */ -typedef enum _Elm_Genlist_Item_Flags +typedef enum { ELM_GENLIST_ITEM_NONE = 0, /**< simple item */ ELM_GENLIST_ITEM_SUBITEMS = (1 << 0), /**< may expand and have child items */ ELM_GENLIST_ITEM_GROUP = (1 << 1) /**< index of a group of items */ } Elm_Genlist_Item_Flags; -typedef enum _Elm_Genlist_Item_Field_Flags + +typedef enum { ELM_GENLIST_ITEM_FIELD_ALL = 0, ELM_GENLIST_ITEM_FIELD_LABEL = (1 << 0), @@ -428,9 +426,7 @@ struct _Elm_Genlist_Item_Class * * @ingroup Genlist */ -EAPI Evas_Object * - elm_genlist_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_genlist_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Remove all items from a given genlist widget. @@ -494,7 +490,6 @@ EAPI Eina_Bool elm_genlist_multi_select_get(const Evas_Objec * @ingroup Genlist */ EAPI void elm_genlist_horizontal_set(Evas_Object *obj, Elm_List_Mode mode) EINA_ARG_NONNULL(1); -EINA_DEPRECATED EAPI void elm_genlist_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode) EINA_ARG_NONNULL(1); /** * Gets the horizontal stretching mode. @@ -508,7 +503,6 @@ EINA_DEPRECATED EAPI void elm_genlist_horizontal_mode_set(Evas_Object * * @ingroup Genlist */ EAPI Elm_List_Mode elm_genlist_horizontal_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); -EINA_DEPRECATED EAPI Elm_List_Mode elm_genlist_horizontal_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Set the always select mode. @@ -1437,7 +1431,6 @@ EAPI void elm_genlist_item_data_set(Elm_Genlist_Item *i * @ingroup Genlist */ EAPI void elm_genlist_item_contents_orphan(Elm_Genlist_Item *it) EINA_ARG_NONNULL(1); -EINA_DEPRECATED EAPI void elm_genlist_item_icons_orphan(Elm_Genlist_Item *it) EINA_ARG_NONNULL(1); /** * Get the real Evas object created to implement the view of a diff --git a/src/lib/elm_gesture_layer.h b/src/lib/elm_gesture_layer.h index 08ff953..0c1eb7e 100644 --- a/src/lib/elm_gesture_layer.h +++ b/src/lib/elm_gesture_layer.h @@ -56,11 +56,10 @@ */ /** - * @enum _Elm_Gesture_Types * Enum of supported gesture types. * @ingroup Elm_Gesture_Layer */ -enum _Elm_Gesture_Types +typedef enum { ELM_GESTURE_FIRST = 0, @@ -78,35 +77,21 @@ enum _Elm_Gesture_Types ELM_GESTURE_ROTATE, /**< Rotate */ ELM_GESTURE_LAST -}; - -/** - * @typedef Elm_Gesture_Types - * gesture types enum - * @ingroup Elm_Gesture_Layer - */ -typedef enum _Elm_Gesture_Types Elm_Gesture_Types; +} Elm_Gesture_Types; /** * @enum _Elm_Gesture_State * Enum of gesture states. * @ingroup Elm_Gesture_Layer */ -enum _Elm_Gesture_State +typedef enum { ELM_GESTURE_STATE_UNDEFINED = -1, /**< Gesture not STARTed */ ELM_GESTURE_STATE_START, /**< Gesture STARTed */ ELM_GESTURE_STATE_MOVE, /**< Gesture is ongoing */ ELM_GESTURE_STATE_END, /**< Gesture completed */ ELM_GESTURE_STATE_ABORT /**< Onging gesture was ABORTed */ -}; - -/** - * @typedef Elm_Gesture_State - * gesture states enum - * @ingroup Elm_Gesture_Layer - */ -typedef enum _Elm_Gesture_State Elm_Gesture_State; +} Elm_Gesture_State; /** * @struct _Elm_Gesture_Taps_Info @@ -247,9 +232,7 @@ typedef Evas_Event_Flags (*Elm_Gesture_Event_Cb)(void *data, void *event_info); * * @ingroup Elm_Gesture_Layer */ -EAPI void - elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Types idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data) -EINA_ARG_NONNULL(1); +EAPI void elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Types idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data) EINA_ARG_NONNULL(1); /** * Call this function to get repeat-events settings. diff --git a/src/lib/elm_glview.h b/src/lib/elm_glview.h index e7f6353..b97218a 100644 --- a/src/lib/elm_glview.h +++ b/src/lib/elm_glview.h @@ -10,7 +10,7 @@ typedef void (*Elm_GLView_Func_Cb)(Evas_Object *obj); -typedef enum _Elm_GLView_Mode +typedef enum { ELM_GLVIEW_ALPHA = 1, ELM_GLVIEW_DEPTH = 2, @@ -22,13 +22,13 @@ typedef enum _Elm_GLView_Mode * * @note Default is ELM_GLVIEW_RESIZE_POLICY_RECREATE */ -typedef enum _Elm_GLView_Resize_Policy +typedef enum { ELM_GLVIEW_RESIZE_POLICY_RECREATE = 1, /**< Resize the internal surface along with the image */ ELM_GLVIEW_RESIZE_POLICY_SCALE = 2 /**< Only reize the internal image and not the surface */ } Elm_GLView_Resize_Policy; -typedef enum _Elm_GLView_Render_Policy +typedef enum { ELM_GLVIEW_RENDER_POLICY_ON_DEMAND = 1, /**< Render only when there is a need for redrawing */ ELM_GLVIEW_RENDER_POLICY_ALWAYS = 2 /**< Render always even when it is not visible */ @@ -42,9 +42,7 @@ typedef enum _Elm_GLView_Render_Policy * * @ingroup GLView */ -EAPI Evas_Object * - elm_glview_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_glview_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Sets the size of the glview diff --git a/src/lib/elm_hover.h b/src/lib/elm_hover.h index ff12b31..d674687 100644 --- a/src/lib/elm_hover.h +++ b/src/lib/elm_hover.h @@ -44,7 +44,7 @@ * * @{ */ -typedef enum _Elm_Hover_Axis +typedef enum { ELM_HOVER_AXIS_NONE, /**< ELM_HOVER_AXIS_NONE -- no prefered orientation */ ELM_HOVER_AXIS_HORIZONTAL, /**< ELM_HOVER_AXIS_HORIZONTAL -- horizontal */ @@ -58,9 +58,7 @@ typedef enum _Elm_Hover_Axis * @param parent The parent object * @return The hover object or NULL if one could not be created */ -EAPI Evas_Object * - elm_hover_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_hover_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Sets the target object for the hover. diff --git a/src/lib/elm_icon.h b/src/lib/elm_icon.h index 23fdb9f..e03836e 100644 --- a/src/lib/elm_icon.h +++ b/src/lib/elm_icon.h @@ -72,7 +72,7 @@ * @{ */ -typedef enum _Elm_Icon_Type +typedef enum { ELM_ICON_NONE, ELM_ICON_FILE, @@ -88,7 +88,7 @@ typedef enum _Elm_Icon_Type * * @ingroup Icon */ -typedef enum _Elm_Icon_Lookup_Order +typedef enum { ELM_ICON_LOOKUP_FDO_THEME, /**< icon look up order: freedesktop, theme */ ELM_ICON_LOOKUP_THEME_FDO, /**< icon look up order: theme, freedesktop */ @@ -106,9 +106,7 @@ typedef enum _Elm_Icon_Lookup_Order * * @ingroup Icon */ -EAPI Evas_Object * - elm_icon_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_icon_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the file that will be used as icon. diff --git a/src/lib/elm_image.h b/src/lib/elm_image.h index c24aa8f..be1d2b0 100644 --- a/src/lib/elm_image.h +++ b/src/lib/elm_image.h @@ -31,9 +31,6 @@ */ /** - * @enum _Elm_Image_Orient - * @typedef Elm_Image_Orient - * * Possible orientation options for elm_image_orient_set(). * * @image html elm_image_orient_set.png @@ -41,22 +38,13 @@ * * @ingroup Image */ -typedef enum _Elm_Image_Orient +typedef enum { ELM_IMAGE_ORIENT_NONE = 0, /**< no orientation change */ ELM_IMAGE_ORIENT_0 = 0, /**< no orientation change */ ELM_IMAGE_ROTATE_90 = 1, /**< rotate 90 degrees clockwise */ ELM_IMAGE_ROTATE_180 = 2, /**< rotate 180 degrees clockwise */ ELM_IMAGE_ROTATE_270 = 3, /**< rotate 90 degrees counter-clockwise (i.e. 270 degrees clockwise) */ - // XXX: remove - /*EINA_DEPRECATED */ ELM_IMAGE_ROTATE_90_CW = 1, - /**< rotate 90 degrees clockwise */ - // XXX: remove - /*EINA_DEPRECATED */ ELM_IMAGE_ROTATE_180_CW = 2, - /**< rotate 180 degrees clockwise */ - // XXX: remove - /*EINA_DEPRECATED */ ELM_IMAGE_ROTATE_90_CCW = 3, - /**< rotate 90 degrees counter-clockwise (i.e. 270 degrees clockwise) */ ELM_IMAGE_FLIP_HORIZONTAL = 4, /**< flip image horizontally */ ELM_IMAGE_FLIP_VERTICAL = 5, /**< flip image vertically */ ELM_IMAGE_FLIP_TRANSPOSE = 6, /**< flip the image along the y = (width - x) line (bottom-left to top-right) */ @@ -73,9 +61,7 @@ typedef enum _Elm_Image_Orient * * @ingroup Image */ -EAPI Evas_Object * - elm_image_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_image_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the file that will be used as image. diff --git a/src/lib/elm_index.h b/src/lib/elm_index.h index f9426ef..0010718 100644 --- a/src/lib/elm_index.h +++ b/src/lib/elm_index.h @@ -60,9 +60,7 @@ * * @ingroup Index */ -EAPI Evas_Object * - elm_index_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_index_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set whether a given index widget is or not visible, @@ -289,35 +287,6 @@ EAPI void elm_index_item_clear(Evas_Object *obj) EINA_ARG_NONNU EAPI void elm_index_item_go(Evas_Object *obj, int level) EINA_ARG_NONNULL(1); /** - * Return the data associated with a given index widget item - * - * @param it The index widget item handle - * @return The data associated with @p it - * - * @see elm_index_item_data_set() - * @deprecated Use elm_object_item_data_get() instead - * - * @ingroup Index - */ -EINA_DEPRECATED EAPI void *elm_index_item_data_get(const Elm_Object_Item *item) EINA_ARG_NONNULL(1); - -/** - * Set the data associated with a given index widget item - * - * @param it The index widget item handle - * @param data The new data pointer to set to @p it - * - * This sets new item data on @p it. - * - * @warning The old data pointer won't be touched by this function, so - * the user had better to free that old data himself/herself. - * - * @deprecated Use elm_object_item_data_set() instead - * @ingroup Index - */ -EINA_DEPRECATED EAPI void elm_index_item_data_set(Elm_Object_Item *it, const void *data) EINA_ARG_NONNULL(1); - -/** * Set the function to be called when a given index widget item is freed. * * @param it The item to set the callback on diff --git a/src/lib/elm_label.h b/src/lib/elm_label.h index fc8d969..96227e8 100644 --- a/src/lib/elm_label.h +++ b/src/lib/elm_label.h @@ -37,27 +37,7 @@ * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_label_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * @brief Set the label on the label object - * - * @param obj The label object - * @param label The label will be used on the label object - * @deprecated See elm_object_text_set() - */ -EINA_DEPRECATED EAPI void elm_label_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * @brief Get the label used on the label object - * - * @param obj The label object - * @return The string inside the label - * @deprecated See elm_object_text_get() - */ -EINA_DEPRECATED EAPI const char *elm_label_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_label_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Set the wrapping behavior of the label diff --git a/src/lib/elm_layout.h b/src/lib/elm_layout.h index 4251806..cff0f9d 100644 --- a/src/lib/elm_layout.h +++ b/src/lib/elm_layout.h @@ -152,9 +152,7 @@ * * @ingroup Layout */ -EAPI Evas_Object * - elm_layout_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_layout_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the file that will be used as layout @@ -184,86 +182,6 @@ EAPI Eina_Bool elm_layout_file_set(Evas_Object *obj, const ch EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, const char *style) EINA_ARG_NONNULL(1); /** - * Set the layout content. - * - * @param obj The layout object - * @param swallow The swallow part name in the edje file - * @param content The child that will be added in this layout object - * - * Once the content object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_object_part_content_unset() function. - * - * @note In an Edje theme, the part used as a content container is called @c - * SWALLOW. This is why the parameter name is called @p swallow, but it is - * expected to be a part name just like the second parameter of - * elm_layout_box_append(). - * - * @see elm_layout_box_append() - * @see elm_object_part_content_get() - * @see elm_object_part_content_unset() - * @see @ref secBox - * @deprecated use elm_object_part_content_set() instead - * - * @ingroup Layout - */ -EINA_DEPRECATED EAPI void elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) EINA_ARG_NONNULL(1); - -/** - * Get the child object in the given content part. - * - * @param obj The layout object - * @param swallow The SWALLOW part to get its content - * - * @return The swallowed object or NULL if none or an error occurred - * - * @deprecated use elm_object_part_content_get() instead - * - * @ingroup Layout - */ -EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1); - -/** - * Unset the layout content. - * - * @param obj The layout object - * @param swallow The swallow part name in the edje file - * @return The content that was being used - * - * Unparent and return the content object which was set for this part. - * - * @deprecated use elm_object_part_content_unset() instead - * - * @ingroup Layout - */ -EINA_DEPRECATED EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow) EINA_ARG_NONNULL(1); - -/** - * Set the text of the given part - * - * @param obj The layout object - * @param part The TEXT part where to set the text - * @param text The text to set - * - * @ingroup Layout - * @deprecated use elm_object_part_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_layout_text_set(Evas_Object *obj, const char *part, const char *text) EINA_ARG_NONNULL(1); - -/** - * Get the text set in the given part - * - * @param obj The layout object - * @param part The TEXT part to retrieve the text off - * - * @return The text set in @p part - * - * @ingroup Layout - * @deprecated use elm_object_part_text_get() instead. - */ -EINA_DEPRECATED EAPI const char *elm_layout_text_get(const Evas_Object *obj, const char *part) EINA_ARG_NONNULL(1); - -/** * Append child to layout box part. * * @param obj the layout object @@ -692,28 +610,6 @@ EAPI Eina_Bool elm_layout_part_cursor_engine_only_get(const E #define elm_layout_end_get(_ly) \ elm_object_part_content_get((_ly), "elm.swallow.end") -/** - * @def elm_layout_label_set - * Convienience macro to set the label in a layout that follows the - * Elementary naming convention for its parts. - * - * @ingroup Layout - * @deprecated use elm_object_text_set() instead. - */ -#define elm_layout_label_set(_ly, _txt) \ - elm_layout_text_set((_ly), "elm.text", (_txt)) - -/** - * @def elm_layout_label_get - * Convenience macro to get the label in a layout that follows the - * Elementary naming convention for its parts. - * - * @ingroup Layout - * @deprecated use elm_object_text_set() instead. - */ -#define elm_layout_label_get(_ly) \ - elm_layout_text_get((_ly), "elm.text") - /* smart callbacks called: * "theme,changed" - when elm theme is changed. */ diff --git a/src/lib/elm_list.h b/src/lib/elm_list.h index a290988..de50563 100644 --- a/src/lib/elm_list.h +++ b/src/lib/elm_list.h @@ -61,7 +61,7 @@ * * @ingroup List */ -typedef enum _Elm_List_Mode +typedef enum { ELM_LIST_COMPRESS = 0, /**< Won't set any of its size hints to inform how a possible container should resize it. Then, if it's not created as a "resize object", it might end with zero dimensions. The list will respect the container's geometry and, if any of its items won't fit into its transverse axis, one won't be able to scroll it in that direction. */ ELM_LIST_SCROLL, /**< Default value. Won't set any of its size hints to inform how a possible container should resize it. Then, if it's not created as a "resize object", it might end with zero dimensions. The list will respect the container's geometry and, if any of its items won't fit into its transverse axis, one will be able to scroll it in that direction (large items will get cropped). */ @@ -83,9 +83,7 @@ typedef struct _Elm_List_Item Elm_List_Item; /**< Item of Elm_List. Sub-type * * @ingroup List */ -EAPI Evas_Object * - elm_list_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_list_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Starts the list. @@ -854,7 +852,6 @@ EAPI void elm_list_item_end_set(Elm_List_Item *item, Eva * @ingroup List */ EAPI Evas_Object *elm_list_item_object_get(const Elm_List_Item *item) EINA_ARG_NONNULL(1); -EINA_DEPRECATED EAPI Evas_Object *elm_list_item_base_get(const Elm_List_Item *item) EINA_ARG_NONNULL(1); /** * Get the label of item. diff --git a/src/lib/elm_map.h b/src/lib/elm_map.h index 48e4ea3..dbf4313 100644 --- a/src/lib/elm_map.h +++ b/src/lib/elm_map.h @@ -65,9 +65,6 @@ */ /** - * @enum _Elm_Map_Zoom_Mode - * @typedef Elm_Map_Zoom_Mode - * * Set map's zoom behavior. It can be set to manual or automatic. * * Default value is #ELM_MAP_ZOOM_MODE_MANUAL. @@ -82,7 +79,7 @@ * * @ingroup Map */ -typedef enum _Elm_Map_Zoom_Mode +typedef enum { ELM_MAP_ZOOM_MODE_MANUAL, /**< Zoom controlled manually by elm_map_zoom_set(). It's set by default. */ ELM_MAP_ZOOM_MODE_AUTO_FIT, /**< Zoom until map fits inside the scroll frame with no pixels outside this area. */ @@ -91,9 +88,6 @@ typedef enum _Elm_Map_Zoom_Mode } Elm_Map_Zoom_Mode; /** - * @enum _Elm_Map_Route_Sources - * @typedef Elm_Map_Route_Sources - * * Set route service to be used. By default used source is * #ELM_MAP_ROUTE_SOURCE_YOURS. * @@ -102,7 +96,7 @@ typedef enum _Elm_Map_Zoom_Mode * * @ingroup Map */ -typedef enum _Elm_Map_Route_Sources +typedef enum { ELM_MAP_ROUTE_SOURCE_YOURS, /**< Routing service http://www.yournavigation.org/ . Set by default.*/ ELM_MAP_ROUTE_SOURCE_MONAV, /**< MoNav offers exact routing without heuristic assumptions. Its routing core is based on Contraction Hierarchies. It's not working with Map yet. */ @@ -110,23 +104,20 @@ typedef enum _Elm_Map_Route_Sources ELM_MAP_ROUTE_SOURCE_LAST } Elm_Map_Route_Sources; -typedef enum _Elm_Map_Name_Sources +typedef enum { ELM_MAP_NAME_SOURCE_NOMINATIM, ELM_MAP_NAME_SOURCE_LAST } Elm_Map_Name_Sources; /** - * @enum _Elm_Map_Route_Type - * @typedef Elm_Map_Route_Type - * * Set type of transport used on route. * * @see elm_map_route_add() * * @ingroup Map */ -typedef enum _Elm_Map_Route_Type +typedef enum { ELM_MAP_ROUTE_TYPE_MOTOCAR, /**< Route should consider an automobile will be used. */ ELM_MAP_ROUTE_TYPE_BICYCLE, /**< Route should consider a bicycle will be used by the user. */ @@ -135,23 +126,20 @@ typedef enum _Elm_Map_Route_Type } Elm_Map_Route_Type; /** - * @enum _Elm_Map_Route_Method - * @typedef Elm_Map_Route_Method - * * Set the routing method, what should be priorized, time or distance. * * @see elm_map_route_add() * * @ingroup Map */ -typedef enum _Elm_Map_Route_Method +typedef enum { ELM_MAP_ROUTE_METHOD_FASTEST, /**< Route should priorize time. */ ELM_MAP_ROUTE_METHOD_SHORTEST, /**< Route should priorize distance. */ ELM_MAP_ROUTE_METHOD_LAST } Elm_Map_Route_Method; -typedef enum _Elm_Map_Name_Method +typedef enum { ELM_MAP_NAME_METHOD_SEARCH, ELM_MAP_NAME_METHOD_REVERSE, @@ -190,9 +178,7 @@ typedef Eina_Bool (*ElmMapModuleCoordIntoGeoFunc)(const Evas_Ob * * @ingroup Map */ -EAPI Evas_Object * - elm_map_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_map_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the zoom level of the map. diff --git a/src/lib/elm_mapbuf.h b/src/lib/elm_mapbuf.h index 4522f0f..b786a83 100644 --- a/src/lib/elm_mapbuf.h +++ b/src/lib/elm_mapbuf.h @@ -37,59 +37,7 @@ * * @ingroup Mapbuf */ -EAPI Evas_Object * - elm_mapbuf_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the content of the mapbuf. - * - * @param obj The mapbuf object. - * @param content The content that will be filled in this mapbuf object. - * - * Once the content object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_mapbuf_content_unset() function. - * - * To enable map, elm_mapbuf_enabled_set() should be used. - * - * @deprecated use elm_object_content_set() instead - * - * @ingroup Mapbuf - */ -EINA_DEPRECATED EAPI void elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); - -/** - * Get the content of the mapbuf. - * - * @param obj The mapbuf object. - * @return The content that is being used. - * - * Return the content object which is set for this widget. - * - * @see elm_mapbuf_content_set() for details. - * - * @deprecated use elm_object_content_get() instead - * - * @ingroup Mapbuf - */ -EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Unset the content of the mapbuf. - * - * @param obj The mapbuf object. - * @return The content that was being used. - * - * Unparent and return the content object which was set for this widget. - * - * @see elm_mapbuf_content_set() for details. - * - * @deprecated use elm_object_content_unset() instead - * - * @ingroup Mapbuf - */ -EINA_DEPRECATED EAPI Evas_Object *elm_mapbuf_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_mapbuf_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Enable or disable the map. diff --git a/src/lib/elm_menu.h b/src/lib/elm_menu.h index fbd9e84..39dc98c 100644 --- a/src/lib/elm_menu.h +++ b/src/lib/elm_menu.h @@ -28,9 +28,7 @@ * @param parent The parent object. * @return The new object or NULL if it cannot be created. */ -EAPI Evas_Object * - elm_menu_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_menu_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Set the parent for the given menu widget @@ -121,28 +119,6 @@ EAPI Elm_Object_Item *elm_menu_item_add(Evas_Object *obj, Elm_Object EAPI Elm_Object_Item *elm_menu_item_add_object(Evas_Object *obj, Elm_Object_Item *parent, Evas_Object *subobj, Evas_Smart_Cb func, const void *data) EINA_ARG_NONNULL(1); /** - * @brief Set the label of a menu item - * - * @param it The menu item object. - * @param label The label to set for @p item - * - * @warning Don't use this funcion on items created with - * elm_menu_item_add_object() or elm_menu_item_separator_add(). - * - * @deprecated Use elm_object_item_text_set() instead - */ -EINA_DEPRECATED EAPI void elm_menu_item_label_set(Elm_Object_Item *it, const char *label) EINA_ARG_NONNULL(1); - -/** - * @brief Get the label of a menu item - * - * @param it The menu item object. - * @return The label of @p item - * @deprecated Use elm_object_item_text_get() instead - */ -EINA_DEPRECATED EAPI const char *elm_menu_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** * @brief Set the icon of a menu item to the standard icon with name @p icon * * @param it The menu item object. @@ -163,35 +139,6 @@ EAPI void elm_menu_item_object_icon_name_set(Elm_Object_ EAPI const char *elm_menu_item_object_icon_name_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); /** - * @brief Set the content object of a menu item - * - * @param it The menu item object - * @param The content object or NULL - * @return EINA_TRUE on success, else EINA_FALSE - * - * Use this function to change the object swallowed by a menu item, deleting - * any previously swallowed object. - * - * @deprecated Use elm_object_item_content_set() instead - */ -EINA_DEPRECATED EAPI Eina_Bool elm_menu_item_object_content_set(Elm_Object_Item *it, Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Get the content object of a menu item - * - * @param it The menu item object - * @return The content object or NULL - * @note If @p item was added with elm_menu_item_add_object, this - * function will return the object passed, else it will return the - * icon object. - * - * @see elm_menu_item_object_content_set() - * - * @deprecated Use elm_object_item_content_get() instead - */ -EINA_DEPRECATED EAPI Evas_Object *elm_menu_item_object_content_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** * @brief Set the selected state of @p item. * * @param it The menu item object. @@ -210,26 +157,6 @@ EAPI void elm_menu_item_selected_set(Elm_Object_Item *it EAPI Eina_Bool elm_menu_item_selected_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); /** - * @brief Set the disabled state of @p item. - * - * @param it The menu item object. - * @param disabled The enabled/disabled state of the item - * @deprecated Use elm_object_item_disabled_set() instead - */ -EINA_DEPRECATED EAPI void elm_menu_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) EINA_ARG_NONNULL(1); - -/** - * @brief Get the disabled state of @p item. - * - * @param it The menu item object. - * @return The enabled/disabled state of the item - * - * @see elm_menu_item_disabled_set() - * @deprecated Use elm_object_item_disabled_get() instead - */ -EINA_DEPRECATED EAPI Eina_Bool elm_menu_item_disabled_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** * @brief Add a separator item to menu @p obj under @p parent. * * @param obj The menu object @@ -271,28 +198,6 @@ EAPI void elm_menu_item_del(Elm_Object_Item *it) EINA_AR EAPI void elm_menu_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func) EINA_ARG_NONNULL(1); /** - * @brief Returns the data associated with menu item @p item. - * - * @param it The item - * @return The data associated with @p item or NULL if none was set. - * - * This is the data set with elm_menu_add() or elm_menu_item_data_set(). - * - * @deprecated Use elm_object_item_data_get() instead - */ -EINA_DEPRECATED EAPI void *elm_menu_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** - * @brief Sets the data to be associated with menu item @p item. - * - * @param it The item - * @param data The data to be associated with @p item - * - * @deprecated Use elm_object_item_data_set() instead - */ -EINA_DEPRECATED EAPI void elm_menu_item_data_set(Elm_Object_Item *it, const void *data) EINA_ARG_NONNULL(1); - -/** * @brief Returns a list of @p item's subitems. * * @param it The item diff --git a/src/lib/elm_mirroring.h b/src/lib/elm_mirroring.h index 5420e38..f752947 100644 --- a/src/lib/elm_mirroring.h +++ b/src/lib/elm_mirroring.h @@ -21,9 +21,7 @@ EAPI void elm_mirrored_set(Eina_Bool mirrored); * * @return EINA_TRUE if mirrored is set, EINA_FALSE otherwise */ -EAPI Eina_Bool - elm_object_mirrored_get(const Evas_Object *obj) -EINA_ARG_NONNULL(1); +EAPI Eina_Bool elm_object_mirrored_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Set the system mirrored mode. This determines the default mirrored mode diff --git a/src/lib/elm_notify.h b/src/lib/elm_notify.h index 3dcf4dc..a88de13 100644 --- a/src/lib/elm_notify.h +++ b/src/lib/elm_notify.h @@ -29,7 +29,7 @@ * and in conjunction with elm_notify_orient_get() to know where the notify * is appearing. */ -typedef enum _Elm_Notify_Orient +typedef enum { ELM_NOTIFY_ORIENT_TOP, /**< Notify should appear in the top of parent, default */ ELM_NOTIFY_ORIENT_CENTER, /**< Notify should appear in the center of parent */ @@ -49,50 +49,7 @@ typedef enum _Elm_Notify_Orient * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_notify_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * @brief Set the content of the notify widget - * - * @param obj The notify object - * @param content The content will be filled in this notify object - * - * Once the content object is set, a previously set one will be deleted. If - * you want to keep that old content object, use the - * elm_notify_content_unset() function. - * - * @deprecated use elm_object_content_set() instead - * - */ -EINA_DEPRECATED EAPI void elm_notify_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); - -/** - * @brief Unset the content of the notify widget - * - * @param obj The notify object - * @return The content that was being used - * - * Unparent and return the content object which was set for this widget - * - * @see elm_notify_content_set() - * @deprecated use elm_object_content_unset() instead - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_notify_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Return the content of the notify widget - * - * @param obj The notify object - * @return The content that is being used - * - * @see elm_notify_content_set() - * @deprecated use elm_object_content_get() instead - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_notify_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_notify_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Set the notify parent diff --git a/src/lib/elm_object.h b/src/lib/elm_object.h index d8af24c..186a773 100644 --- a/src/lib/elm_object.h +++ b/src/lib/elm_object.h @@ -6,19 +6,6 @@ * @param label The new text of the label * * @note Elementary objects may have many labels (e.g. Action Slider) - * @deprecated Use elm_object_part_text_set() instead. - * @ingroup General - */ -EINA_DEPRECATED EAPI void elm_object_text_part_set(Evas_Object *obj, const char *part, const char *label); - -/** - * Set a label of an object - * - * @param obj The Elementary object - * @param part The text part name to set (NULL for the default label) - * @param label The new text of the label - * - * @note Elementary objects may have many labels (e.g. Action Slider) * * @ingroup General */ @@ -34,19 +21,6 @@ EAPI void elm_object_part_text_set(Evas_Object *obj, con * @return text of the label or NULL for any error * * @note Elementary objects may have many labels (e.g. Action Slider) - * @deprecated Use elm_object_part_text_get() instead. - * @ingroup General - */ -EINA_DEPRECATED EAPI const char *elm_object_text_part_get(const Evas_Object *obj, const char *part); - -/** - * Get a label of an object - * - * @param obj The Elementary object - * @param part The text part name to get (NULL for the default label) - * @return text of the label or NULL for any error - * - * @note Elementary objects may have many labels (e.g. Action Slider) * * @ingroup General */ @@ -62,19 +36,6 @@ EAPI const char *elm_object_part_text_get(const Evas_Object *ob * @param content The new content of the object * * @note Elementary objects may have many contents - * @deprecated Use elm_object_part_content_set instead. - * @ingroup General - */ -EINA_DEPRECATED EAPI void elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content); - -/** - * Set a content of an object - * - * @param obj The Elementary object - * @param part The content part name to set (NULL for the default content) - * @param content The new content of the object - * - * @note Elementary objects may have many contents * * @ingroup General */ @@ -90,19 +51,6 @@ EAPI void elm_object_part_content_set(Evas_Object *obj, * @return content of the object or NULL for any error * * @note Elementary objects may have many contents - * @deprecated Use elm_object_part_content_get instead. - * @ingroup General - */ -EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *part); - -/** - * Get a content of an object - * - * @param obj The Elementary object - * @param part The content part name to get (NULL for the default content) - * @return content of the object or NULL for any error - * - * @note Elementary objects may have many contents * * @ingroup General */ @@ -117,18 +65,6 @@ EAPI Evas_Object *elm_object_part_content_get(const Evas_Object * @param part The content part name to unset (NULL for the default content) * * @note Elementary objects may have many contents - * @deprecated Use elm_object_part_content_unset instead. - * @ingroup General - */ -EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *part); - -/** - * Unset a content of an object - * - * @param obj The Elementary object - * @param part The content part name to unset (NULL for the default content) - * - * @note Elementary objects may have many contents * * @ingroup General */ @@ -196,9 +132,7 @@ EAPI Evas_Object *elm_object_name_find(const Evas_Object *obj, c * * @ingroup Styles */ -EAPI void - elm_object_style_set(Evas_Object *obj, const char *style) -EINA_ARG_NONNULL(1); +EAPI void elm_object_style_set(Evas_Object *obj, const char *style) EINA_ARG_NONNULL(1); /** * Get the style used by the widget diff --git a/src/lib/elm_object_item.h b/src/lib/elm_object_item.h index 16aa882..686efa6 100644 --- a/src/lib/elm_object_item.h +++ b/src/lib/elm_object_item.h @@ -18,19 +18,6 @@ EAPI Evas_Object *elm_object_item_object_get(const Elm_Object_It * @param content The new content of the object item * * @note Elementary object items may have many contents - * @deprecated Use elm_object_item_part_content_set instead. - * @ingroup General - */ -EINA_DEPRECATED EAPI void elm_object_item_content_part_set(Elm_Object_Item *it, const char *part, Evas_Object *content); - -/** - * Set a content of an object item - * - * @param it The Elementary object item - * @param part The content part name to set (NULL for the default content) - * @param content The new content of the object item - * - * @note Elementary object items may have many contents * * @ingroup General */ @@ -46,19 +33,6 @@ EAPI void elm_object_item_part_content_set(Elm_Object_It * @return content of the object item or NULL for any error * * @note Elementary object items may have many contents - * @deprecated Use elm_object_item_part_content_get instead. - * @ingroup General - */ -EAPI Evas_Object *elm_object_item_content_part_get(const Elm_Object_Item *it, const char *part); - -/** - * Get a content of an object item - * - * @param it The Elementary object item - * @param part The content part name to unset (NULL for the default content) - * @return content of the object item or NULL for any error - * - * @note Elementary object items may have many contents * * @ingroup General */ @@ -73,18 +47,6 @@ EAPI Evas_Object *elm_object_item_part_content_get(const Elm_Obj * @param part The content part name to unset (NULL for the default content) * * @note Elementary object items may have many contents - * @deprecated Use elm_object_item_part_content_unset instead. - * @ingroup General - */ -EINA_DEPRECATED EAPI Evas_Object *elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part); - -/** - * Unset a content of an object item - * - * @param it The Elementary object item - * @param part The content part name to unset (NULL for the default content) - * - * @note Elementary object items may have many contents * * @ingroup General */ @@ -100,19 +62,6 @@ EAPI Evas_Object *elm_object_item_part_content_unset(Elm_Object_ * @param label The new text of the label * * @note Elementary object items may have many labels - * @deprecated Use elm_object_item_part_text_set instead. - * @ingroup General - */ -EINA_DEPRECATED EAPI void elm_object_item_text_part_set(Elm_Object_Item *it, const char *part, const char *label); - -/** - * Set a label of an object item - * - * @param it The Elementary object item - * @param part The text part name to set (NULL for the default label) - * @param label The new text of the label - * - * @note Elementary object items may have many labels * * @ingroup General */ @@ -128,18 +77,6 @@ EAPI void elm_object_item_part_text_set(Elm_Object_Item * @return text of the label or NULL for any error * * @note Elementary object items may have many labels - * @deprecated Use elm_object_item_part_text_get instead. - * @ingroup General - */ -EINA_DEPRECATED EAPI const char *elm_object_item_text_part_get(const Elm_Object_Item *it, const char *part); -/** - * Get a label of an object item - * - * @param it The Elementary object item - * @param part The text part name to get (NULL for the default label) - * @return text of the label or NULL for any error - * - * @note Elementary object items may have many labels * * @ingroup General */ diff --git a/src/lib/elm_pager.h b/src/lib/elm_pager.h index 28a3ce4..ac75c6f 100644 --- a/src/lib/elm_pager.h +++ b/src/lib/elm_pager.h @@ -53,9 +53,7 @@ * * @ingroup Pager */ -EAPI Evas_Object * - elm_pager_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_pager_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Push an object to the top of the pager stack (and show it). diff --git a/src/lib/elm_panel.h b/src/lib/elm_panel.h index 29378a5..2381416 100644 --- a/src/lib/elm_panel.h +++ b/src/lib/elm_panel.h @@ -18,7 +18,7 @@ * @ref tutorial_panel shows one way to use this widget. * @{ */ -typedef enum _Elm_Panel_Orient +typedef enum { ELM_PANEL_ORIENT_TOP, /**< Panel (dis)appears from the top */ ELM_PANEL_ORIENT_BOTTOM, /**< Not implemented */ @@ -33,9 +33,7 @@ typedef enum _Elm_Panel_Orient * * @return The panel object, or NULL on failure */ -EAPI Evas_Object * - elm_panel_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_panel_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Sets the orientation of the panel @@ -59,51 +57,6 @@ EAPI void elm_panel_orient_set(Evas_Object *obj, Elm_Pan EAPI Elm_Panel_Orient elm_panel_orient_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** - * @brief Set the content of the panel. - * - * @param obj The panel object - * @param content The panel content - * - * Once the content object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_panel_content_unset() function. - * - * @deprecated use elm_object_content_set() instead - * - */ -EINA_DEPRECATED EAPI void elm_panel_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); - -/** - * @brief Get the content of the panel. - * - * @param obj The panel object - * @return The content that is being used - * - * Return the content object which is set for this widget. - * - * @see elm_panel_content_set() - * - * @deprecated use elm_object_content_get() instead - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_panel_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Unset the content of the panel. - * - * @param obj The panel object - * @return The content that was being used - * - * Unparent and return the content object which was set for this widget. - * - * @see elm_panel_content_set() - * - * @deprecated use elm_object_content_unset() instead - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_panel_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** * @brief Set the state of the panel. * * @param obj The panel object diff --git a/src/lib/elm_panes.h b/src/lib/elm_panes.h index dbb2453..5a3f224 100644 --- a/src/lib/elm_panes.h +++ b/src/lib/elm_panes.h @@ -50,120 +50,7 @@ * * @ingroup Panes */ -EAPI Evas_Object * - elm_panes_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the left content of the panes widget. - * - * @param obj The panes object. - * @param content The new left content object. - * - * Once the content object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_panes_content_left_unset() function. - * - * If panes is displayed vertically, left content will be displayed at - * top. - * - * @see elm_panes_content_left_get() - * @see elm_panes_content_right_set() to set content on the other side. - * - * @deprecated use elm_object_part_content_set() instead - * - * @ingroup Panes - */ -EINA_DEPRECATED EAPI void elm_panes_content_left_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); - -/** - * Set the right content of the panes widget. - * - * @param obj The panes object. - * @param content The new right content object. - * - * Once the content object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_panes_content_right_unset() function. - * - * If panes is displayed vertically, left content will be displayed at - * bottom. - * - * @see elm_panes_content_right_get() - * @see elm_panes_content_left_set() to set content on the other side. - * - * @deprecated use elm_object_part_content_set() instead - * - * @ingroup Panes - */ -EINA_DEPRECATED EAPI void elm_panes_content_right_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); - -/** - * Get the left content of the panes. - * - * @param obj The panes object. - * @return The left content object that is being used. - * - * Return the left content object which is set for this widget. - * - * @see elm_panes_content_left_set() for details. - * - * @deprecated use elm_object_part_content_get() instead - * - * @ingroup Panes - */ -EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Get the right content of the panes. - * - * @param obj The panes object - * @return The right content object that is being used - * - * Return the right content object which is set for this widget. - * - * @see elm_panes_content_right_set() for details. - * - * @deprecated use elm_object_part_content_get() instead - * - * @ingroup Panes - */ -EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_right_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Unset the left content used for the panes. - * - * @param obj The panes object. - * @return The left content object that was being used. - * - * Unparent and return the left content object which was set for this widget. - * - * @see elm_panes_content_left_set() for details. - * @see elm_panes_content_left_get(). - * - * @deprecated use elm_object_part_content_unset() instead - * - * @ingroup Panes - */ -EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_left_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Unset the right content used for the panes. - * - * @param obj The panes object. - * @return The right content object that was being used. - * - * Unparent and return the right content object which was set for this - * widget. - * - * @see elm_panes_content_right_set() for details. - * @see elm_panes_content_right_get(). - * - * @deprecated use elm_object_part_content_unset() instead - * - * @ingroup Panes - */ -EINA_DEPRECATED EAPI Evas_Object *elm_panes_content_right_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_panes_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Get the size proportion of panes widget's left side. diff --git a/src/lib/elm_photo.h b/src/lib/elm_photo.h index bab4f9a..321e320 100644 --- a/src/lib/elm_photo.h +++ b/src/lib/elm_photo.h @@ -21,9 +21,7 @@ * * @ingroup Photo */ -EAPI Evas_Object * - elm_photo_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_photo_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the file that will be used as photo diff --git a/src/lib/elm_photocam.h b/src/lib/elm_photocam.h index dca7051..b1b1fbc 100644 --- a/src/lib/elm_photocam.h +++ b/src/lib/elm_photocam.h @@ -40,7 +40,7 @@ /** * @brief Types of zoom available. */ -typedef enum _Elm_Photocam_Zoom_Mode +typedef enum { ELM_PHOTOCAM_ZOOM_MODE_MANUAL = 0, /**< Zoom controlled normally by elm_photocam_zoom_set */ ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT, /**< Zoom until photo fits in photocam */ @@ -55,9 +55,7 @@ typedef enum _Elm_Photocam_Zoom_Mode * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_photocam_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_photocam_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Set the photo file to be shown diff --git a/src/lib/elm_progressbar.h b/src/lib/elm_progressbar.h index 4468410..25d9c09 100644 --- a/src/lib/elm_progressbar.h +++ b/src/lib/elm_progressbar.h @@ -50,9 +50,7 @@ * * @ingroup Progressbar */ -EAPI Evas_Object * - elm_progressbar_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_progressbar_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set whether a given progress bar widget is at "pulsing mode" or @@ -139,78 +137,6 @@ EAPI void elm_progressbar_value_set(Evas_Object *obj, do EAPI double elm_progressbar_value_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** - * Set the label of a given progress bar widget - * - * @param obj The progress bar object - * @param label The text label string, in UTF-8 - * - * @ingroup Progressbar - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_progressbar_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * Get the label of a given progress bar widget - * - * @param obj The progressbar object - * @return The text label string, in UTF-8 - * - * @ingroup Progressbar - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_progressbar_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Set the icon object of a given progress bar widget - * - * @param obj The progress bar object - * @param icon The icon object - * - * Use this call to decorate @p obj with an icon next to it. - * - * @note Once the icon object is set, a previously set one will be - * deleted. If you want to keep that old content object, use the - * elm_progressbar_icon_unset() function. - * - * @see elm_progressbar_icon_get() - * @deprecated use elm_object_part_content_set() instead. - * - * @ingroup Progressbar - */ -EINA_DEPRECATED EAPI void elm_progressbar_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); - -/** - * Retrieve the icon object set for a given progress bar widget - * - * @param obj The progress bar object - * @return The icon object's handle, if @p obj had one set, or @c NULL, - * otherwise (and on errors) - * - * @see elm_progressbar_icon_set() for more details - * @deprecated use elm_object_part_content_get() instead. - * - * @ingroup Progressbar - */ -EINA_DEPRECATED EAPI Evas_Object *elm_progressbar_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Unset an icon set on a given progress bar widget - * - * @param obj The progress bar object - * @return The icon object that was being used, if any was set, or - * @c NULL, otherwise (and on errors) - * - * This call will unparent and return the icon object which was set - * for this widget, previously, on success. - * - * @see elm_progressbar_icon_set() for more details - * @deprecated use elm_object_part_content_unset() instead. - * - * @ingroup Progressbar - */ -EINA_DEPRECATED EAPI Evas_Object *elm_progressbar_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** * Set the (exact) length of the bar region of a given progress bar * widget * diff --git a/src/lib/elm_radio.h b/src/lib/elm_radio.h index 7135307..805c8be 100644 --- a/src/lib/elm_radio.h +++ b/src/lib/elm_radio.h @@ -39,71 +39,7 @@ * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_radio_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * @brief Set the text label of the radio object - * - * @param obj The radio object - * @param label The text label string in UTF-8 - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_radio_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * @brief Get the text label of the radio object - * - * @param obj The radio object - * @return The text label string in UTF-8 - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_radio_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Set the icon object of the radio object - * - * @param obj The radio object - * @param icon The icon object - * - * Once the icon object is set, a previously set one will be deleted. If you - * want to keep that old content object, use the elm_radio_icon_unset() - * function. - * - * @deprecated use elm_object_part_content_set() instead. - * - */ -EINA_DEPRECATED EAPI void elm_radio_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); - -/** - * @brief Get the icon object of the radio object - * - * @param obj The radio object - * @return The icon object - * - * @see elm_radio_icon_set() - * - * @deprecated use elm_object_part_content_get() instead. - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_radio_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Unset the icon used for the radio object - * - * @param obj The radio object - * @return The icon object that was being used - * - * Unparent and return the icon object which was set for this widget. - * - * @see elm_radio_icon_set() - * @deprecated use elm_object_part_content_unset() instead. - * - */ -EINA_DEPRECATED EAPI Evas_Object *elm_radio_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_radio_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Add this radio to a group of other radio objects diff --git a/src/lib/elm_scale.h b/src/lib/elm_scale.h index b12dcfd..d6ab837 100644 --- a/src/lib/elm_scale.h +++ b/src/lib/elm_scale.h @@ -55,9 +55,7 @@ EAPI void elm_scale_all_set(double scale); * * @ingroup Scaling */ -EAPI void - elm_object_scale_set(Evas_Object *obj, double scale) -EINA_ARG_NONNULL(1); +EAPI void elm_object_scale_set(Evas_Object *obj, double scale) EINA_ARG_NONNULL(1); /** * Get the scaling factor for a given Elementary object diff --git a/src/lib/elm_scroll.h b/src/lib/elm_scroll.h index d2b1b5d..b3a5cd8 100644 --- a/src/lib/elm_scroll.h +++ b/src/lib/elm_scroll.h @@ -27,9 +27,7 @@ * @param obj The object * @ingroup Scrollhints */ -EAPI void - elm_object_scroll_hold_push(Evas_Object *obj) -EINA_ARG_NONNULL(1); +EAPI void elm_object_scroll_hold_push(Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Pop the scroll hold by 1 diff --git a/src/lib/elm_scroller.h b/src/lib/elm_scroller.h index c4b92fd..dec925f 100644 --- a/src/lib/elm_scroller.h +++ b/src/lib/elm_scroller.h @@ -38,7 +38,7 @@ * * @see elm_scroller_policy_set() */ -typedef enum _Elm_Scroller_Policy +typedef enum { ELM_SCROLLER_POLICY_AUTO = 0, /**< Show scrollbars as needed */ ELM_SCROLLER_POLICY_ON, /**< Always show scrollbars */ @@ -52,48 +52,7 @@ typedef enum _Elm_Scroller_Policy * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_scroller_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * @brief Set the content of the scroller widget (the object to be scrolled around). - * - * @param obj The scroller object - * @param content The new content object - * - * Once the content object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_scroller_content_unset() function. - * @deprecated use elm_object_content_set() instead - */ -EINA_DEPRECATED EAPI void elm_scroller_content_set(Evas_Object *obj, Evas_Object *child) EINA_ARG_NONNULL(1); - -/** - * @brief Get the content of the scroller widget - * - * @param obj The slider object - * @return The content that is being used - * - * Return the content object which is set for this widget - * - * @see elm_scroller_content_set() - * @deprecated use elm_object_content_get() instead. - */ -EINA_DEPRECATED EAPI Evas_Object *elm_scroller_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * @brief Unset the content of the scroller widget - * - * @param obj The slider object - * @return The content that was being used - * - * Unparent and return the content object which was set for this widget - * - * @see elm_scroller_content_set() - * @deprecated use elm_object_content_unset() instead. - */ -EINA_DEPRECATED EAPI Evas_Object *elm_scroller_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_scroller_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Set custom theme elements for the scroller diff --git a/src/lib/elm_segment_control.h b/src/lib/elm_segment_control.h index e190b9d..94b683c 100644 --- a/src/lib/elm_segment_control.h +++ b/src/lib/elm_segment_control.h @@ -48,9 +48,7 @@ typedef struct _Elm_Segment_Item Elm_Segment_Item; /**< Item handle for a seg * * @ingroup SegmentControl */ -EAPI Evas_Object * - elm_segment_control_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_segment_control_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Append a new item to the segment control object. diff --git a/src/lib/elm_separator.h b/src/lib/elm_separator.h index 5f5204d..7ddca5c 100644 --- a/src/lib/elm_separator.h +++ b/src/lib/elm_separator.h @@ -15,9 +15,7 @@ * * @return The separator object, or NULL upon failure */ -EAPI Evas_Object * - elm_separator_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_separator_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Set the horizontal mode of a separator object * diff --git a/src/lib/elm_slider.h b/src/lib/elm_slider.h index 9d2e1d8..520396b 100644 --- a/src/lib/elm_slider.h +++ b/src/lib/elm_slider.h @@ -65,158 +65,7 @@ * * @ingroup Slider */ -EAPI Evas_Object * - elm_slider_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); - -/** - * Set the label of a given slider widget - * - * @param obj The progress bar object - * @param label The text label string, in UTF-8 - * - * @ingroup Slider - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_slider_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1); - -/** - * Get the label of a given slider widget - * - * @param obj The progressbar object - * @return The text label string, in UTF-8 - * - * @ingroup Slider - * @deprecated use elm_object_text_get() instead. - */ -EINA_DEPRECATED EAPI const char *elm_slider_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Set the icon object of the slider object. - * - * @param obj The slider object. - * @param icon The icon object. - * - * On horizontal mode, icon is placed at left, and on vertical mode, - * placed at top. - * - * @note Once the icon object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_slider_icon_unset() function. - * - * @warning If the object being set does not have minimum size hints set, - * it won't get properly displayed. - * - * @ingroup Slider - * @deprecated use elm_object_part_content_set() instead. - */ -EINA_DEPRECATED EAPI void elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1); - -/** - * Unset an icon set on a given slider widget. - * - * @param obj The slider object. - * @return The icon object that was being used, if any was set, or - * @c NULL, otherwise (and on errors). - * - * On horizontal mode, icon is placed at left, and on vertical mode, - * placed at top. - * - * This call will unparent and return the icon object which was set - * for this widget, previously, on success. - * - * @see elm_slider_icon_set() for more details - * @see elm_slider_icon_get() - * @deprecated use elm_object_part_content_unset() instead. - * - * @ingroup Slider - */ -EINA_DEPRECATED EAPI Evas_Object *elm_slider_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Retrieve the icon object set for a given slider widget. - * - * @param obj The slider object. - * @return The icon object's handle, if @p obj had one set, or @c NULL, - * otherwise (and on errors). - * - * On horizontal mode, icon is placed at left, and on vertical mode, - * placed at top. - * - * @see elm_slider_icon_set() for more details - * @see elm_slider_icon_unset() - * - * @deprecated use elm_object_part_content_get() instead. - * - * @ingroup Slider - */ -EINA_DEPRECATED EAPI Evas_Object *elm_slider_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Set the end object of the slider object. - * - * @param obj The slider object. - * @param end The end object. - * - * On horizontal mode, end is placed at left, and on vertical mode, - * placed at bottom. - * - * @note Once the icon object is set, a previously set one will be deleted. - * If you want to keep that old content object, use the - * elm_slider_end_unset() function. - * - * @warning If the object being set does not have minimum size hints set, - * it won't get properly displayed. - * - * @deprecated use elm_object_part_content_set() instead. - * - * @ingroup Slider - */ -EINA_DEPRECATED EAPI void elm_slider_end_set(Evas_Object *obj, Evas_Object *end) EINA_ARG_NONNULL(1); - -/** - * Unset an end object set on a given slider widget. - * - * @param obj The slider object. - * @return The end object that was being used, if any was set, or - * @c NULL, otherwise (and on errors). - * - * On horizontal mode, end is placed at left, and on vertical mode, - * placed at bottom. - * - * This call will unparent and return the icon object which was set - * for this widget, previously, on success. - * - * @see elm_slider_end_set() for more details. - * @see elm_slider_end_get() - * - * @deprecated use elm_object_part_content_unset() instead - * instead. - * - * @ingroup Slider - */ -EINA_DEPRECATED EAPI Evas_Object *elm_slider_end_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * Retrieve the end object set for a given slider widget. - * - * @param obj The slider object. - * @return The end object's handle, if @p obj had one set, or @c NULL, - * otherwise (and on errors). - * - * On horizontal mode, icon is placed at right, and on vertical mode, - * placed at bottom. - * - * @see elm_slider_end_set() for more details. - * @see elm_slider_end_unset() - * - * - * @deprecated use elm_object_part_content_get() instead - * instead. - * - * @ingroup Slider - */ -EINA_DEPRECATED EAPI Evas_Object *elm_slider_end_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_slider_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the (exact) length of the bar region of a given slider widget. diff --git a/src/lib/elm_slideshow.h b/src/lib/elm_slideshow.h index 26f9b3e..6bdc5eb 100644 --- a/src/lib/elm_slideshow.h +++ b/src/lib/elm_slideshow.h @@ -91,9 +91,7 @@ struct _Elm_Slideshow_Item_Class * * @ingroup Slideshow */ -EAPI Evas_Object * - elm_slideshow_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_slideshow_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Add (append) a new item in a given slideshow widget. @@ -370,17 +368,6 @@ EAPI const Eina_List *elm_slideshow_items_get(const Evas_Object *obj) EINA_ EAPI void elm_slideshow_item_del(Elm_Object_Item *it) EINA_ARG_NONNULL(1); /** - * Return the data associated with a given slideshow item - * - * @param it The slideshow item - * @return Returns the data associated to this item - * - * @deprecated use elm_object_item_data_get() instead - * @ingroup Slideshow - */ -EINA_DEPRECATED EAPI void *elm_slideshow_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** * Returns the currently displayed item, in a given slideshow widget * * @param obj The slideshow object diff --git a/src/lib/elm_spinner.h b/src/lib/elm_spinner.h index 1d34578..141449b 100644 --- a/src/lib/elm_spinner.h +++ b/src/lib/elm_spinner.h @@ -51,9 +51,7 @@ * @ingroup Spinner * */ -EAPI Evas_Object * - elm_spinner_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_spinner_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the format string of the displayed label. diff --git a/src/lib/elm_store.h b/src/lib/elm_store.h index cb1e091..492d5af 100644 --- a/src/lib/elm_store.h +++ b/src/lib/elm_store.h @@ -89,9 +89,7 @@ struct _Elm_Store_Item_Info_Filesystem EAPI void elm_store_free(Elm_Store *st); EAPI Elm_Store *elm_store_filesystem_new(void); -EAPI void - elm_store_filesystem_directory_set(Elm_Store *st, const char *dir) -EINA_ARG_NONNULL(1); +EAPI void elm_store_filesystem_directory_set(Elm_Store *st, const char *dir) EINA_ARG_NONNULL(1); EAPI const char *elm_store_filesystem_directory_get(const Elm_Store *st) EINA_ARG_NONNULL(1); EAPI const char *elm_store_item_filesystem_path_get(const Elm_Store_Item *sti) EINA_ARG_NONNULL(1); diff --git a/src/lib/elm_table.h b/src/lib/elm_table.h index bbee7f1..e223e50 100644 --- a/src/lib/elm_table.h +++ b/src/lib/elm_table.h @@ -21,9 +21,7 @@ * @param parent The parent object * @return The new object or NULL if it cannot be created */ -EAPI Evas_Object * - elm_table_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_table_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * @brief Set the homogeneous layout in the table diff --git a/src/lib/elm_theme.h b/src/lib/elm_theme.h index 8c05b35..ea780ba 100644 --- a/src/lib/elm_theme.h +++ b/src/lib/elm_theme.h @@ -345,9 +345,7 @@ EAPI void elm_theme_name_available_list_free(Eina_List *list); * configuration difficult. Avoid any custom themes at all if it can be * helped. */ -EAPI void - elm_object_theme_set(Evas_Object *obj, Elm_Theme *th) -EINA_ARG_NONNULL(1); +EAPI void elm_object_theme_set(Evas_Object *obj, Elm_Theme *th) EINA_ARG_NONNULL(1); /** * Get the specific theme to be used diff --git a/src/lib/elm_thumb.h b/src/lib/elm_thumb.h index dc4717a..b966b6a 100644 --- a/src/lib/elm_thumb.h +++ b/src/lib/elm_thumb.h @@ -53,7 +53,7 @@ * * @ingroup Thumb */ -typedef enum _Elm_Thumb_Animation_Setting +typedef enum { ELM_THUMB_ANIMATION_START = 0, /**< Play animation once */ ELM_THUMB_ANIMATION_LOOP, /**< Keep playing animation until stop is requested */ @@ -72,9 +72,7 @@ typedef enum _Elm_Thumb_Animation_Setting * * @ingroup Thumb */ -EAPI Evas_Object * - elm_thumb_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_thumb_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Reload thumbnail if it was generated before. diff --git a/src/lib/elm_toolbar.h b/src/lib/elm_toolbar.h index a788a52..f4e9b64 100644 --- a/src/lib/elm_toolbar.h +++ b/src/lib/elm_toolbar.h @@ -62,7 +62,7 @@ * * @ingroup Toolbar */ -typedef enum _Elm_Toolbar_Shrink_Mode +typedef enum { ELM_TOOLBAR_SHRINK_NONE, /**< Set toolbar minimun size to fit all the items. */ ELM_TOOLBAR_SHRINK_HIDE, /**< Hide exceeding items. */ @@ -84,9 +84,7 @@ typedef struct _Elm_Toolbar_Item_State Elm_Toolbar_Item_State; /**< State of * * @ingroup Toolbar */ -EAPI Evas_Object * - elm_toolbar_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Set the icon size, in pixels, to be used by toolbar items. @@ -410,19 +408,6 @@ EAPI Elm_Object_Item *elm_toolbar_item_next_get(const Elm_Object_Ite EAPI Elm_Object_Item *elm_toolbar_item_prev_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); /** - * Get the toolbar object from an item. - * - * @param it The item. - * @return The toolbar object. - * - * This returns the toolbar object itself that an item belongs to. - * - * @deprecated use elm_object_item_object_get() instead. - * @ingroup Toolbar - */ -EINA_DEPRECATED EAPI Evas_Object *elm_toolbar_item_toolbar_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** * Set the priority of a toolbar item. * * @param it The toolbar item. @@ -454,76 +439,6 @@ EAPI void elm_toolbar_item_priority_set(Elm_Object_Item EAPI int elm_toolbar_item_priority_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); /** - * Get the label of item. - * - * @param it The item of toolbar. - * @return The label of item. - * - * The return value is a pointer to the label associated to @p item when - * it was created, with function elm_toolbar_item_append() or similar, - * or later, - * with function elm_toolbar_item_label_set. If no label - * was passed as argument, it will return @c NULL. - * - * @see elm_toolbar_item_label_set() for more details. - * @see elm_toolbar_item_append() - * - * @deprecated use elm_object_item_text_get() instead. - * @ingroup Toolbar - */ -EINA_DEPRECATED EAPI const char *elm_toolbar_item_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** - * Set the label of item. - * - * @param it The item of toolbar. - * @param text The label of item. - * - * The label to be displayed by the item. - * Label will be placed at icons bottom (if set). - * - * If a label was passed as argument on item creation, with function - * elm_toolbar_item_append() or similar, it will be already - * displayed by the item. - * - * @see elm_toolbar_item_label_get() - * @see elm_toolbar_item_append() - * - * @deprecated use elm_object_item_text_set() instead - * @ingroup Toolbar - */ -EINA_DEPRECATED EAPI void elm_toolbar_item_label_set(Elm_Object_Item *it, const char *label) EINA_ARG_NONNULL(1); - -/** - * Return the data associated with a given toolbar widget item. - * - * @param it The toolbar widget item handle. - * @return The data associated with @p item. - * - * @see elm_toolbar_item_data_set() - * - * @deprecated use elm_object_item_data_get() instead. - * @ingroup Toolbar - */ -EINA_DEPRECATED EAPI void *elm_toolbar_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** - * Set the data associated with a given toolbar widget item. - * - * @param it The toolbar widget item handle - * @param data The new data pointer to set to @p item. - * - * This sets new item data on @p item. - * - * @warning The old data pointer won't be touched by this function, so - * the user had better to free that old data himself/herself. - * - * @deprecated use elm_object_item_data_set() instead. - * @ingroup Toolbar - */ -EINA_DEPRECATED EAPI void elm_toolbar_item_data_set(Elm_Object_Item *it, const void *data) EINA_ARG_NONNULL(1); - -/** * Returns a pointer to a toolbar item by its label. * * @param obj The toolbar object. @@ -707,35 +622,6 @@ EAPI void elm_toolbar_item_del(Elm_Object_Item *it) EINA EAPI void elm_toolbar_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func) EINA_ARG_NONNULL(1); /** - * Get a value whether toolbar item is disabled or not. - * - * @param it The item. - * @return The disabled state. - * - * @see elm_toolbar_item_disabled_set() for more details. - * - * @deprecated use elm_object_item_disabled_get() instead. - * @ingroup Toolbar - */ -EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_item_disabled_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); - -/** - * Sets the disabled/enabled state of a toolbar item. - * - * @param it The item. - * @param disabled The disabled state. - * - * A disabled item cannot be selected or unselected. It will also - * change its appearance (generally greyed out). This sets the - * disabled state (@c EINA_TRUE for disabled, @c EINA_FALSE for - * enabled). - * - * @deprecated use elm_object_item_disabled_set() instead. - * @ingroup Toolbar - */ -EINA_DEPRECATED EAPI void elm_toolbar_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) EINA_ARG_NONNULL(1); - -/** * Set or unset item as a separator. * * @param it The toolbar item. @@ -1264,16 +1150,6 @@ EAPI Eina_Bool elm_toolbar_item_cursor_engine_only_get(const /** * Change a toolbar's orientation * @param obj The toolbar object - * @param vertical If @c EINA_TRUE, the toolbar is vertical - * By default, a toolbar will be horizontal. Use this function to create a vertical toolbar. - * @ingroup Toolbar - * @deprecated use elm_toolbar_horizontal_set() instead. - */ -EINA_DEPRECATED EAPI void elm_toolbar_orientation_set(Evas_Object *obj, Eina_Bool vertical) EINA_ARG_NONNULL(1); - -/** - * 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 @@ -1283,16 +1159,6 @@ EAPI void elm_toolbar_horizontal_set(Evas_Object *obj, E /** * Get a toolbar's orientation * @param obj The toolbar object - * @return If @c EINA_TRUE, the toolbar is vertical - * By default, a toolbar will be horizontal. Use this function to determine whether a toolbar is vertical. - * @ingroup Toolbar - * @deprecated use elm_toolbar_horizontal_get() instead. - */ -EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_orientation_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - -/** - * 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 diff --git a/src/lib/elm_tooltip.h b/src/lib/elm_tooltip.h index 667dba2..0657ded 100644 --- a/src/lib/elm_tooltip.h +++ b/src/lib/elm_tooltip.h @@ -28,9 +28,7 @@ typedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb)(void *data, Evas_Object *obj EAPI double elm_tooltip_delay_get(void); EAPI Eina_Bool elm_tooltip_delay_set(double delay); -EAPI void - elm_object_tooltip_show(Evas_Object *obj) -EINA_ARG_NONNULL(1); +EAPI void elm_object_tooltip_show(Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_object_tooltip_hide(Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_object_tooltip_text_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1, 2); EAPI void elm_object_tooltip_domain_translatable_text_set(Evas_Object *obj, const char *domain, const char *text) EINA_ARG_NONNULL(1, 3); diff --git a/src/lib/elm_transit.h b/src/lib/elm_transit.h index 2cf325e..1a26417 100644 --- a/src/lib/elm_transit.h +++ b/src/lib/elm_transit.h @@ -170,9 +170,7 @@ EAPI Elm_Transit *elm_transit_add(void); * @ingroup Transit * @warning Just call this function if you are sure the transit is alive. */ -EAPI void - elm_transit_del(Elm_Transit *transit) -EINA_ARG_NONNULL(1); +EAPI void elm_transit_del(Elm_Transit *transit) EINA_ARG_NONNULL(1); /** * Add a new effect to the transit. diff --git a/src/lib/elm_video.h b/src/lib/elm_video.h index 4ce78dd..29f45c2 100644 --- a/src/lib/elm_video.h +++ b/src/lib/elm_video.h @@ -47,24 +47,6 @@ EAPI Evas_Object *elm_player_add(Evas_Object *parent); /** - * @brief Link a Elm_Payer with an Elm_Video object. - * - * @param player the Elm_Player object. - * @param video The Elm_Video object. - * - * This mean that action on the player widget will affect the - * video object and the state of the video will be reflected in - * the player itself. - * - * @see elm_player_add() - * @see elm_video_add() - * @deprecated use elm_object_part_content_set() instead - * - * @ingroup Video - */ -EINA_DEPRECATED EAPI void elm_player_video_set(Evas_Object *player, Evas_Object *video); - -/** * @brief Add a new Elm_Video object to the given parent Elementary (container) object. * * @param parent The parent object diff --git a/src/lib/elm_web.h b/src/lib/elm_web.h index d5d44ef..7fc7320 100644 --- a/src/lib/elm_web.h +++ b/src/lib/elm_web.h @@ -119,7 +119,7 @@ struct _Elm_Web_Frame_Load_Error /** * The possibles types that the items in a menu can be */ -typedef enum _Elm_Web_Menu_Item_Type +typedef enum { ELM_WEB_MENU_SEPARATOR, ELM_WEB_MENU_GROUP, @@ -196,7 +196,7 @@ struct _Elm_Web_Download /** * Types of zoom available. */ -typedef enum _Elm_Web_Zoom_Mode +typedef enum { ELM_WEB_ZOOM_MODE_MANUAL = 0, /**< Zoom controlled normally by elm_web_zoom_set */ ELM_WEB_ZOOM_MODE_AUTO_FIT, /**< Zoom until content fits in web object */ @@ -348,9 +348,7 @@ typedef void (*Elm_Web_Console_Message)(void *data, Evas_Object *obj, const char * @see elm_web_uri_set() * @see elm_web_webkit_view_get() */ -EAPI Evas_Object * - elm_web_add(Evas_Object *parent) -EINA_ARG_NONNULL(1); +EAPI Evas_Object *elm_web_add(Evas_Object *parent) EINA_ARG_NONNULL(1); /** * Get internal ewk_view object from web object. diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index ff48025..5d095e9 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -386,9 +386,7 @@ EAPI void elm_widget_scroll_freeze_pop(Evas_Object *obj); EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj); EAPI void elm_widget_scale_set(Evas_Object *obj, double scale); EAPI double elm_widget_scale_get(const Evas_Object *obj); -EAPI Eina_Bool - elm_widget_mirrored_get(const Evas_Object *obj) -EINA_ARG_NONNULL(1); +EAPI Eina_Bool elm_widget_mirrored_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_widget_mirrored_set(Evas_Object *obj, Eina_Bool mirrored) EINA_ARG_NONNULL(1); EAPI Eina_Bool elm_widget_mirrored_automatic_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI void elm_widget_mirrored_automatic_set(Evas_Object *obj, Eina_Bool automatic) EINA_ARG_NONNULL(1); diff --git a/src/lib/elm_win.h b/src/lib/elm_win.h index c80c866..66f824c 100644 --- a/src/lib/elm_win.h +++ b/src/lib/elm_win.h @@ -84,7 +84,7 @@ * * Currently, only the X11 backed engines use them. */ -typedef enum _Elm_Win_Type +typedef enum { ELM_WIN_BASIC, /**< A normal window. Indicates a normal, top-level window. Almost every window will be created with this @@ -142,7 +142,7 @@ typedef enum _Elm_Win_Type * any of the following layouts for the virtual keyboard. */ // XXX: remove this as it conflicts with input panel -typedef enum _Elm_Win_Keyboard_Mode +typedef enum { ELM_WIN_KEYBOARD_UNKNOWN, /**< Unknown keyboard state */ ELM_WIN_KEYBOARD_OFF, /**< Request to deactivate the keyboard */ @@ -168,7 +168,7 @@ typedef enum _Elm_Win_Keyboard_Mode * When running under an Illume session, a window may send commands to the * Illume manager to perform different actions. */ -typedef enum _Elm_Illume_Command +typedef enum { ELM_ILLUME_COMMAND_FOCUS_BACK, /**< Reverts focus to the previous window */ ELM_ILLUME_COMMAND_FOCUS_FORWARD, /**< Sends focus to the next window in the list */ @@ -236,9 +236,7 @@ EAPI Evas_Object *elm_win_util_standard_add(const char *name, const cha * @param obj The window object * @param subobj The resize object to add */ -EAPI void - elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj) -EINA_ARG_NONNULL(1); +EAPI void elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj) EINA_ARG_NONNULL(1); /** * Delete @p subobj as a resize object of window @p obj. diff --git a/src/lib/els_scroller.h b/src/lib/els_scroller.h index d919be0..5566f4e 100644 --- a/src/lib/els_scroller.h +++ b/src/lib/els_scroller.h @@ -1,4 +1,4 @@ -typedef enum _Elm_Smart_Scroller_Policy +typedef enum { ELM_SMART_SCROLLER_POLICY_AUTO, ELM_SMART_SCROLLER_POLICY_ON,