Fix the coding style errors 96/71996/1 accepted/tizen/common/20160602.140400 accepted/tizen/ivi/20160602.231222 accepted/tizen/mobile/20160602.231236 accepted/tizen/tv/20160602.231159 accepted/tizen/wearable/20160602.231213 submit/tizen/20160602.084203
authorDoHyun Pyun <dh79.pyun@samsung.com>
Mon, 30 May 2016 06:41:04 +0000 (15:41 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Mon, 30 May 2016 06:41:04 +0000 (15:41 +0900)
Change-Id: Ifdf2c3a77879bba35b54b26d2288dfa7a1ad902c
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
src/bt-syspopup-m.c
src/bt-syspopup-w.c

index 6141e49..e0a74e5 100644 (file)
@@ -196,8 +196,7 @@ static void __bluetooth_player_free_job_cb(void *data)
        player_destroy(sound_player);
 
        ret = sound_manager_get_focus_state(stream_info, &state_for_playback, NULL);
-       if (state_for_playback == SOUND_STREAM_FOCUS_STATE_ACQUIRED)
-       {
+       if (state_for_playback == SOUND_STREAM_FOCUS_STATE_ACQUIRED) {
                ret = sound_manager_release_focus(stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, NULL);
                if (ret != SOUND_MANAGER_ERROR_NONE)
                        BT_ERR("sound_manager_release_focus() get failed : %d", ret);
@@ -341,7 +340,7 @@ static int __bluetooth_notify_event(struct bt_popup_appdata *ad)
        ret = player_create(&ad->player);
        if (ret != PLAYER_ERROR_NONE) {
                BT_ERR("creating the player handle failed[%d]", ret);
-               ad->player= NULL;
+               ad->player = NULL;
                return ret;
        }
 
@@ -353,8 +352,7 @@ static int __bluetooth_notify_event(struct bt_popup_appdata *ad)
 
        /* Set the notification sound from vconf*/
        path = vconf_get_str(VCONF_NOTI_SOUND);
-       if (path)
-       {
+       if (path) {
                ret = player_set_uri(ad->player, path);
                if (ret != 0)
                        BT_ERR("player_set_uri Failed : %d", ret);
@@ -891,14 +889,14 @@ static void __bluetooth_auth_check_label_clicked_cb(void *data, Evas_Object *obj
                                                        void *event_info)
 {
        FN_START;
-       ret_if (!obj || !data);
+       ret_if(!obj || !data);
 
        Elm_Object_Item *item = NULL;
        item = (Elm_Object_Item *)event_info;
-       ret_if (!item);
+       ret_if(!item);
 
        struct bt_popup_appdata *ad = data;
-       ret_if (!ad);
+       ret_if(!ad);
 
        Evas_Object *content = elm_object_item_part_content_get(item, "elm.icon.2");
        Evas_Object *ck = elm_object_part_content_get(content, "elm.swallow.content");
@@ -1174,7 +1172,7 @@ static void __bluetooth_input_mouseup_cb(void *data,
        BT_DBG("ev->button : %d", ev->button);
 
        if (ev->button == 3) {
-               ret_if (ad == NULL);
+               ret_if(ad == NULL);
                evas_object_event_callback_del(ad->entry, EVAS_CALLBACK_MOUSE_UP,
                                __bluetooth_input_mouseup_cb);
                evas_object_event_callback_del(ad->entry, EVAS_CALLBACK_KEY_DOWN,
@@ -1289,14 +1287,14 @@ static void __bluetooth_pswd_check_box_sel(void *data, Evas_Object *obj,
                                                        void *event_info)
 {
        FN_START;
-       ret_if (!obj || !data);
+       ret_if(!obj || !data);
 
        Elm_Object_Item *item = NULL;
        item = (Elm_Object_Item *)event_info;
-       ret_if (!item);
+       ret_if(!item);
 
        struct bt_popup_appdata *ad = data;
-       ret_if (!ad);
+       ret_if(!ad);
 
        Evas_Object *content = elm_object_item_part_content_get(item, "elm.icon.2");
        Evas_Object *ck = elm_object_part_content_get(content, "elm.swallow.content");
@@ -1341,7 +1339,7 @@ static Evas_Object *__bluetooth_passwd_entry_icon_get(
                                void *data, Evas_Object *obj, const char *part)
 {
        FN_START;
-       retv_if (obj == NULL || data == NULL, NULL);
+       retv_if(obj == NULL || data == NULL, NULL);
 
        Evas_Object *entry = NULL;
        Evas_Object *layout = NULL;
@@ -1416,7 +1414,7 @@ static Evas_Object *__bluetooth_passwd_entry_icon_get(
 static char *__bluetooth_popup_desc_label_get(void *data, Evas_Object *obj,
                                              const char *part)
 {
-       retv_if (!data, NULL);
+       retv_if(!data, NULL);
 
        if (!strcmp(part, "elm.text.multiline"))
                return (char *)data;
@@ -1427,8 +1425,8 @@ static char *__bluetooth_access_check_label_get(void *data, Evas_Object *obj,
                                              const char *part)
 {
        FN_START;
-       retv_if (!data, NULL);
-       retv_if (!strcmp(part, "elm.text.main.left"),
+       retv_if(!data, NULL);
+       retv_if(!strcmp(part, "elm.text.main.left"),
                        g_strdup(BT_STR_DO_NOT_SHOW_AGAIN));
        FN_END;
        return NULL;
@@ -1438,8 +1436,8 @@ static char *__bluetooth_passwd_show_passwd_label_get(void *data, Evas_Object *o
                                              const char *part)
 {
        FN_START;
-       retv_if (!data, NULL);
-       retv_if (!strcmp(part, "elm.text.main.left"), g_strdup(BT_STR_SHOW_PIN));
+       retv_if(!data, NULL);
+       retv_if(!strcmp(part, "elm.text.main.left"), g_strdup(BT_STR_SHOW_PIN));
        FN_END;
        return NULL;
 }
@@ -1448,7 +1446,7 @@ static Evas_Object *__bluetooth_access_check_icon_get(
 
 {
        FN_START;
-       retv_if (strcmp(part, "elm.icon.2"), NULL);
+       retv_if(strcmp(part, "elm.icon.2"), NULL);
        struct bt_popup_appdata *ad = data;
        retv_if(!ad, NULL);
        Evas_Object *layout = NULL;
@@ -1477,7 +1475,7 @@ static Evas_Object *__bluetooth_passwd_show_passwd_icon_get(
 
 {
        FN_START;
-       retv_if (strcmp(part, "elm.icon.2"), NULL);
+       retv_if(strcmp(part, "elm.icon.2"), NULL);
        struct bt_popup_appdata *ad = data;
        retv_if(!ad, NULL);
        Evas_Object *layout = NULL;
@@ -1779,7 +1777,7 @@ static void
 __bluetooth_popup_block_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        FN_START;
-       if(obj)
+       if (obj)
                evas_object_del(obj);
 }
 
@@ -1790,7 +1788,7 @@ static void __bluetooth_draw_toast_popup(struct bt_popup_appdata *ad, char *toas
        elm_object_style_set(ad->popup, "toast");
        evas_object_size_hint_weight_set(ad->popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
-       elm_object_part_text_set(ad->popup,"elm.text.content", toast_text);
+       elm_object_part_text_set(ad->popup, "elm.text.content", toast_text);
        evas_object_smart_callback_add(ad->popup, "block,clicked", __bluetooth_popup_block_clicked_cb, NULL);
 
 //     __bluetooth_set_win_level(ad->popup);
@@ -2363,7 +2361,7 @@ static bool __bluetooth_create(void *data)
 
        /* create window */
        win = __bluetooth_create_win(PACKAGE);
-       retv_if (win == NULL, false);
+       retv_if(win == NULL, false);
 
 #if 0
        /* Enable Changeable UI feature */
@@ -2500,7 +2498,7 @@ static void __bluetooth_reset(app_control_h app_control, void *data)
        } else {
                BT_ERR("event type is NULL ");
        }
-release :
+release:
        bundle_free(b);
 }
 
index 8a95e6f..4bd1320 100644 (file)
@@ -552,7 +552,7 @@ void __bluetooth_device_bond_created_cb(int result, bt_device_info_s *device_inf
        if (ad == NULL)
                return;
 
-       if(result == BT_ERROR_NONE) {
+       if (result == BT_ERROR_NONE) {
                BT_DBG("A bond is created.");
                BT_DBG("%s, %s", device_info->remote_name, device_info->remote_address);
        } else {
@@ -843,12 +843,12 @@ char *__bluetooth_convert_rgba_to_hex(int r, int g, int b, int a)
        int hexcolor = 0;
        char* string = NULL;
 
-       string = g_try_malloc0(sizeof(char )* 255);
+       string = g_try_malloc0(sizeof(char* 255);
        if (string == NULL)
                return NULL;
 
        hexcolor = (r << 24) + (g << 16) + (b << 8) + a;
-       sprintf(string, "%08x", hexcolor );
+       sprintf(string, "%08x", hexcolor);
 
        return string;
 }
@@ -1034,8 +1034,8 @@ static void __bluetooth_editfield_del_cb(void *data, Evas *e,
 void __bluetooth_layout_wearable_input_pop(bt_pincode_input_object *po)
 {
        FN_START;
-       ret_if (!po);
-       ret_if (!po->naviframe);
+       ret_if(!po);
+       ret_if(!po->naviframe);
 
        elm_naviframe_item_pop(po->naviframe);
        if (po->pincode && strlen(po->pincode) > 0 && po->ok_btn) {
@@ -1050,8 +1050,8 @@ gboolean __bluetooth_view_base_window_is_focus(bt_pincode_input_object *po)
 {
        FN_START;
        Eina_Bool ret;
-       retv_if (!po, FALSE);
-       retv_if (!po->win_main, FALSE);
+       retv_if(!po, FALSE);
+       retv_if(!po->win_main, FALSE);
 
        ret = elm_win_focus_get(po->win_main);
        return ret == EINA_TRUE ? TRUE : FALSE;
@@ -1064,7 +1064,7 @@ static void __bluetooth_editfield_state_changed_cb(void *data, Ecore_IMF_Context
        FN_START;
        bt_pincode_input_object *po = data;
 
-       ret_if (!po);
+       ret_if(!po);
 
        if (value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) {
                if (__bluetooth_view_base_window_is_focus(po)) {
@@ -1243,7 +1243,7 @@ static void __bluetooth_pincode_btn_cb(void *data, Evas_Object *obj,
        bt_pincode_input_object *po = ad->po;
        retm_if(po == NULL, "ad is NULL!");
 
-       if(ad->event_type == BT_EVENT_PIN_REQUEST) {
+       if (ad->event_type == BT_EVENT_PIN_REQUEST) {
                dbus_g_proxy_call_no_reply(ad->agent_proxy,
                                        "ReplyPinCode", G_TYPE_UINT, BT_AGENT_ACCEPT,
                                        G_TYPE_STRING, po->pincode,
@@ -1341,7 +1341,7 @@ bt_pincode_input_object *__bluetooth_pincode_input_new(struct bt_popup_appdata *
        retv_if(!ad, NULL);
        bt_pincode_input_object *object = NULL;
        object = g_new0(bt_pincode_input_object, 1);
-       retvm_if (!object, NULL, "layout_wearable_input_new() failed.");
+       retvm_if(!object, NULL, "layout_wearable_input_new() failed.");
        object->win_main = ad->win_main;
        FN_END;
        return object;
@@ -1495,7 +1495,7 @@ static void __bluetooth_draw_input_view(struct bt_popup_appdata *ad,
        /* Bottom button layout */
        layout = elm_layout_add(naviframe);
        elm_layout_theme_set(layout, "layout", "bottom_button", "default");
-       evas_object_size_hint_weight_set (layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_show(layout);
 
@@ -1839,7 +1839,7 @@ static void __bluetooth_draw_toast_popup(struct bt_popup_appdata *ad, char *toas
        eext_object_event_callback_add(ad->popup, EEXT_CALLBACK_BACK, __bluetooth_popup_hide_cb, NULL);
        evas_object_smart_callback_add(ad->popup, "dismissed", __bluetooth_popup_hide_finished_cb, NULL);
        evas_object_smart_callback_add(ad->popup, "block,clicked", __bluetooth_popup_block_clicked_cb, NULL);
-       elm_object_part_text_set(ad->popup,"elm.text", toast_text);
+       elm_object_part_text_set(ad->popup, "elm.text", toast_text);
 
        __bluetooth_set_win_level(ad->popup);