From b4f33abfca566643ce8a60c9ccd8d7d60586991d Mon Sep 17 00:00:00 2001 From: Jee-Yong Um Date: Wed, 21 Sep 2016 21:20:14 +0900 Subject: [PATCH] mark deprecated APIs with EINA_DEPRECATED Signed-Off-By: Jee-Yong Um Change-Id: I75343add0f3d243c708e3689f0b15cd6576f467b --- src/lib/edje/Edje_Legacy.h | 15 ++++++--------- src/lib/eina/eina_array.h | 5 ++--- src/lib/eina/eina_unicode.h | 2 +- src/lib/evas/Evas_Common.h | 4 ++-- src/lib/evas/Evas_Legacy.h | 6 ++++-- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index de9ce16..d9a4809 100644 --- a/src/lib/edje/Edje_Legacy.h +++ b/src/lib/edje/Edje_Legacy.h @@ -114,7 +114,8 @@ EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const c */ EAPI void edje_object_color_class_del (Evas_Object *obj, const char *color_class); - /** +/** + * @deprecated Deprecated since 2.4. Use evas_object_size_hint_min_set() instead. * @brief Set the object minimum size. * * @param obj A valid Evas_Object handle @@ -122,12 +123,11 @@ EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const c * @param minh The minimum height * * This sets the minimum size restriction for the object. - * - * @deprecated use evas_object_size_hint_min_set() instead. */ EINA_DEPRECATED EAPI void edje_extern_object_min_size_set (Evas_Object *obj, Evas_Coord minw, Evas_Coord minh); /** + * @deprecated Deprecated since 2.4. Use evas_object_size_hint_max_set() instead. * @brief Set the object maximum size. * * @param obj A valid Evas_Object handle @@ -135,12 +135,11 @@ EINA_DEPRECATED EAPI void edje_extern_object_min_size_set (Evas_Object * * @param maxh The maximum height * * This sets the maximum size restriction for the object. - * - * @deprecated use evas_object_size_hint_max_set() instead. */ -EAPI void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord maxw, Evas_Coord maxh); +EINA_DEPRECATED EAPI void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord maxw, Evas_Coord maxh); /** + * @deprecated Deprecated since 2.4. Use evas_object_size_hint_aspect_set() instead. * @brief Set the object aspect size. * * @param obj A valid Evas_Object handle @@ -152,10 +151,8 @@ EAPI void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord * swallowed by Edje. The width and height define a preferred size * ASPECT and the object may be scaled to be larger or smaller, but * retaining the relative scale of both aspect width and height. - * - * @deprecated use evas_object_size_hint_aspect_set() instead. */ -EAPI void edje_extern_object_aspect_set (Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah); +EINA_DEPRECATED EAPI void edje_extern_object_aspect_set (Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah); /** * @brief Sets the @b EDJ file (and group within it) to load an Edje diff --git a/src/lib/eina/eina_array.h b/src/lib/eina/eina_array.h index 07234cd..cb9a6ad 100644 --- a/src/lib/eina/eina_array.h +++ b/src/lib/eina/eina_array.h @@ -389,6 +389,7 @@ static inline void eina_array_data_set(const Eina_Array *array, unsigned int idx, const void *data) EINA_ARG_NONNULL(1); /** + * @deprecated Deprecated since 2.4. Use eina_array_count() instead. * @brief Return the number of elements in an array. * * @param array The array. @@ -397,10 +398,8 @@ static inline void eina_array_data_set(const Eina_Array *array, * This function returns the number of elements in @p array (array->count). For * performance reasons, there is no check of @p array. If it is * @c NULL or invalid, the program may crash. - * - * @deprecated use eina_array_count() */ -static inline unsigned int eina_array_count_get(const Eina_Array *array) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +static inline unsigned int eina_array_count_get(const Eina_Array *array) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT EINA_DEPRECATED; /** * @brief Return the number of elements in an array. diff --git a/src/lib/eina/eina_unicode.h b/src/lib/eina/eina_unicode.h index 7bf4f83..7774a52 100644 --- a/src/lib/eina/eina_unicode.h +++ b/src/lib/eina/eina_unicode.h @@ -127,6 +127,7 @@ EAPI Eina_Unicode *eina_unicode_escape(const Eina_Unicode *str) EINA_ARG_NONNULL static inline Eina_Unicode eina_unicode_utf8_next_get(const char *buf, int *iindex) EINA_ARG_NONNULL(1, 2); /** + * @deprecated Deprecated since 2.4. Use eina_unicode_utf8_next_get() instead. * Reads UTF8 bytes from @p buf, starting at @p iindex and returns * the decoded code point at @p iindex offset, and advances @p iindex * to the next code point after this. @p iindex is always advanced, @@ -138,7 +139,6 @@ static inline Eina_Unicode eina_unicode_utf8_next_get(const char *buf, int *iind * @param iindex the index to look at and return by. * @return the codepoint found, 0 if @p buf or @p iindex are NULL * @since 1.1.0 - * @deprecated use eina_unicode_utf8_next_get */ EAPI Eina_Unicode eina_unicode_utf8_get_next(const char *buf, int *iindex) EINA_ARG_NONNULL(1, 2) EINA_DEPRECATED; diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 2da81fb..2a5ac25 100755 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -3427,13 +3427,13 @@ EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_ge EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1); /** + * @deprecated Deprecated since 2.4. Use evas_textblock_at_format_set() instead. * Sets the cursor to point to the place where format points to. * * @param cur the cursor to update. * @param n the format node to update according. - * @deprecated duplicate of evas_textblock_cursor_at_format_set */ -EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2); +EINA_DEPRECATED EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2); /** * Return the format node at the position pointed by cur. diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 731f562..6a70146 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -3169,6 +3169,7 @@ EAPI void evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size si EAPI void evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_Size *size); /** + * @deprecated Deprecated since 2.4. * @brief Set an evas filter program on this object. * * Valid for Text objects at the moment. @@ -3181,9 +3182,10 @@ EAPI void evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_ * * @param[in] code filter program source code */ -EAPI void evas_object_text_filter_program_set(Eo *obj, const char *code); +EINA_DEPRECATED EAPI void evas_object_text_filter_program_set(Eo *obj, const char *code); /** + * @deprecated Deprecated since 2.4. * @brief Bind an object to use as a mask or texture with Evas Filters. * * This will create automatically a new RGBA buffer containing the source @@ -3192,7 +3194,7 @@ EAPI void evas_object_text_filter_program_set(Eo *obj, const char *code); * @param[in] buffer name as used in the program * @param[in] source object to use as a proxy source */ -EAPI void evas_object_text_filter_source_set(Eo *obj, const char *name, Evas_Object *eo_source); +EINA_DEPRECATED EAPI void evas_object_text_filter_source_set(Eo *obj, const char *name, Evas_Object *eo_source); /** * TIZEN_ONLY(20160920): Add fade_ellipsis feature to TEXTBLOCK, TEXT part. -- 2.7.4