From: Jihoon Kim Date: Tue, 24 May 2016 22:14:33 +0000 (+0900) Subject: Fix build warnings X-Git-Tag: submit/tizen/20160525.013423~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cee407fb29d161f1b216b0b24eeb35a0c5eba39e;p=platform%2Fcore%2Fuifw%2Finputmethod-setting.git Fix build warnings Change-Id: I7b0cad694e737d0fee72a381250f210bb1940335 --- diff --git a/im_setting_list/input_method_setting_list_popup_view.cpp b/im_setting_list/input_method_setting_list_popup_view.cpp index ba81cbf..b8e175a 100644 --- a/im_setting_list/input_method_setting_list_popup_view.cpp +++ b/im_setting_list/input_method_setting_list_popup_view.cpp @@ -237,15 +237,7 @@ static void im_setting_list_genlist_item_class_create(void) } } - -static char * -im_setting_list_default_keyboard_title_text_get(void *data, Evas_Object *obj, const char *part) -{ - char buf[1024]; - snprintf(buf, 1023, "%s", IM_SETTING_LIST_POPUP_VIEW_TITLE); - return strdup(buf); -} - +#ifndef _WEARABLE static Evas_Object *im_setting_list_list_create(void *data) { appdata *ad = (appdata *)data; @@ -323,15 +315,23 @@ static Evas_Object *im_setting_list_popup_create(void *data) evas_object_show(popup); return popup; } +#endif + +#ifdef _WEARABLE +static char * +im_setting_list_default_keyboard_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + return strdup(IM_SETTING_LIST_POPUP_VIEW_TITLE); +} -static Evas_Object *im_setting_list_screen_create(void *data) +static void im_setting_list_screen_create(void *data) { appdata *ad = NULL; Evas_Object *genlist = NULL; Elm_Genlist_Item_Class *ttc = elm_genlist_item_class_new(); ad = (appdata *) data; - if (ad == NULL) return NULL; + if (ad == NULL) return; ttc->item_style = "title"; ttc->func.text_get = im_setting_list_default_keyboard_title_text_get; @@ -348,7 +348,7 @@ static Evas_Object *im_setting_list_screen_create(void *data) } /* keyboard list */ - for (int i = 0; i < g_active_ime_info_list.size(); i++) { + for (unsigned int i = 0; i < g_active_ime_info_list.size(); i++) { sel_cb_data *cb_data = new sel_cb_data; cb_data->data = data; cb_data->index = i; @@ -366,6 +366,7 @@ static Evas_Object *im_setting_list_screen_create(void *data) elm_genlist_item_class_free(ttc); elm_naviframe_item_push(ad->naviframe, NULL, NULL, NULL, genlist, "empty"); } +#endif void im_setting_list_popup_view_create(void *data) diff --git a/im_setting_list/input_method_setting_list_ui.cpp b/im_setting_list/input_method_setting_list_ui.cpp index 12f2d14..c2d209d 100644 --- a/im_setting_list/input_method_setting_list_ui.cpp +++ b/im_setting_list/input_method_setting_list_ui.cpp @@ -307,6 +307,7 @@ static void im_setting_list_check_button_change_cb(void *data, Evas_Object *obj, } } +#ifdef _MOBILE static void im_setting_list_popup_ok_cb(void *data, Evas_Object *obj, void *event_info) { @@ -371,6 +372,7 @@ static void im_setting_list_item_sel_cb(void *data, Evas_Object *obj, void *even im_setting_list_show_popup(data, obj, im_setting_list_popup_ok_cb, im_setting_list_popup_cancel_cb); } } +#endif static void im_setting_list_set_default_keyboard_item_sel_cb(void *data, Evas_Object *obj, void *event_info) { @@ -611,7 +613,6 @@ static void im_setting_list_genlist_item_class_create(int app_type) static void im_setting_list_add_ime(void *data) { appdata *ad = (appdata *)data; - int i = 0; if (!ad) return; im_setting_list_genlist_item_class_create(ad->app_type); @@ -628,7 +629,6 @@ static void im_setting_list_add_ime(void *data) { } memset(&item_text, 0, sizeof(item_text)); - Elm_Object_Item *group_header_item = NULL; if (ad->app_type == APP_TYPE_SETTING || ad->app_type == APP_TYPE_SETTING_NO_ROTATION) { /* Default keyboard selector */ @@ -657,6 +657,7 @@ static void im_setting_list_add_ime(void *data) { #ifdef _MOBILE /* Keyboards group */ + Elm_Object_Item *group_header_item = NULL; group_header_item = elm_genlist_item_append(ad->genlist, itc_im_list_group, IM_SETTING_LIST_KEYBOARD_HEADER, @@ -668,7 +669,7 @@ static void im_setting_list_add_ime(void *data) { /* keyboard list */ int info_list_size = g_ime_info_list.size(); - for (i = 0; i < info_list_size; i++) { + for (int i = 0; i < info_list_size; i++) { gen_item_data item_data; if (g_ime_info_list[i].is_preinstalled || (i == g_active_ime_index)) { diff --git a/im_setting_selector/input_method_setting_selector_ui.cpp b/im_setting_selector/input_method_setting_selector_ui.cpp index daddd7c..6208070 100755 --- a/im_setting_selector/input_method_setting_selector_ui.cpp +++ b/im_setting_selector/input_method_setting_selector_ui.cpp @@ -350,6 +350,7 @@ static Evas_Object *im_setting_selector_naviframe_create(Evas_Object* parent) return naviframe; } +#ifndef _WEARABLE static Eina_Bool im_setting_list_navi_item_pop_cb(void *data, Elm_Object_Item *it) { static bool in_exit = false; @@ -369,15 +370,6 @@ im_setting_selector_popup_block_clicked_cb(void *data EINA_UNUSED, Evas_Object * ui_app_exit(); } -static char * -im_setting_selector_title_text_get(void *data, Evas_Object *obj, const char *part) -{ - char buf[1024]; - snprintf(buf, 1023, "%s", IM_SETTING_SELECTOR_TITLE); - return strdup(buf); -} - - Evas_Object *im_setting_selector_popup_create(void *data) { appdata *ad = (appdata *)data; @@ -419,6 +411,14 @@ Evas_Object *im_setting_selector_popup_create(void *data) evas_object_show(ad->popup); return ad->popup; } +#endif + +#ifdef _WEARABLE +static char * +im_setting_selector_title_text_get(void *data, Evas_Object *obj, const char *part) +{ + return strdup(IM_SETTING_SELECTOR_TITLE); +} static Evas_Object *im_setting_selector_conform_create(Evas_Object *parentWin) { @@ -443,14 +443,14 @@ static Evas_Object *im_setting_selector_conform_create(Evas_Object *parentWin) return conform; } -static Evas_Object *im_setting_selector_screen_create(void *data) +static void im_setting_selector_screen_create(void *data) { appdata *ad = NULL; Evas_Object *genlist = NULL; Elm_Genlist_Item_Class *ttc = elm_genlist_item_class_new(); ad = (appdata *) data; - if (ad == NULL) return NULL; + if (ad == NULL) return; ttc->item_style = "title"; ttc->func.text_get = im_setting_selector_title_text_get; @@ -471,7 +471,7 @@ static Evas_Object *im_setting_selector_screen_create(void *data) } /* keyboard list */ - for (int i = 0; i < g_ime_info_list.size(); i++) { + for (unsigned int i = 0; i < g_ime_info_list.size(); i++) { sel_cb_data *cb_data = new sel_cb_data; cb_data->data = data; cb_data->index = i; @@ -489,6 +489,7 @@ static Evas_Object *im_setting_selector_screen_create(void *data) elm_genlist_item_class_free(ttc); elm_naviframe_item_push(ad->naviframe, NULL, NULL, NULL, genlist, "empty"); } +#endif void im_setting_selector_app_create(void *data)