summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWooHyun Jung <woohyun0705@gmail.com>2012-02-21 00:40:55 +0000
committerWooHyun Jung <woohyun0705@gmail.com>2012-02-21 00:40:55 +0000
commit033d4e5595cd4d09967a89077b348d14b21a789b (patch)
tree7b238c1f29fae4bd3383936e6c65bdf3e2e67a77
parent7797585a077a49e4a3620d28a6061450e6d2512c (diff)
[edje] Change APIs name from from
edje_object_markup_filter_callback_{add,del,del_full} to edje_object_text_markup_filter_callback_{add,del,del_full}. SVN revision: 68179
Diffstat (limited to '')
-rw-r--r--legacy/edje/ChangeLog5
-rw-r--r--legacy/edje/src/lib/Edje.h24
-rw-r--r--legacy/edje/src/lib/edje_util.c6
3 files changed, 20 insertions, 15 deletions
diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 24dc6ec3a5..6d998ed331 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -355,3 +355,8 @@
355 edje_object_part_text_input_panel_imdata_set/get 355 edje_object_part_text_input_panel_imdata_set/get
356 edje_object_part_text_input_panel_return_key_type_set/get 356 edje_object_part_text_input_panel_return_key_type_set/get
357 edje_object_part_text_input_panel_return_key_disabled_set/get 357 edje_object_part_text_input_panel_return_key_disabled_set/get
358
3592012-02-20 WooHyun Jung
360
361 * Change API names from edje_object_markup_filter_callback_{add,del,del_full}.
362 to edje_object_text_markup_filter_callback_{add,del,del_full}.
diff --git a/legacy/edje/src/lib/Edje.h b/legacy/edje/src/lib/Edje.h
index d389eac0b9..2aa8a05131 100644
--- a/legacy/edje/src/lib/Edje.h
+++ b/legacy/edje/src/lib/Edje.h
@@ -3096,17 +3096,17 @@ EAPI Eina_Bool edje_object_part_text_input_panel_return_key_disabled_get(
3096 * @warning This function will be deprecated because of difficulty in use. 3096 * @warning This function will be deprecated because of difficulty in use.
3097 * The type(format, text, or makrup) of text should be always 3097 * The type(format, text, or makrup) of text should be always
3098 * checked in the filter function for correct filtering. 3098 * checked in the filter function for correct filtering.
3099 * Please use edje_object_markup_filter_callback_add() instead. There 3099 * Please use edje_object_text_markup_filter_callback_add() instead. There
3100 * is no need to check the type of text in the filter function 3100 * is no need to check the type of text in the filter function
3101 * because the text is always markup. 3101 * because the text is always markup.
3102 * @warning If you use this function with 3102 * @warning If you use this function with
3103 * edje_object_markup_filter_callback_add() togehter, all 3103 * edje_object_text_markup_filter_callback_add() togehter, all
3104 * Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions 3104 * Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions
3105 * will be executed, and then filtered text will be inserted. 3105 * will be executed, and then filtered text will be inserted.
3106 * 3106 *
3107 * @see edje_object_text_insert_filter_callback_del 3107 * @see edje_object_text_insert_filter_callback_del
3108 * @see edje_object_text_insert_filter_callback_del_full 3108 * @see edje_object_text_insert_filter_callback_del_full
3109 * @see edje_object_markup_filter_callback_add 3109 * @see edje_object_text_markup_filter_callback_add
3110 * 3110 *
3111 * @param obj A valid Evas_Object handle 3111 * @param obj A valid Evas_Object handle
3112 * @param part The part name 3112 * @param part The part name
@@ -3172,8 +3172,8 @@ EAPI void *edje_object_text_insert_filter_callback_del_full (Evas_Ob
3172 * Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions 3172 * Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions
3173 * will be executed, and then filtered text will be inserted. 3173 * will be executed, and then filtered text will be inserted.
3174 * 3174 *
3175 * @see edje_object_markup_filter_callback_del 3175 * @see edje_object_text_markup_filter_callback_del
3176 * @see edje_object_markup_filter_callback_del_full 3176 * @see edje_object_text_markup_filter_callback_del_full
3177 * @see edje_object_text_insert_filter_callback_add 3177 * @see edje_object_text_insert_filter_callback_add
3178 * 3178 *
3179 * @param obj A valid Evas_Object handle 3179 * @param obj A valid Evas_Object handle
@@ -3182,7 +3182,7 @@ EAPI void *edje_object_text_insert_filter_callback_del_full (Evas_Ob
3182 * @param data User provided data to pass to the filter function 3182 * @param data User provided data to pass to the filter function
3183 * @since 1.2.0 3183 * @since 1.2.0
3184 */ 3184 */
3185EAPI void edje_object_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data); 3185EAPI void edje_object_text_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data);
3186 3186
3187/** 3187/**
3188 * Delete a function from the markup filter list. 3188 * Delete a function from the markup filter list.
@@ -3190,8 +3190,8 @@ EAPI void edje_object_markup_filter_callback_add(Evas_Object *obj, const char *p
3190 * Delete the given @p func filter from the list in @p part. Returns 3190 * Delete the given @p func filter from the list in @p part. Returns
3191 * the user data pointer given when added. 3191 * the user data pointer given when added.
3192 * 3192 *
3193 * @see edje_object_markup_filter_callback_add 3193 * @see edje_object_text_markup_filter_callback_add
3194 * @see edje_object_markup_filter_callback_del_full 3194 * @see edje_object_text_markup_filter_callback_del_full
3195 * 3195 *
3196 * @param obj A valid Evas_Object handle 3196 * @param obj A valid Evas_Object handle
3197 * @param part The part name 3197 * @param part The part name
@@ -3200,7 +3200,7 @@ EAPI void edje_object_markup_filter_callback_add(Evas_Object *obj, const char *p
3200 * @return The user data pointer if succesful, or NULL otherwise 3200 * @return The user data pointer if succesful, or NULL otherwise
3201 * @since 1.2.0 3201 * @since 1.2.0
3202 */ 3202 */
3203EAPI void *edje_object_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func); 3203EAPI void *edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func);
3204 3204
3205/** 3205/**
3206 * Delete a function and matching user data from the markup filter list. 3206 * Delete a function and matching user data from the markup filter list.
@@ -3209,8 +3209,8 @@ EAPI void *edje_object_markup_filter_callback_del(Evas_Object *obj, const char *
3209 * in @p part. 3209 * in @p part.
3210 * Returns the user data pointer given when added. 3210 * Returns the user data pointer given when added.
3211 * 3211 *
3212 * @see edje_object_markup_filter_callback_add 3212 * @see edje_object_text_markup_filter_callback_add
3213 * @see edje_object_markup_filter_callback_del 3213 * @see edje_object_text_markup_filter_callback_del
3214 * 3214 *
3215 * @param obj A valid Evas_Object handle 3215 * @param obj A valid Evas_Object handle
3216 * @param part The part name 3216 * @param part The part name
@@ -3220,7 +3220,7 @@ EAPI void *edje_object_markup_filter_callback_del(Evas_Object *obj, const char *
3220 * @return The same data pointer if succesful, or NULL otherwise 3220 * @return The same data pointer if succesful, or NULL otherwise
3221 * @since 1.2.0 3221 * @since 1.2.0
3222 */ 3222 */
3223EAPI void *edje_object_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data); 3223EAPI void *edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data);
3224 3224
3225/** 3225/**
3226 * @brief Swallows an object into the edje. 3226 * @brief Swallows an object into the edje.
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index 1f30d71a07..6750b5b831 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -2150,7 +2150,7 @@ edje_object_text_insert_filter_callback_del_full(Evas_Object *obj, const char *p
2150} 2150}
2151 2151
2152EAPI void 2152EAPI void
2153edje_object_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data) 2153edje_object_text_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data)
2154{ 2154{
2155 Edje *ed; 2155 Edje *ed;
2156 Edje_Markup_Filter_Callback *cb; 2156 Edje_Markup_Filter_Callback *cb;
@@ -2166,7 +2166,7 @@ edje_object_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_
2166} 2166}
2167 2167
2168EAPI void * 2168EAPI void *
2169edje_object_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func) 2169edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func)
2170{ 2170{
2171 Edje *ed; 2171 Edje *ed;
2172 Edje_Markup_Filter_Callback *cb; 2172 Edje_Markup_Filter_Callback *cb;
@@ -2190,7 +2190,7 @@ edje_object_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_
2190} 2190}
2191 2191
2192EAPI void * 2192EAPI void *
2193edje_object_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data) 2193edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data)
2194{ 2194{
2195 Edje *ed; 2195 Edje *ed;
2196 Edje_Markup_Filter_Callback *cb; 2196 Edje_Markup_Filter_Callback *cb;