From e23f61cefc8c8817654bd089924e7964f6ab5c7d Mon Sep 17 00:00:00 2001 From: Soohye Shin Date: Sat, 1 Aug 2015 13:56:21 +0900 Subject: [PATCH] fix checkpatch error Change-Id: I078d12117937cbd6f46149ed6bf82d707db34080 Signed-off-by: Soohye Shin --- include/defs.h | 4 ++++ src/data/data_recent.c | 6 ++---- src/view/view_home.c | 3 ++- src/view/view_recent.c | 4 ++-- src/view/view_user.c | 9 ++++++--- src/view/view_user_edit.c | 9 ++------- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/include/defs.h b/include/defs.h index 4a57ebb..4f47793 100644 --- a/include/defs.h +++ b/include/defs.h @@ -186,6 +186,10 @@ #define MESSAGE_OK "OK" #define MESSAGE_DONE "Done" #define MESSAGE_DISCARD "Discard" +#define MESSAGE_DELETE_CONTENTS "If you delete this user, their data will also be deleted." +#define MESSAGE_DISCARD_CONTENTS "Discard all entered data?
If you are out of this screen, data won't be saved" +#define MESSAGE_ENTRY_NAME "User Name" +#define MESSAGE_ENTRY_PIN "Pin code" #define GUM_ATTR_NAME "username" #define GUM_ATTR_USERTYPE "usertype" diff --git a/src/data/data_recent.c b/src/data/data_recent.c index e497e8d..7259ba1 100644 --- a/src/data/data_recent.c +++ b/src/data/data_recent.c @@ -77,14 +77,12 @@ static void _app_list_foreach(gpointer data, gpointer user_data) } r = pkgmgrinfo_appinfo_get_label(handle, &label); - if (r != PMINFO_R_OK) { + if (r != PMINFO_R_OK) _ERR("failed to get app label"); - } r = pkgmgrinfo_appinfo_get_effectimage(handle, &thumb, &thumb_land); - if (r != PMINFO_R_OK) { + if (r != PMINFO_R_OK) _ERR("failed to get app icon"); - } if (!strcmp(thumb_land, "")) thumb_land = THUMB_DEFAULT; diff --git a/src/view/view_home.c b/src/view/view_home.c index 2256c9f..22058d0 100644 --- a/src/view/view_home.c +++ b/src/view/view_home.c @@ -105,7 +105,8 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj, } else if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) { if (priv->foc->di->action == ITEM_SELECT_ACTION_PUSH) - elm_object_signal_emit(priv->base, SIG_HIDE, SRC_PROG); + elm_object_signal_emit(priv->base, SIG_HIDE, + SRC_PROG); else datamgr_select_item(priv->dm, priv->foc->di); } diff --git a/src/view/view_recent.c b/src/view/view_recent.c index 73e1ed3..54bad0b 100644 --- a/src/view/view_recent.c +++ b/src/view/view_recent.c @@ -142,7 +142,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj, if (!strcmp(ev->keyname, KEY_DOWN) || !strcmp(ev->keyname, KEY_BACK) || - !strcmp(ev->keyname, KEY_BACK_REMOTE)){ + !strcmp(ev->keyname, KEY_BACK_REMOTE)) { elm_object_signal_emit(priv->base, SIG_HIDE_RECENT, SRC_PROG); } @@ -327,7 +327,7 @@ static struct _bar_item *_pack_item(struct _priv *priv, Evas_Object *box, return NULL; } - if(di->subtitle) { + if (di->subtitle) { sub_lbl = utils_add_label(eo, di->subtitle, STYLE_LABEL_RECENT_SUBTITLE, PART_RECENT_SUBTITLE); diff --git a/src/view/view_user.c b/src/view/view_user.c index 37f54d2..60f811f 100644 --- a/src/view/view_user.c +++ b/src/view/view_user.c @@ -283,7 +283,8 @@ static void _arrow_clicked(void *data, Evas_Object *obj, const char *emission, if (priv->foc->di->action == ITEM_SELECT_ACTION_PUSH) return; - viewmgr_update_view(VIEW_USER_EDIT, UPDATE_TYPE_USER, (void *)priv->user_type); + viewmgr_update_view(VIEW_USER_EDIT, UPDATE_TYPE_USER, + (void *)priv->user_type); viewmgr_update_view(VIEW_USER_EDIT, UPDATE_TYPE_EDIT, priv->foc->di); viewmgr_push_view(VIEW_USER_EDIT); } @@ -338,7 +339,8 @@ static struct _bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box, if (!focus_lbl) goto err; - elm_object_signal_callback_add(eo, SIG_CLICK_ARROW, SRC_EDJE, _arrow_clicked, priv); + elm_object_signal_callback_add(eo, SIG_CLICK_ARROW, SRC_EDJE, + _arrow_clicked, priv); } else { eo = utils_add_layout(box, GRP_BAR_ITEM, true, NULL); if (!eo) { @@ -367,7 +369,8 @@ static struct _bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box, evas_object_size_hint_align_set(eo, 0.5, 0.0); inputmgr_add_callback(eo, INPUT_HANDLER_TYPE_EO, &handler, bi); - elm_object_signal_callback_add(eo, SIG_CLICK_ITEM, SRC_EDJE, _item_clicked, priv); + elm_object_signal_callback_add(eo, SIG_CLICK_ITEM, SRC_EDJE, + _item_clicked, priv); elm_box_pack_end(box, eo); evas_object_show(eo); diff --git a/src/view/view_user_edit.c b/src/view/view_user_edit.c index 4140ef3..6794072 100644 --- a/src/view/view_user_edit.c +++ b/src/view/view_user_edit.c @@ -25,11 +25,6 @@ #include "datamgr.h" #include "utils.h" -#define MESSAGE_DELETE_CONTENTS "If you delete this user, their data will also be deleted." -#define MESSAGE_DISCARD_CONTENTS "Discard all entered data?
If you are out of this screen, data won't be saved" - -#define MESSAGE_ENTRY_NAME "User Name" -#define MESSAGE_ENTRY_PIN "Pin code" #define KEY_ICON "icon" #define KEY_FOCUS_ICON "focusicon" @@ -642,7 +637,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj, default: return; } - } else if(!strcmp(ev->keyname, KEY_ENTER) || + } else if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) _select(priv, id, obj); } @@ -702,7 +697,7 @@ static void _show(void *data) _load_user_icon(priv, photo, focus_photo); } if (priv->user_type == USER_ITEM_ADMIN && - priv->di->type !=USER_ITEM_ADMIN) + priv->di->type != USER_ITEM_ADMIN) _load_del_btn(priv); } else { elm_object_part_text_set(priv->base, PART_USER_EDIT_TITLE, -- 2.7.4