enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Efl.Ui.Progressbar: rename data get macros.

This commit is contained in:
Amitesh Singh 2017-06-16 16:14:37 +09:00
parent 5df92c2a52
commit 0851d568a1
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/elementary/efl_ui_progressbar.c
View File

@ -87,7 +87,7 @@ _is_inverted(Efl_Orient orientation)
static void static void
_units_set(Evas_Object *obj) _units_set(Evas_Object *obj)
{ {
ELM_PROGRESSBAR_DATA_GET(obj, sd); EFL_UI_PROGRESSBAR_DATA_GET(obj, sd);
if (sd->unit_format_func) if (sd->unit_format_func)
{ {
@ -113,7 +113,7 @@ _val_set(Evas_Object *obj)
Eina_Bool rtl; Eina_Bool rtl;
double pos; double pos;
ELM_PROGRESSBAR_DATA_GET(obj, sd); EFL_UI_PROGRESSBAR_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
rtl = efl_ui_mirrored_get(obj); rtl = efl_ui_mirrored_get(obj);
@ -567,7 +567,7 @@ EAPI void
elm_progressbar_unit_format_function_set(Evas_Object *obj, progressbar_func_type func, progressbar_freefunc_type free_func) elm_progressbar_unit_format_function_set(Evas_Object *obj, progressbar_func_type func, progressbar_freefunc_type free_func)
{ {
const char *sig; const char *sig;
ELM_PROGRESSBAR_DATA_GET(obj, sd); EFL_UI_PROGRESSBAR_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
sd->unit_format_func = func; sd->unit_format_func = func;
@ -603,7 +603,7 @@ EAPI void
elm_progressbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) elm_progressbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
{ {
Efl_Orient dir; Efl_Orient dir;
ELM_PROGRESSBAR_DATA_GET(obj, sd); EFL_UI_PROGRESSBAR_DATA_GET(obj, sd);
dir = _orientation_get(horizontal, _is_inverted(sd->orientation)); dir = _orientation_get(horizontal, _is_inverted(sd->orientation));
@ -623,7 +623,7 @@ EAPI void
elm_progressbar_inverted_set(Evas_Object *obj, Eina_Bool inverted) elm_progressbar_inverted_set(Evas_Object *obj, Eina_Bool inverted)
{ {
Efl_Orient dir; Efl_Orient dir;
ELM_PROGRESSBAR_DATA_GET(obj, sd); EFL_UI_PROGRESSBAR_DATA_GET(obj, sd);
dir = _orientation_get(_is_horizontal(sd->orientation), inverted); dir = _orientation_get(_is_horizontal(sd->orientation), inverted);

12
src/lib/elementary/efl_ui_progressbar_private.h
View File

@ -53,11 +53,11 @@ struct _Efl_Ui_Progress_Status
* @} * @}
*/ */
#define ELM_PROGRESSBAR_DATA_GET(o, sd) \ #define EFL_UI_PROGRESSBAR_DATA_GET(o, sd) \
Efl_Ui_Progressbar_Data * sd = efl_data_scope_get(o, EFL_UI_PROGRESSBAR_CLASS) Efl_Ui_Progressbar_Data * sd = efl_data_scope_get(o, EFL_UI_PROGRESSBAR_CLASS)
#define ELM_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr) \ #define EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr) \
ELM_PROGRESSBAR_DATA_GET(o, ptr); \ EFL_UI_PROGRESSBAR_DATA_GET(o, ptr); \
if (EINA_UNLIKELY(!ptr)) \ if (EINA_UNLIKELY(!ptr)) \
{ \ { \
CRI("No widget data for object %p (%s)", \ CRI("No widget data for object %p (%s)", \
@ -65,8 +65,8 @@ struct _Efl_Ui_Progress_Status
return; \ return; \
} }
#define ELM_PROGRESSBAR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ #define EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
ELM_PROGRESSBAR_DATA_GET(o, ptr); \ EFL_UI_PROGRESSBAR_DATA_GET(o, ptr); \
if (EINA_UNLIKELY(!ptr)) \ if (EINA_UNLIKELY(!ptr)) \
{ \ { \
CRI("No widget data for object %p (%s)", \ CRI("No widget data for object %p (%s)", \
@ -74,7 +74,7 @@ struct _Efl_Ui_Progress_Status
return val; \ return val; \
} }
#define ELM_PROGRESSBAR_CHECK(obj) \ #define EFL_UI_PROGRESSBAR_CHECK(obj) \
if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_PROGRESSBAR_CLASS))) \ if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_PROGRESSBAR_CLASS))) \
return return