From 0851d568a1cf469655c5fbef3f0b9bacc23d3cd4 Mon Sep 17 00:00:00 2001 From: Amitesh Singh Date: Fri, 16 Jun 2017 16:14:37 +0900 Subject: [PATCH] Efl.Ui.Progressbar: rename data get macros. --- src/lib/elementary/efl_ui_progressbar.c | 10 +++++----- src/lib/elementary/efl_ui_progressbar_private.h | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index dac11a5..e088baf 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -87,7 +87,7 @@ _is_inverted(Efl_Orient orientation) static void _units_set(Evas_Object *obj) { - ELM_PROGRESSBAR_DATA_GET(obj, sd); + EFL_UI_PROGRESSBAR_DATA_GET(obj, sd); if (sd->unit_format_func) { @@ -113,7 +113,7 @@ _val_set(Evas_Object *obj) Eina_Bool rtl; double pos; - ELM_PROGRESSBAR_DATA_GET(obj, sd); + EFL_UI_PROGRESSBAR_DATA_GET(obj, sd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 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) { const char *sig; - ELM_PROGRESSBAR_DATA_GET(obj, sd); + EFL_UI_PROGRESSBAR_DATA_GET(obj, sd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); sd->unit_format_func = func; @@ -603,7 +603,7 @@ EAPI void elm_progressbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) { Efl_Orient dir; - ELM_PROGRESSBAR_DATA_GET(obj, sd); + EFL_UI_PROGRESSBAR_DATA_GET(obj, sd); dir = _orientation_get(horizontal, _is_inverted(sd->orientation)); @@ -623,7 +623,7 @@ EAPI void elm_progressbar_inverted_set(Evas_Object *obj, Eina_Bool inverted) { Efl_Orient dir; - ELM_PROGRESSBAR_DATA_GET(obj, sd); + EFL_UI_PROGRESSBAR_DATA_GET(obj, sd); dir = _orientation_get(_is_horizontal(sd->orientation), inverted); diff --git a/src/lib/elementary/efl_ui_progressbar_private.h b/src/lib/elementary/efl_ui_progressbar_private.h index 2c9b345..8d2707a 100644 --- a/src/lib/elementary/efl_ui_progressbar_private.h +++ b/src/lib/elementary/efl_ui_progressbar_private.h @@ -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) -#define ELM_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr) \ - ELM_PROGRESSBAR_DATA_GET(o, ptr); \ +#define EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr) \ + EFL_UI_PROGRESSBAR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("No widget data for object %p (%s)", \ @@ -65,8 +65,8 @@ struct _Efl_Ui_Progress_Status return; \ } -#define ELM_PROGRESSBAR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - ELM_PROGRESSBAR_DATA_GET(o, ptr); \ +#define EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + EFL_UI_PROGRESSBAR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("No widget data for object %p (%s)", \ @@ -74,7 +74,7 @@ struct _Efl_Ui_Progress_Status return val; \ } -#define ELM_PROGRESSBAR_CHECK(obj) \ +#define EFL_UI_PROGRESSBAR_CHECK(obj) \ if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_PROGRESSBAR_CLASS))) \ return -- 2.7.4