From 24893c37ae18618089eff8a9bf38f604ae23b96e Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 19 Sep 2022 14:00:39 +0200 Subject: [PATCH] chore: fix warnings --- src/core/lv_obj.c | 2 +- src/widgets/checkbox/lv_checkbox.c | 2 +- src/widgets/tabview/lv_tabview.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index dd50e2ec1..7366f75d4 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -153,7 +153,7 @@ void lv_init(void) lv_img_cache_set_size(LV_IMG_CACHE_DEF_SIZE); #endif /*Test if the IDE has UTF-8 encoding*/ - char * txt = "Á"; + const char * txt = "Á"; uint8_t * txt_u8 = (uint8_t *)txt; if(txt_u8[0] != 0xc3 || txt_u8[1] != 0x81 || txt_u8[2] != 0x00) { diff --git a/src/widgets/checkbox/lv_checkbox.c b/src/widgets/checkbox/lv_checkbox.c index c2a909b7c..54fbd8abb 100644 --- a/src/widgets/checkbox/lv_checkbox.c +++ b/src/widgets/checkbox/lv_checkbox.c @@ -122,7 +122,7 @@ static void lv_checkbox_constructor(const lv_obj_class_t * class_p, lv_obj_t * o lv_checkbox_t * cb = (lv_checkbox_t *)obj; - cb->txt = "Check box"; + cb->txt = (char *)"Check box"; cb->static_txt = 1; lv_obj_add_flag(obj, LV_OBJ_FLAG_CLICKABLE); lv_obj_add_flag(obj, LV_OBJ_FLAG_CHECKABLE); diff --git a/src/widgets/tabview/lv_tabview.c b/src/widgets/tabview/lv_tabview.c index d449a3098..b49007ce4 100644 --- a/src/widgets/tabview/lv_tabview.c +++ b/src/widgets/tabview/lv_tabview.c @@ -85,7 +85,7 @@ lv_obj_t * lv_tabview_add_tab(lv_obj_t * obj, const char * name) lv_memcpy(new_map, old_map, sizeof(const char *) * (tab_id - 1)); new_map[tab_id - 1] = lv_malloc(strlen(name) + 1); strcpy((char *)new_map[tab_id - 1], name); - new_map[tab_id] = ""; + new_map[tab_id] = (char *)""; } /*left or right dir*/ else { @@ -94,12 +94,12 @@ lv_obj_t * lv_tabview_add_tab(lv_obj_t * obj, const char * name) if(tabview->tab_cnt == 0) { new_map[0] = lv_malloc(strlen(name) + 1); strcpy((char *)new_map[0], name); - new_map[1] = ""; + new_map[1] = (char *)""; } else { - new_map[tab_id * 2 - 3] = "\n"; + new_map[tab_id * 2 - 3] = (char *)"\n"; new_map[tab_id * 2 - 2] = lv_malloc(strlen(name) + 1); - new_map[tab_id * 2 - 1] = ""; + new_map[tab_id * 2 - 1] = (char *)""; strcpy((char *)new_map[(tab_id * 2) - 2], name); } } @@ -224,7 +224,7 @@ static void lv_tabview_constructor(const lv_obj_class_t * class_p, lv_obj_t * ob lv_btnmatrix_set_one_checked(btnm, true); tabview->map = lv_malloc(sizeof(const char *)); - tabview->map[0] = ""; + tabview->map[0] = (char *)""; lv_btnmatrix_set_map(btnm, (const char **)tabview->map); lv_obj_add_event_cb(btnm, btns_value_changed_event_cb, LV_EVENT_VALUE_CHANGED, NULL); lv_obj_add_flag(btnm, LV_OBJ_FLAG_EVENT_BUBBLE);