From 1836db7f74e513117ee486294fdcea5cef1d9904 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Fri, 7 Oct 2016 17:02:07 +0900 Subject: [PATCH] Revert "mark deprecated APIs with EINA_DEPRECATED" This reverts commit b4f33abfca566643ce8a60c9ccd8d7d60586991d. Conflicts: src/lib/edje/Edje_Legacy.h src/lib/eina/eina_unicode.h src/lib/evas/Evas_Common.h Change-Id: I230cc09ea57f8994a427efa74ed84db8597726d7 --- src/lib/edje/Edje_Legacy.h | 9 +++------ src/lib/eina/eina_array.h | 5 +++-- src/lib/eina/eina_unicode.h | 1 - src/lib/evas/Evas_Common.h | 3 +-- src/lib/evas/Evas_Legacy.h | 6 ++---- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index 9ec000b..18c0ab2 100644 --- a/src/lib/edje/Edje_Legacy.h +++ b/src/lib/edje/Edje_Legacy.h @@ -128,8 +128,7 @@ 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 @@ -145,7 +144,6 @@ EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const c 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 @@ -158,10 +156,9 @@ EINA_DEPRECATED EAPI void edje_extern_object_min_size_set (Evas_Object * * @elseif WEARABLE @since_tizen 2.3.1 * @endif */ -EINA_DEPRECATED EAPI void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord maxw, Evas_Coord maxh); +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 @@ -178,7 +175,7 @@ EINA_DEPRECATED EAPI void edje_extern_object_max_size_set (Evas_Object * * @elseif WEARABLE @since_tizen 2.3.1 * @endif */ -EINA_DEPRECATED EAPI void edje_extern_object_aspect_set (Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah); +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 8a0871c..c618909 100644 --- a/src/lib/eina/eina_array.h +++ b/src/lib/eina/eina_array.h @@ -409,7 +409,6 @@ 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. @@ -418,8 +417,10 @@ 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 EINA_DEPRECATED; +static inline unsigned int eina_array_count_get(const Eina_Array *array) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; /** * @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 233aefc..727393e 100644 --- a/src/lib/eina/eina_unicode.h +++ b/src/lib/eina/eina_unicode.h @@ -163,7 +163,6 @@ 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, diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 4d7e473..6e483c1 100755 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -3713,7 +3713,6 @@ 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. @@ -3723,7 +3722,7 @@ EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_ge * @elseif WEARABLE @since_tizen 2.3.1 * @endif */ -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); +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 33464a9..0d59599 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -3736,7 +3736,6 @@ 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. @@ -3753,10 +3752,9 @@ EAPI void evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_ * @elseif WEARABLE @since_tizen 2.3.1 * @endif */ -EINA_DEPRECATED EAPI void evas_object_text_filter_program_set(Eo *obj, const char *code); +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 @@ -3769,7 +3767,7 @@ EINA_DEPRECATED EAPI void evas_object_text_filter_program_set(Eo *obj, const cha * @elseif WEARABLE @since_tizen 2.3.1 * @endif */ -EINA_DEPRECATED EAPI void evas_object_text_filter_source_set(Eo *obj, const char *name, Evas_Object *eo_source); +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