From 59957b80bf773c69b3117a914e880390f4b0af4a Mon Sep 17 00:00:00 2001 From: Soohye Shin Date: Wed, 20 May 2015 10:38:33 +0900 Subject: [PATCH] change to int type to enum type of bar_direction Change-Id: I8b29fdf08f10da84e108759ce18fe5bc0012a734 Signed-off-by: Soohye Shin --- include/bar.h | 2 +- src/custombar.cpp | 6 +++--- src/dynamicbar.cpp | 2 +- src/homebar.cpp | 8 ++++---- src/userbar.cpp | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/bar.h b/include/bar.h index 5e4696b..455d5b6 100644 --- a/include/bar.h +++ b/include/bar.h @@ -85,7 +85,7 @@ struct bar_ops { void (*show)(struct bar_info *info); void (*hide)(struct bar_info *info); Eina_Bool (*move)(struct bar_info *info); - Eina_Bool (*is_move)(struct bar_info *info, int dir); + Eina_Bool (*is_move)(struct bar_info *info, enum bar_direction dir); enum bar_event (*key_down)(struct bar_info *info, void *ei); enum bar_event (*key_up)(struct bar_info *info, void *ei); void (*release)(struct bar_info *info); diff --git a/src/custombar.cpp b/src/custombar.cpp index 1d2f4c1..9c5719b 100644 --- a/src/custombar.cpp +++ b/src/custombar.cpp @@ -546,7 +546,7 @@ static void _updated(CEngineBarItem *it, void *data) elm_object_focus_set(item->eo, EINA_TRUE); } -static int _get_effect_direction(Evas_Object *target, Evas_Object *from) +static enum bar_direction _get_effect_direction(Evas_Object *target, Evas_Object *from) { Evas_Coord x1, y1, x2, y2; @@ -565,7 +565,7 @@ static int _get_effect_direction(Evas_Object *target, Evas_Object *from) } } -static void _set_effect(Evas_Object *target, Evas_Object *from, int dir) +static void _set_effect(Evas_Object *target, Evas_Object *from, enum bar_direction dir) { const char *t_sig, *f_sig; @@ -682,7 +682,7 @@ static Eina_Bool _dbar_focused(void *data, Evas_Object *foc) struct _cbar_data *bar; struct bar_info *dbar; Evas_Object *cur; - int dir; + enum bar_direction dir; Eina_Bool r; if (!data || !foc) { diff --git a/src/dynamicbar.cpp b/src/dynamicbar.cpp index 1210bd8..defe532 100644 --- a/src/dynamicbar.cpp +++ b/src/dynamicbar.cpp @@ -1372,7 +1372,7 @@ static void _hide(struct bar_info *info) evas_object_hide(bar->ly); } -static Eina_Bool _is_move(struct bar_info *info, int dir) +static Eina_Bool _is_move(struct bar_info *info, enum bar_direction dir) { struct _dbar_data *bar; struct _dbar_item *item; diff --git a/src/homebar.cpp b/src/homebar.cpp index a9193a8..d5c3abc 100644 --- a/src/homebar.cpp +++ b/src/homebar.cpp @@ -65,7 +65,7 @@ static int _is_next_object(Evas_Object *target, Evas_Object *from) return y2 < y1; } -static int _get_effect_direction(Evas_Object *target, Evas_Object *from) +static enum bar_direction _get_effect_direction(Evas_Object *target, Evas_Object *from) { Evas_Coord x1, y1, x2, y2; @@ -84,7 +84,7 @@ static int _get_effect_direction(Evas_Object *target, Evas_Object *from) } } -static void _set_effect(Evas_Object *target, Evas_Object *from, int dir) +static void _set_effect(Evas_Object *target, Evas_Object *from, enum bar_direction dir) { const char *t_sig, *f_sig; @@ -289,7 +289,7 @@ static Eina_Bool _dbar_focused(void *data, Evas_Object *foc) struct _hbar_data *bar; struct bar_info *dbar; Evas_Object *cur; - int dir; + enum bar_direction dir; Eina_Bool r; if (!data || !foc) { @@ -427,7 +427,7 @@ static Eina_Bool _move(struct bar_info *info) return EINA_TRUE; } -static Eina_Bool _is_move(struct bar_info *info, int dir) +static Eina_Bool _is_move(struct bar_info *info, enum bar_direction dir) { struct _hbar_data *bar; diff --git a/src/userbar.cpp b/src/userbar.cpp index 79a767b..17db4a9 100644 --- a/src/userbar.cpp +++ b/src/userbar.cpp @@ -775,7 +775,7 @@ static Eina_Bool _move_item(struct bar_info *info) return EINA_TRUE; } -static Eina_Bool _is_move(struct bar_info *info, int dir) +static Eina_Bool _is_move(struct bar_info *info, enum bar_direction dir) { struct _ubar_data *bar; -- 2.7.4