From: hermet Date: Wed, 3 Aug 2011 12:27:57 +0000 (+0000) Subject: elementary - just renamed paramenter names for consistency. X-Git-Tag: REL_F_I9500_20120323_1~17^2~2045 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f249491410331b04e5bb16aaad3dd98d300003bb;p=framework%2Fuifw%2Felementary.git elementary - just renamed paramenter names for consistency. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@62053 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 4e19f65..4d5597e 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -689,14 +689,14 @@ extern "C" { * Set a label of an object * * @param obj The Elementary object - * @param item The label id to set (NULL for the default label) + * @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 */ - EAPI void elm_object_text_part_set(Evas_Object *obj, const char *item, const char *label); + EAPI void elm_object_text_part_set(Evas_Object *obj, const char *part, const char *label); #define elm_object_text_set(obj, label) elm_object_text_part_set((obj), NULL, (label)) @@ -704,14 +704,14 @@ extern "C" { * Get a label of an object * * @param obj The Elementary object - * @param item The label id to get (NULL for the default label) + * @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 */ - EAPI const char *elm_object_text_part_get(const Evas_Object *obj, const char *item); + EAPI const char *elm_object_text_part_get(const Evas_Object *obj, const char *part); #define elm_object_text_get(obj) elm_object_text_part_get((obj), NULL) @@ -719,14 +719,14 @@ extern "C" { * Set a content of an object * * @param obj The Elementary object - * @param item The content id to set (NULL for the default content) + * @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 */ - EAPI void elm_object_content_part_set(Evas_Object *obj, const char *item, Evas_Object *content); + EAPI void elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content); #define elm_object_content_set(obj, content) elm_object_content_part_set((obj), NULL, (content)) @@ -734,14 +734,14 @@ extern "C" { * Get a content of an object * * @param obj The Elementary object - * @param item The content id to get (NULL for the default content) + * @param item 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 */ - EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *item); + EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *part); #define elm_object_content_get(obj) elm_object_content_part_get((obj), NULL) @@ -749,13 +749,13 @@ extern "C" { * Unset a content of an object * * @param obj The Elementary object - * @param item The content id to unset (NULL for the default content) + * @param item The content part name to unset (NULL for the default content) * * @note Elementary objects may have many contents * * @ingroup General */ - EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *item); + EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *part); #define elm_object_content_unset(obj) elm_object_content_part_unset((obj), NULL) diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index d75a881..874e0ea 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -71,12 +71,12 @@ static void _del_pre_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj); static void _theme_hook(Evas_Object *obj); static void _content_set_hook(Evas_Object *obj, - const char *item __UNUSED__, + const char *part __UNUSED__, Evas_Object *content); static Evas_Object * _content_unset_hook(Evas_Object *obj, - const char *item __UNUSED__); + const char *part __UNUSED__); static Evas_Object * _content_get_hook(const Evas_Object *obj, - const char *item __UNUSED__); + const char *part __UNUSED__); static void _bg_clicked_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__); @@ -700,7 +700,7 @@ _theme_hook(Evas_Object *obj) } static void -_content_set_hook(Evas_Object *obj, const char *item __UNUSED__, +_content_set_hook(Evas_Object *obj, const char *part __UNUSED__, Evas_Object *content) { ELM_CHECK_WIDTYPE(obj, widtype); @@ -727,7 +727,7 @@ _content_set_hook(Evas_Object *obj, const char *item __UNUSED__, } static Evas_Object * -_content_unset_hook(Evas_Object *obj, const char *item __UNUSED__) +_content_unset_hook(Evas_Object *obj, const char *part __UNUSED__) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; @@ -752,7 +752,7 @@ _content_unset_hook(Evas_Object *obj, const char *item __UNUSED__) } static Evas_Object * -_content_get_hook(const Evas_Object *obj, const char *item __UNUSED__) +_content_get_hook(const Evas_Object *obj, const char *part __UNUSED__) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index f6a80d0..053c72f 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -1201,38 +1201,38 @@ elm_object_scale_get(const Evas_Object *obj) } EAPI void -elm_object_text_part_set(Evas_Object *obj, const char *item, const char *label) +elm_object_text_part_set(Evas_Object *obj, const char *part, const char *label) { EINA_SAFETY_ON_NULL_RETURN(obj); - elm_widget_text_part_set(obj, item, label); + elm_widget_text_part_set(obj, part, label); } EAPI const char * -elm_object_text_part_get(const Evas_Object *obj, const char *item) +elm_object_text_part_get(const Evas_Object *obj, const char *part) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); - return elm_widget_text_part_get(obj, item); + return elm_widget_text_part_get(obj, part); } EAPI void -elm_object_content_part_set(Evas_Object *obj, const char *item, Evas_Object *content) +elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content) { EINA_SAFETY_ON_NULL_RETURN(obj); - elm_widget_content_part_set(obj, item, content); + elm_widget_content_part_set(obj, part, content); } EAPI Evas_Object * -elm_object_content_part_get(const Evas_Object *obj, const char *item) +elm_object_content_part_get(const Evas_Object *obj, const char *part) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); - return elm_widget_content_part_get(obj, item); + return elm_widget_content_part_get(obj, part); } EAPI Evas_Object * -elm_object_content_part_unset(Evas_Object *obj, const char *item) +elm_object_content_part_unset(Evas_Object *obj, const char *part) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); - return elm_widget_content_part_unset(obj, item); + return elm_widget_content_part_unset(obj, part); } /** diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index 10a46e9..544ba57 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -494,7 +494,7 @@ elm_widget_event_hook_set(Evas_Object *obj, EAPI void elm_widget_text_set_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj, - const char *item, + const char *part, const char *text)) { API_ENTRY return; @@ -504,7 +504,7 @@ elm_widget_text_set_hook_set(Evas_Object *obj, EAPI void elm_widget_text_get_hook_set(Evas_Object *obj, const char *(*func)(const Evas_Object *obj, - const char *item)) + const char *part)) { API_ENTRY return; sd->on_text_get_func = func; @@ -513,7 +513,7 @@ elm_widget_text_get_hook_set(Evas_Object *obj, EAPI void elm_widget_content_set_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj, - const char *item, + const char *part, Evas_Object *content)) { API_ENTRY return; @@ -523,7 +523,7 @@ elm_widget_content_set_hook_set(Evas_Object *obj, EAPI void elm_widget_content_get_hook_set(Evas_Object *obj, Evas_Object *(*func)(const Evas_Object *obj, - const char *item)) + const char *part)) { API_ENTRY return; sd->on_content_get_func = func; @@ -532,7 +532,7 @@ elm_widget_content_get_hook_set(Evas_Object *obj, EAPI void elm_widget_content_unset_hook_set(Evas_Object *obj, Evas_Object *(*func)(Evas_Object *obj, - const char *item)) + const char *part)) { API_ENTRY return; sd->on_content_unset_func = func; @@ -2128,52 +2128,52 @@ elm_widget_theme_set(Evas_Object *obj, } EAPI void -elm_widget_text_part_set(Evas_Object *obj, const char *item, const char *label) +elm_widget_text_part_set(Evas_Object *obj, const char *part, const char *label) { API_ENTRY return; if (!sd->on_text_set_func) return; - sd->on_text_set_func(obj, item, label); + sd->on_text_set_func(obj, part, label); } EAPI const char * -elm_widget_text_part_get(const Evas_Object *obj, const char *item) +elm_widget_text_part_get(const Evas_Object *obj, const char *part) { API_ENTRY return NULL; if (!sd->on_text_get_func) return NULL; - return sd->on_text_get_func(obj, item); + return sd->on_text_get_func(obj, part); } EAPI void -elm_widget_content_part_set(Evas_Object *obj, const char *item, Evas_Object *content) +elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content) { API_ENTRY return; if (!sd->on_content_set_func) return; - sd->on_content_set_func(obj, item, content); + sd->on_content_set_func(obj, part, content); } EAPI Evas_Object * -elm_widget_content_part_get(const Evas_Object *obj, const char *item) +elm_widget_content_part_get(const Evas_Object *obj, const char *part) { API_ENTRY return NULL; if (!sd->on_content_get_func) return NULL; - return sd->on_content_get_func(obj, item); + return sd->on_content_get_func(obj, part); } EAPI Evas_Object * -elm_widget_content_part_unset(Evas_Object *obj, const char *item) +elm_widget_content_part_unset(Evas_Object *obj, const char *part) { API_ENTRY return NULL; if (!sd->on_content_unset_func) return NULL; - return sd->on_content_unset_func(obj, item); + return sd->on_content_unset_func(obj, part); } EAPI Elm_Theme * diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index 4f93929..beae803 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -240,11 +240,11 @@ EAPI void elm_widget_on_focus_hook_set(Evas_Object *obj, void (*func EAPI void elm_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data); EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data); EAPI void elm_widget_focus_region_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)); -EAPI void elm_widget_text_set_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj, const char *item, const char *text)); -EAPI void elm_widget_text_get_hook_set(Evas_Object *obj, const char *(*func)(const Evas_Object *obj, const char *item)); -EAPI void elm_widget_content_set_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj, const char *item, Evas_Object *content)); -EAPI void elm_widget_content_get_hook_set(Evas_Object *obj, Evas_Object *(*func)(const Evas_Object *obj, const char *item)); -EAPI void elm_widget_content_unset_hook_set(Evas_Object *obj, Evas_Object *(*func)(Evas_Object *obj, const char *item)); +EAPI void elm_widget_text_set_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj, const char *part, const char *text)); +EAPI void elm_widget_text_get_hook_set(Evas_Object *obj, const char *(*func)(const Evas_Object *obj, const char *part)); +EAPI void elm_widget_content_set_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj, const char *part, Evas_Object *content)); +EAPI void elm_widget_content_get_hook_set(Evas_Object *obj, Evas_Object *(*func)(const Evas_Object *obj, const char *part)); +EAPI void elm_widget_content_unset_hook_set(Evas_Object *obj, Evas_Object *(*func)(Evas_Object *obj, const char *part)); EAPI void elm_widget_on_focus_region_hook_set(Evas_Object *obj, void (*func) (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)); EAPI void elm_widget_data_set(Evas_Object *obj, void *data); EAPI void *elm_widget_data_get(const Evas_Object *obj); @@ -331,11 +331,11 @@ EAPI void elm_widget_focus_hide_handle(Evas_Object *obj); EAPI void elm_widget_focus_mouse_down_handle(Evas_Object *obj); EAPI void elm_widget_focus_tree_unfocusable_handle(Evas_Object *obj); EAPI void elm_widget_focus_disabled_handle(Evas_Object *obj); -EAPI void elm_widget_text_part_set(Evas_Object *obj, const char *item, const char *label); -EAPI const char *elm_widget_text_part_get(const Evas_Object *obj, const char *item); -EAPI void elm_widget_content_part_set(Evas_Object *obj, const char *item, Evas_Object *content); -EAPI Evas_Object *elm_widget_content_part_get(const Evas_Object *obj, const char *item); -EAPI Evas_Object *elm_widget_content_part_unset(Evas_Object *obj, const char *item); +EAPI void elm_widget_text_part_set(Evas_Object *obj, const char *part, const char *label); +EAPI const char *elm_widget_text_part_get(const Evas_Object *obj, const char *part); +EAPI void elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content); +EAPI Evas_Object *elm_widget_content_part_get(const Evas_Object *obj, const char *part); +EAPI Evas_Object *elm_widget_content_part_unset(Evas_Object *obj, const char *part); EAPI Elm_Widget_Item *_elm_widget_item_new(Evas_Object *parent, size_t alloc_size); EAPI void _elm_widget_item_del(Elm_Widget_Item *item); EAPI void _elm_widget_item_pre_notify_del(Elm_Widget_Item *item);