diff --git a/src/extra/layouts/flex/lv_flex.c b/src/extra/layouts/flex/lv_flex.c index ba7799b37..ec29bc395 100644 --- a/src/extra/layouts/flex/lv_flex.c +++ b/src/extra/layouts/flex/lv_flex.c @@ -140,7 +140,7 @@ void lv_obj_set_flex_grow(struct _lv_obj_t * obj, uint8_t grow) if(!lv_obj_is_layout_positioned(obj)) return; lv_obj_t * parent = lv_obj_get_parent(obj); if(parent->spec_attr->layout_dsc->update_cb != flex_update) return; - const lv_flex_t * f = (const lv_flex_t *) parent->spec_attr->layout_dsc; + const lv_flex_t * f = (const lv_flex_t *)parent->spec_attr->layout_dsc; if(f->dir == LV_FLEX_FLOW_ROW) lv_obj_set_width(obj, (LV_COORD_SET_LAYOUT(grow))); else lv_obj_set_height(obj, (LV_COORD_SET_LAYOUT(grow))); diff --git a/src/extra/widgets/calendar/lv_calendar.c b/src/extra/widgets/calendar/lv_calendar.c index b44a8a19e..ca283ebcf 100644 --- a/src/extra/widgets/calendar/lv_calendar.c +++ b/src/extra/widgets/calendar/lv_calendar.c @@ -64,7 +64,7 @@ lv_obj_t * lv_calendar_create(lv_obj_t * parent) void lv_calendar_set_day_names(lv_obj_t * obj, const char * day_names[]) { - lv_calendar_t * calendar = (lv_calendar_t *) obj; + lv_calendar_t * calendar = (lv_calendar_t *)obj; uint32_t i; for(i = 0; i < 7; i++) { calendar->map[i] = day_names[i]; @@ -73,7 +73,7 @@ void lv_calendar_set_day_names(lv_obj_t * obj, const char * day_names[]) void lv_calendar_set_today_date(lv_obj_t * obj, uint32_t year, uint32_t month, uint32_t day) { - lv_calendar_t * calendar = (lv_calendar_t *) obj; + lv_calendar_t * calendar = (lv_calendar_t *)obj; calendar->today.year = year; calendar->today.month = month; calendar->today.day = day; @@ -85,7 +85,7 @@ void lv_calendar_set_highlighted_dates(lv_obj_t * obj, lv_calendar_date_t highli { LV_ASSERT_NULL(highlighted); - lv_calendar_t * calendar = (lv_calendar_t *) obj; + lv_calendar_t * calendar = (lv_calendar_t *)obj; calendar->highlighted_dates = highlighted; calendar->highlighted_dates_num = date_num; @@ -94,7 +94,7 @@ void lv_calendar_set_highlighted_dates(lv_obj_t * obj, lv_calendar_date_t highli void lv_calendar_set_showed_date(lv_obj_t * obj, uint32_t year, uint32_t month) { - lv_calendar_t * calendar = (lv_calendar_t *) obj; + lv_calendar_t * calendar = (lv_calendar_t *)obj; calendar->showed_date.year = year; calendar->showed_date.month = month; calendar->showed_date.day = 1; @@ -145,7 +145,7 @@ void lv_calendar_set_showed_date(lv_obj_t * obj, uint32_t year, uint32_t month) */ const lv_calendar_date_t * lv_calendar_get_today_date(const lv_obj_t * obj) { - const lv_calendar_t * calendar = (lv_calendar_t *) obj; + const lv_calendar_t * calendar = (lv_calendar_t *)obj; return &calendar->today; } @@ -156,7 +156,7 @@ const lv_calendar_date_t * lv_calendar_get_today_date(const lv_obj_t * obj) */ const lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * obj) { - const lv_calendar_t * calendar = (lv_calendar_t *) obj; + const lv_calendar_t * calendar = (lv_calendar_t *)obj; return &calendar->showed_date; } @@ -167,19 +167,19 @@ const lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * obj) */ lv_calendar_date_t * lv_calendar_get_highlighted_dates(const lv_obj_t * obj) { - lv_calendar_t * calendar = (lv_calendar_t *) obj; + lv_calendar_t * calendar = (lv_calendar_t *)obj; return calendar->highlighted_dates; } uint16_t lv_calendar_get_highlighted_dates_num(const lv_obj_t * obj) { - lv_calendar_t * calendar = (lv_calendar_t *) obj; + lv_calendar_t * calendar = (lv_calendar_t *)obj; return calendar->highlighted_dates_num; } bool lv_calendar_get_pressed_date(const lv_obj_t * obj, lv_calendar_date_t * date) { - lv_calendar_t * calendar = (lv_calendar_t *) obj; + lv_calendar_t * calendar = (lv_calendar_t *)obj; uint16_t d = lv_btnmatrix_get_selected_btn(obj); if(d == LV_BTNMATRIX_BTN_NONE) { date->year = 0; @@ -207,7 +207,7 @@ bool lv_calendar_get_pressed_date(const lv_obj_t * obj, lv_calendar_date_t * dat static void my_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_UNUSED(copy); - lv_calendar_t * calendar = (lv_calendar_t *) obj; + lv_calendar_t * calendar = (lv_calendar_t *)obj; /*Initialize the allocated 'ext' */ calendar->today.year = 2020; @@ -345,7 +345,7 @@ static uint8_t get_day_of_week(uint32_t year, uint32_t month, uint32_t day) static void highlight_update(lv_obj_t * obj) { - lv_calendar_t * calendar = (lv_calendar_t *) obj; + lv_calendar_t * calendar = (lv_calendar_t *)obj; uint16_t i; /*Clear all kind of selection*/ diff --git a/src/extra/widgets/colorwheel/lv_colorwheel.c b/src/extra/widgets/colorwheel/lv_colorwheel.c index 1abcf5cdc..f92c2ef28 100644 --- a/src/extra/widgets/colorwheel/lv_colorwheel.c +++ b/src/extra/widgets/colorwheel/lv_colorwheel.c @@ -94,7 +94,7 @@ bool lv_colorwheel_set_hsv(lv_obj_t * obj, lv_color_hsv_t hsv) if(hsv.s > 100) hsv.s = 100; if(hsv.v > 100) hsv.v = 100; - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; if(colorwheel->hsv.h == hsv.h && colorwheel->hsv.s == hsv.s && colorwheel->hsv.v == hsv.v) return false; @@ -128,7 +128,7 @@ bool lv_colorwheel_set_rgb(lv_obj_t * obj, lv_color_t color) */ void lv_colorwheel_set_mode(lv_obj_t * obj, lv_colorwheel_mode_t mode) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; colorwheel->mode = mode; refr_knob_pos(obj); @@ -142,7 +142,7 @@ void lv_colorwheel_set_mode(lv_obj_t * obj, lv_colorwheel_mode_t mode) */ void lv_colorwheel_set_mode_fixed(lv_obj_t * obj, bool fixed) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; colorwheel->mode_fixed = fixed; } @@ -159,7 +159,7 @@ void lv_colorwheel_set_mode_fixed(lv_obj_t * obj, bool fixed) */ lv_color_hsv_t lv_colorwheel_get_hsv(lv_obj_t * obj) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; return colorwheel->hsv; } @@ -171,7 +171,7 @@ lv_color_hsv_t lv_colorwheel_get_hsv(lv_obj_t * obj) */ lv_color_t lv_colorwheel_get_rgb(lv_obj_t * obj) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; return lv_color_hsv_to_rgb(colorwheel->hsv.h, colorwheel->hsv.s, colorwheel->hsv.v); } @@ -183,7 +183,7 @@ lv_color_t lv_colorwheel_get_rgb(lv_obj_t * obj) */ lv_colorwheel_mode_t lv_colorwheel_get_color_mode(lv_obj_t * obj) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; return colorwheel->mode; } @@ -195,7 +195,7 @@ lv_colorwheel_mode_t lv_colorwheel_get_color_mode(lv_obj_t * obj) */ bool lv_colorwheel_get_color_mode_fixed(lv_obj_t * obj) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; return colorwheel->mode_fixed; } @@ -212,7 +212,7 @@ static void lv_colorwheel_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_UNUSED(copy); - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; colorwheel->hsv.h = 0; colorwheel->hsv.s = 100; colorwheel->hsv.v = 100; @@ -307,7 +307,7 @@ static void draw_disc_grad(lv_obj_t * obj, const lv_area_t * mask) static void draw_knob(lv_obj_t * obj, const lv_area_t * mask) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; lv_draw_rect_dsc_t cir_dsc; lv_draw_rect_dsc_init(&cir_dsc); @@ -333,7 +333,7 @@ static void invalidate_knob(lv_obj_t * obj) static lv_area_t get_knob_area(lv_obj_t * obj) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; /*Get knob's radius*/ uint16_t r = 0; @@ -367,7 +367,7 @@ static lv_res_t lv_colorwheel_signal(lv_obj_t * obj, lv_signal_t sign, void * pa if(res != LV_RES_OK) return res; - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; if(sign == LV_SIGNAL_REFR_EXT_DRAW_SIZE) { lv_coord_t left = lv_obj_get_style_pad_left(obj, LV_PART_KNOB); @@ -536,7 +536,7 @@ static lv_res_t lv_colorwheel_signal(lv_obj_t * obj, lv_signal_t sign, void * pa static void next_color_mode(lv_obj_t * obj) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; colorwheel->mode = (colorwheel->mode + 1) % 3; refr_knob_pos(obj); lv_obj_invalidate(obj); @@ -546,7 +546,7 @@ static void refr_knob_pos(lv_obj_t * obj) { invalidate_knob(obj); - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; lv_coord_t w = lv_obj_get_width(obj); lv_coord_t scale_w = lv_obj_get_style_arc_width(obj, LV_PART_MAIN); @@ -562,7 +562,7 @@ static void refr_knob_pos(lv_obj_t * obj) static lv_res_t double_click_reset(lv_obj_t * obj) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; lv_indev_t * indev = lv_indev_get_act(); /*Double clicked? Use long press time as double click time out*/ if(lv_tick_elaps(colorwheel->last_click_time) < indev->driver.long_press_time) { @@ -676,7 +676,7 @@ static lv_color_t angle_to_mode_color_fast(lv_obj_t * obj, uint16_t angle) static uint16_t get_angle(lv_obj_t * obj) { - lv_colorwheel_t * colorwheel = (lv_colorwheel_t *) obj; + lv_colorwheel_t * colorwheel = (lv_colorwheel_t *)obj; uint16_t angle; switch(colorwheel->mode) { default: diff --git a/src/extra/widgets/imgbtn/lv_imgbtn.c b/src/extra/widgets/imgbtn/lv_imgbtn.c index 37fafc045..4902721ac 100644 --- a/src/extra/widgets/imgbtn/lv_imgbtn.c +++ b/src/extra/widgets/imgbtn/lv_imgbtn.c @@ -88,7 +88,7 @@ void lv_imgbtn_set_src(lv_obj_t * obj, lv_imgbtn_state_t state, const void * src return; } - lv_imgbtn_t * imgbtn = (lv_imgbtn_t *) obj; + lv_imgbtn_t * imgbtn = (lv_imgbtn_t *)obj; imgbtn->img_src_left[state] = src_left; imgbtn->img_src_mid[state] = src_mid; @@ -112,7 +112,7 @@ const void * lv_imgbtn_get_src_left(lv_obj_t * obj, lv_imgbtn_state_t state) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_imgbtn_t * imgbtn = (lv_imgbtn_t *) obj; + lv_imgbtn_t * imgbtn = (lv_imgbtn_t *)obj; return imgbtn->img_src_left[state]; } @@ -126,7 +126,7 @@ const void * lv_imgbtn_get_src_left(lv_obj_t * obj, lv_imgbtn_state_t state) const void * lv_imgbtn_get_src_middle(lv_obj_t * obj, lv_imgbtn_state_t state) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_imgbtn_t * imgbtn = (lv_imgbtn_t *) obj; + lv_imgbtn_t * imgbtn = (lv_imgbtn_t *)obj; return imgbtn->img_src_mid[state]; } @@ -140,7 +140,7 @@ const void * lv_imgbtn_get_src_middle(lv_obj_t * obj, lv_imgbtn_state_t state) const void * lv_imgbtn_get_src_right(lv_obj_t * obj, lv_imgbtn_state_t state) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_imgbtn_t * imgbtn = (lv_imgbtn_t *) obj; + lv_imgbtn_t * imgbtn = (lv_imgbtn_t *)obj; return imgbtn->img_src_right[state]; } @@ -154,7 +154,7 @@ static void lv_imgbtn_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_UNUSED(copy); - lv_imgbtn_t * imgbtn = (lv_imgbtn_t *) obj; + lv_imgbtn_t * imgbtn = (lv_imgbtn_t *)obj; /*Initialize the allocated 'ext' */ lv_memset_00((void *)imgbtn->img_src_mid, sizeof(imgbtn->img_src_mid)); lv_memset_00(imgbtn->img_src_left, sizeof(imgbtn->img_src_left)); @@ -166,7 +166,7 @@ static void lv_imgbtn_constructor(lv_obj_t * obj, const lv_obj_t * copy) static lv_draw_res_t lv_imgbtn_draw(lv_obj_t * obj, const lv_area_t * clip_area, lv_draw_mode_t mode) { - lv_imgbtn_t * imgbtn = (lv_imgbtn_t *) obj; + lv_imgbtn_t * imgbtn = (lv_imgbtn_t *)obj; /*Return false if the object is not covers the mask_p area*/ if(mode == LV_DRAW_MODE_COVER_CHECK) { return LV_DRAW_RES_NOT_COVER; @@ -293,7 +293,7 @@ static lv_res_t lv_imgbtn_signal(lv_obj_t * obj, lv_signal_t sign, void * param) static void refr_img(lv_obj_t * obj) { - lv_imgbtn_t * imgbtn = (lv_imgbtn_t *) obj; + lv_imgbtn_t * imgbtn = (lv_imgbtn_t *)obj; lv_imgbtn_state_t state = suggest_state(obj, get_state(obj)); lv_img_header_t header; @@ -332,7 +332,7 @@ static void refr_img(lv_obj_t * obj) */ static lv_imgbtn_state_t suggest_state(lv_obj_t * obj, lv_imgbtn_state_t state) { - lv_imgbtn_t * imgbtn = (lv_imgbtn_t *) obj; + lv_imgbtn_t * imgbtn = (lv_imgbtn_t *)obj; if(imgbtn->img_src_mid[state] == NULL) { switch(state) { case LV_IMGBTN_STATE_PRESSED: diff --git a/src/extra/widgets/keyboard/lv_keyboard.c b/src/extra/widgets/keyboard/lv_keyboard.c index 93e745c6d..1a2a1b7ed 100644 --- a/src/extra/widgets/keyboard/lv_keyboard.c +++ b/src/extra/widgets/keyboard/lv_keyboard.c @@ -138,7 +138,7 @@ void lv_keyboard_set_textarea(lv_obj_t * obj, lv_obj_t * ta) LV_ASSERT_OBJ(ta, &lv_textarea_class); } - lv_keyboard_t * keyboard = (lv_keyboard_t *) obj; + lv_keyboard_t * keyboard = (lv_keyboard_t *)obj; /*Hide the cursor of the old Text area if cursor management is enabled*/ if(keyboard->ta) { @@ -160,7 +160,7 @@ void lv_keyboard_set_textarea(lv_obj_t * obj, lv_obj_t * ta) */ void lv_keyboard_set_mode(lv_obj_t * obj, lv_keyboard_mode_t mode) { - lv_keyboard_t * keyboard = (lv_keyboard_t *) obj; + lv_keyboard_t * keyboard = (lv_keyboard_t *)obj; if(keyboard->mode == mode) return; keyboard->mode = mode; @@ -193,7 +193,7 @@ void lv_keyboard_set_map(lv_obj_t * obj, lv_keyboard_mode_t mode, const char * m */ lv_obj_t * lv_keyboard_get_textarea(const lv_obj_t * obj) { - lv_keyboard_t * keyboard = (lv_keyboard_t *) obj; + lv_keyboard_t * keyboard = (lv_keyboard_t *)obj; return keyboard->ta; } @@ -204,7 +204,7 @@ lv_obj_t * lv_keyboard_get_textarea(const lv_obj_t * obj) */ lv_keyboard_mode_t lv_keyboard_get_mode(const lv_obj_t * obj) { - lv_keyboard_t * keyboard = (lv_keyboard_t *) obj; + lv_keyboard_t * keyboard = (lv_keyboard_t *)obj; return keyboard->mode; } @@ -223,7 +223,7 @@ void lv_keyboard_def_event_cb(lv_obj_t * obj, lv_event_t event) { if(event != LV_EVENT_VALUE_CHANGED) return; - lv_keyboard_t * keyboard = (lv_keyboard_t *) obj; + lv_keyboard_t * keyboard = (lv_keyboard_t *)obj; uint16_t btn_id = lv_btnmatrix_get_selected_btn(obj); if(btn_id == LV_BTNMATRIX_BTN_NONE) return; if(lv_btnmatrix_has_btn_ctrl(obj, btn_id, LV_BTNMATRIX_CTRL_HIDDEN | LV_BTNMATRIX_CTRL_DISABLED)) return; @@ -325,7 +325,7 @@ static void lv_keyboard_constructor(lv_obj_t * obj, const lv_obj_t * copy) lv_obj_clear_flag(obj, LV_OBJ_FLAG_CLICK_FOCUSABLE); - lv_keyboard_t * keyboard = (lv_keyboard_t *) obj; + lv_keyboard_t * keyboard = (lv_keyboard_t *)obj; keyboard->ta = NULL; keyboard->mode = LV_KEYBOARD_MODE_TEXT_LOWER; @@ -345,7 +345,7 @@ static void lv_keyboard_constructor(lv_obj_t * obj, const lv_obj_t * copy) */ static void lv_keyboard_update_map(lv_obj_t * obj) { - lv_keyboard_t * keyboard = (lv_keyboard_t *) obj; + lv_keyboard_t * keyboard = (lv_keyboard_t *)obj; lv_btnmatrix_set_map(obj, kb_map[keyboard->mode]); lv_btnmatrix_set_ctrl_map(obj, kb_ctrl[keyboard->mode]); } diff --git a/src/extra/widgets/led/lv_led.c b/src/extra/widgets/led/lv_led.c index e90fbffad..11886cebb 100644 --- a/src/extra/widgets/led/lv_led.c +++ b/src/extra/widgets/led/lv_led.c @@ -74,7 +74,7 @@ lv_obj_t * lv_led_create(lv_obj_t * parent) */ void lv_led_set_color(lv_obj_t * obj, lv_color_t color) { - lv_led_t * led = (lv_led_t *) obj; + lv_led_t * led = (lv_led_t *)obj; led->color = color; lv_obj_invalidate(obj); } @@ -86,7 +86,7 @@ void lv_led_set_color(lv_obj_t * obj, lv_color_t color) */ void lv_led_set_brightness(lv_obj_t * obj, uint8_t bright) { - lv_led_t * led = (lv_led_t *) obj; + lv_led_t * led = (lv_led_t *)obj; if(led->bright == bright) return; if(bright <= LV_LED_BRIGHT_MIN) bright = LV_LED_BRIGHT_MIN; @@ -140,7 +140,7 @@ void lv_led_toggle(lv_obj_t * obj) */ uint8_t lv_led_get_brightness(const lv_obj_t * obj) { - lv_led_t * led = (lv_led_t *) obj; + lv_led_t * led = (lv_led_t *)obj; return led->bright; } @@ -151,7 +151,7 @@ uint8_t lv_led_get_brightness(const lv_obj_t * obj) static void lv_led_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_UNUSED(copy); - lv_led_t * led = (lv_led_t *) obj; + lv_led_t * led = (lv_led_t *)obj; led->color = lv_theme_get_color_primary(obj); led->bright = LV_LED_BRIGHT_MAX; led->bright = LV_LED_BRIGHT_MAX; @@ -168,7 +168,7 @@ static lv_draw_res_t lv_led_draw(lv_obj_t * obj, const lv_area_t * clip_area, lv } else if(mode == LV_DRAW_MODE_MAIN_DRAW) { /*Make darker colors in a temporary style according to the brightness*/ - lv_led_t * led = (lv_led_t *) obj; + lv_led_t * led = (lv_led_t *)obj; lv_draw_rect_dsc_t rect_dsc; lv_draw_rect_dsc_init(&rect_dsc); diff --git a/src/extra/widgets/spinbox/lv_spinbox.c b/src/extra/widgets/spinbox/lv_spinbox.c index 9813d7200..c7dbd5653 100644 --- a/src/extra/widgets/spinbox/lv_spinbox.c +++ b/src/extra/widgets/spinbox/lv_spinbox.c @@ -66,7 +66,7 @@ lv_obj_t * lv_spinbox_create(lv_obj_t * parent) */ void lv_spinbox_set_value(lv_obj_t * obj, int32_t i) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; if(i > spinbox->range_max) i = spinbox->range_max; if(i < spinbox->range_min) i = spinbox->range_min; @@ -83,7 +83,7 @@ void lv_spinbox_set_value(lv_obj_t * obj, int32_t i) */ void lv_spinbox_set_rollover(lv_obj_t * obj, bool b) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; spinbox->rollover = b; } @@ -97,7 +97,7 @@ void lv_spinbox_set_rollover(lv_obj_t * obj, bool b) */ void lv_spinbox_set_digit_format(lv_obj_t * obj, uint8_t digit_count, uint8_t separator_position) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; if(digit_count > LV_SPINBOX_MAX_DIGIT_COUNT) digit_count = LV_SPINBOX_MAX_DIGIT_COUNT; @@ -123,7 +123,7 @@ void lv_spinbox_set_digit_format(lv_obj_t * obj, uint8_t digit_count, uint8_t se */ void lv_spinbox_set_step(lv_obj_t * obj, uint32_t step) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; spinbox->step = step; lv_spinbox_updatevalue(obj); @@ -137,7 +137,7 @@ void lv_spinbox_set_step(lv_obj_t * obj, uint32_t step) */ void lv_spinbox_set_range(lv_obj_t * obj, int32_t range_min, int32_t range_max) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; spinbox->range_max = range_max; spinbox->range_min = range_min; @@ -159,7 +159,7 @@ void lv_spinbox_set_range(lv_obj_t * obj, int32_t range_min, int32_t range_max) */ int32_t lv_spinbox_get_value(lv_obj_t * obj) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; return spinbox->value; } @@ -170,7 +170,7 @@ int32_t lv_spinbox_get_value(lv_obj_t * obj) */ int32_t lv_spinbox_get_step(lv_obj_t * obj) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; return spinbox->step; } @@ -185,7 +185,7 @@ int32_t lv_spinbox_get_step(lv_obj_t * obj) */ void lv_spinbox_step_next(lv_obj_t * obj) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; int32_t new_step = spinbox->step / 10; if((new_step) > 0) @@ -202,7 +202,7 @@ void lv_spinbox_step_next(lv_obj_t * obj) */ void lv_spinbox_step_prev(lv_obj_t * obj) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; int32_t step_limit; step_limit = LV_MAX(spinbox->range_max, (spinbox->range_min < 0 ? (-spinbox->range_min) : spinbox->range_min)); int32_t new_step = spinbox->step * 10; @@ -217,7 +217,7 @@ void lv_spinbox_step_prev(lv_obj_t * obj) */ bool lv_spinbox_get_rollover(lv_obj_t * obj) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; return spinbox->rollover; } @@ -228,7 +228,7 @@ bool lv_spinbox_get_rollover(lv_obj_t * obj) */ void lv_spinbox_increment(lv_obj_t * obj) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; if(spinbox->value + spinbox->step <= spinbox->range_max) { /*Special mode when zero crossing*/ @@ -253,7 +253,7 @@ void lv_spinbox_increment(lv_obj_t * obj) */ void lv_spinbox_decrement(lv_obj_t * obj) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; if(spinbox->value - spinbox->step >= spinbox->range_min) { /*Special mode when zero crossing*/ @@ -281,7 +281,7 @@ static void lv_spinbox_constructor(lv_obj_t * obj, const lv_obj_t * copy) LV_LOG_TRACE("begin"); - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; /*Initialize the allocated 'ext'*/ spinbox->value = 0; @@ -308,7 +308,7 @@ static lv_res_t lv_spinbox_signal(lv_obj_t * obj, lv_signal_t sign, void * param res = lv_obj_signal_base(MY_CLASS, obj, sign, param); if(res != LV_RES_OK) return res; - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; if(sign == LV_SIGNAL_RELEASED) { /*If released with an ENCODER then move to the next digit*/ lv_indev_t * indev = lv_indev_get_act(); @@ -391,7 +391,7 @@ static lv_res_t lv_spinbox_signal(lv_obj_t * obj, lv_signal_t sign, void * param static void lv_spinbox_updatevalue(lv_obj_t * obj) { - lv_spinbox_t * spinbox = (lv_spinbox_t *) obj; + lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; char buf[LV_SPINBOX_MAX_DIGIT_COUNT + 8]; lv_memset_00(buf, sizeof(buf)); diff --git a/src/extra/widgets/tabview/lv_tabview.c b/src/extra/widgets/tabview/lv_tabview.c index c14bd09f6..348fb4464 100644 --- a/src/extra/widgets/tabview/lv_tabview.c +++ b/src/extra/widgets/tabview/lv_tabview.c @@ -54,7 +54,7 @@ lv_obj_t * lv_tabview_create(lv_obj_t * parent, lv_dir_t tab_pos, lv_coord_t tab lv_obj_t * lv_tabview_add_tab(lv_obj_t * obj, const char * name) { - lv_tabview_t * tabview = (lv_tabview_t *) obj; + lv_tabview_t * tabview = (lv_tabview_t *)obj; lv_obj_t * cont = lv_tabview_get_content(obj); lv_obj_t * page = lv_obj_create(cont, NULL); @@ -109,7 +109,7 @@ lv_obj_t * lv_tabview_add_tab(lv_obj_t * obj, const char * name) void lv_tabview_set_act(lv_obj_t * obj, uint32_t id, lv_anim_enable_t anim_en) { - lv_tabview_t * tabview = (lv_tabview_t *) obj; + lv_tabview_t * tabview = (lv_tabview_t *)obj; if(id >= tabview->tab_cnt) { id = tabview->tab_cnt - 1; @@ -127,7 +127,7 @@ void lv_tabview_set_act(lv_obj_t * obj, uint32_t id, lv_anim_enable_t anim_en) uint16_t lv_tabview_get_tab_act(lv_obj_t * obj) { - lv_tabview_t * tabview = (lv_tabview_t *) obj; + lv_tabview_t * tabview = (lv_tabview_t *)obj; return tabview->tab_cur; } @@ -148,7 +148,7 @@ lv_obj_t * lv_tabview_get_tab_btns(lv_obj_t * tv) static void lv_tabview_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_UNUSED(copy); - lv_tabview_t * tabview = (lv_tabview_t *) obj; + lv_tabview_t * tabview = (lv_tabview_t *)obj; tabview->tab_pos = tabpos_create; lv_flex_init(&tabview->flex); @@ -210,7 +210,7 @@ static void lv_tabview_constructor(lv_obj_t * obj, const lv_obj_t * copy) static void lv_tabview_destructor(lv_obj_t * obj) { - lv_tabview_t * tabview = (lv_tabview_t *) obj; + lv_tabview_t * tabview = (lv_tabview_t *)obj; uint32_t i; if(tabview->tab_pos & LV_DIR_VER) { diff --git a/src/extra/widgets/tileview/lv_tileview.c b/src/extra/widgets/tileview/lv_tileview.c index 7c604bbb1..d836ead8a 100644 --- a/src/extra/widgets/tileview/lv_tileview.c +++ b/src/extra/widgets/tileview/lv_tileview.c @@ -76,7 +76,7 @@ void lv_obj_set_tile(lv_obj_t * tv, lv_obj_t * tile_obj, lv_anim_enable_t anim_e lv_coord_t tx = lv_obj_get_x(tile_obj); lv_coord_t ty = lv_obj_get_y(tile_obj); - lv_tileview_tile_t * tile = (lv_tileview_tile_t *) tile_obj; + lv_tileview_tile_t * tile = (lv_tileview_tile_t *)tile_obj; lv_obj_set_scroll_dir(tv, tile->dir); lv_obj_scroll_to(tv, tx, ty, anim_en); } @@ -125,7 +125,7 @@ static void lv_tileview_tile_constructor(lv_obj_t * obj, const lv_obj_t * copy) lv_obj_set_size(obj, LV_SIZE_PCT(100), LV_SIZE_PCT(100)); lv_obj_set_pos(obj, create_col_id * lv_obj_get_width_fit(parent), create_row_id * lv_obj_get_height_fit(parent)); - lv_tileview_tile_t * tile = (lv_tileview_tile_t *) obj; + lv_tileview_tile_t * tile = (lv_tileview_tile_t *)obj; tile->dir = create_dir; if(create_col_id == 0 && create_row_id == 0) { @@ -155,7 +155,7 @@ static void tileview_event_cb(lv_obj_t * tv, lv_event_t e) lv_coord_t x = lv_obj_get_x(tile_obj); lv_coord_t y = lv_obj_get_y(tile_obj); if(x == tx && y == ty) { - lv_tileview_tile_t * tile = (lv_tileview_tile_t *) tile_obj; + lv_tileview_tile_t * tile = (lv_tileview_tile_t *)tile_obj; dir = tile->dir; break; } diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index 574f2c177..6399e47ab 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -144,7 +144,7 @@ void lv_init(void) /*Test if the IDE has UTF-8 encoding*/ char * txt = "Á"; - uint8_t * txt_u8 = (uint8_t *) txt; + uint8_t * txt_u8 = (uint8_t *)txt; if(txt_u8[0] != 0xc3 || txt_u8[1] != 0x81 || txt_u8[2] != 0x00) { LV_LOG_WARN("The strings has no UTF-8 encoding. Non-ASCII characters won't be displayed.") } diff --git a/src/lv_core/lv_obj_style_gen.h b/src/lv_core/lv_obj_style_gen.h index 004f63805..b38169f2e 100644 --- a/src/lv_core/lv_obj_style_gen.h +++ b/src/lv_core/lv_obj_style_gen.h @@ -43,7 +43,7 @@ static inline lv_opa_t lv_obj_get_style_opa(const struct _lv_obj_t * obj, uint32 static inline const lv_color_filter_dsc_t * lv_obj_get_style_color_filter_dsc(const struct _lv_obj_t * obj, uint32_t part) { lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_COLOR_FILTER_DSC); - return (const lv_color_filter_dsc_t *) v.ptr; + return (const lv_color_filter_dsc_t *)v.ptr; } static inline lv_opa_t lv_obj_get_style_color_filter_opa(const struct _lv_obj_t * obj, uint32_t part) @@ -579,7 +579,7 @@ static inline void lv_obj_set_style_opa(struct _lv_obj_t * obj, uint32_t part, u static inline void lv_obj_set_style_color_filter_dsc(struct _lv_obj_t * obj, uint32_t part, uint32_t state, const lv_color_filter_dsc_t * value) { lv_style_value_t v = { - .ptr = (void *) value + .ptr = (void *)value }; lv_obj_set_local_style_prop(obj, part, state, LV_STYLE_COLOR_FILTER_DSC, v); } diff --git a/src/lv_draw/lv_draw_blend.c b/src/lv_draw/lv_draw_blend.c index 40a349263..8f3760bbb 100644 --- a/src/lv_draw/lv_draw_blend.c +++ b/src/lv_draw/lv_draw_blend.c @@ -422,7 +422,7 @@ LV_ATTRIBUTE_FAST_MEM static void fill_normal(const lv_area_t * disp_area, lv_co #endif } - uint32_t * mask32 = (uint32_t *) mask_tmp_x; + uint32_t * mask32 = (uint32_t *)mask_tmp_x; for(; x <= x_end4; x += 4) { if(*mask32) { if((*mask32) == 0xFFFFFFFF) { @@ -820,7 +820,7 @@ LV_ATTRIBUTE_FAST_MEM static void map_normal(const lv_area_t * disp_area, lv_col #endif } - uint32_t * mask32 = (uint32_t *) mask_tmp_x; + uint32_t * mask32 = (uint32_t *)mask_tmp_x; for(; x < x_end4; x += 4) { if(*mask32) { if((*mask32) == 0xFFFFFFFF) { diff --git a/src/lv_font/lv_font_fmt_txt.c b/src/lv_font/lv_font_fmt_txt.c index 3b0712b61..64fb35d25 100644 --- a/src/lv_font/lv_font_fmt_txt.c +++ b/src/lv_font/lv_font_fmt_txt.c @@ -80,7 +80,7 @@ const uint8_t * lv_font_get_bitmap_fmt_txt(const lv_font_t * font, uint32_t unic { if(unicode_letter == '\t') unicode_letter = ' '; - lv_font_fmt_txt_dsc_t * fdsc = (lv_font_fmt_txt_dsc_t *) font->dsc; + lv_font_fmt_txt_dsc_t * fdsc = (lv_font_fmt_txt_dsc_t *)font->dsc; uint32_t gid = get_glyph_dsc_id(font, unicode_letter); if(!gid) return NULL; @@ -148,7 +148,7 @@ bool lv_font_get_glyph_dsc_fmt_txt(const lv_font_t * font, lv_font_glyph_dsc_t * unicode_letter = ' '; is_tab = true; } - lv_font_fmt_txt_dsc_t * fdsc = (lv_font_fmt_txt_dsc_t *) font->dsc; + lv_font_fmt_txt_dsc_t * fdsc = (lv_font_fmt_txt_dsc_t *)font->dsc; uint32_t gid = get_glyph_dsc_id(font, unicode_letter); if(!gid) return false; @@ -204,7 +204,7 @@ static uint32_t get_glyph_dsc_id(const lv_font_t * font, uint32_t letter) { if(letter == '\0') return 0; - lv_font_fmt_txt_dsc_t * fdsc = (lv_font_fmt_txt_dsc_t *) font->dsc; + lv_font_fmt_txt_dsc_t * fdsc = (lv_font_fmt_txt_dsc_t *)font->dsc; /*Check the cache first*/ if(letter == fdsc->last_letter) return fdsc->last_glyph_id; @@ -259,7 +259,7 @@ static uint32_t get_glyph_dsc_id(const lv_font_t * font, uint32_t letter) static int8_t get_kern_value(const lv_font_t * font, uint32_t gid_left, uint32_t gid_right) { - lv_font_fmt_txt_dsc_t * fdsc = (lv_font_fmt_txt_dsc_t *) font->dsc; + lv_font_fmt_txt_dsc_t * fdsc = (lv_font_fmt_txt_dsc_t *)font->dsc; int8_t value = 0; diff --git a/src/lv_font/lv_font_loader.c b/src/lv_font/lv_font_loader.c index 861e0cc48..0eb1172f5 100644 --- a/src/lv_font/lv_font_loader.c +++ b/src/lv_font/lv_font_loader.c @@ -117,60 +117,60 @@ lv_font_t * lv_font_load(const char * font_name) void lv_font_free(lv_font_t * font) { if(NULL != font) { - lv_font_fmt_txt_dsc_t * dsc = (lv_font_fmt_txt_dsc_t *) font->dsc; + lv_font_fmt_txt_dsc_t * dsc = (lv_font_fmt_txt_dsc_t *)font->dsc; if(NULL != dsc) { if(dsc->kern_classes == 0) { lv_font_fmt_txt_kern_pair_t * kern_dsc = - (lv_font_fmt_txt_kern_pair_t *) dsc->kern_dsc; + (lv_font_fmt_txt_kern_pair_t *)dsc->kern_dsc; if(NULL != kern_dsc) { if(kern_dsc->glyph_ids) - lv_mem_free((void *) kern_dsc->glyph_ids); + lv_mem_free((void *)kern_dsc->glyph_ids); if(kern_dsc->values) - lv_mem_free((void *) kern_dsc->values); + lv_mem_free((void *)kern_dsc->values); - lv_mem_free((void *) kern_dsc); + lv_mem_free((void *)kern_dsc); } } else { lv_font_fmt_txt_kern_classes_t * kern_dsc = - (lv_font_fmt_txt_kern_classes_t *) dsc->kern_dsc; + (lv_font_fmt_txt_kern_classes_t *)dsc->kern_dsc; if(NULL != kern_dsc) { if(kern_dsc->class_pair_values) - lv_mem_free((void *) kern_dsc->class_pair_values); + lv_mem_free((void *)kern_dsc->class_pair_values); if(kern_dsc->left_class_mapping) - lv_mem_free((void *) kern_dsc->left_class_mapping); + lv_mem_free((void *)kern_dsc->left_class_mapping); if(kern_dsc->right_class_mapping) - lv_mem_free((void *) kern_dsc->right_class_mapping); + lv_mem_free((void *)kern_dsc->right_class_mapping); - lv_mem_free((void *) kern_dsc); + lv_mem_free((void *)kern_dsc); } } lv_font_fmt_txt_cmap_t * cmaps = - (lv_font_fmt_txt_cmap_t *) dsc->cmaps; + (lv_font_fmt_txt_cmap_t *)dsc->cmaps; if(NULL != cmaps) { for(int i = 0; i < dsc->cmap_num; ++i) { if(NULL != cmaps[i].glyph_id_ofs_list) - lv_mem_free((void *) cmaps[i].glyph_id_ofs_list); + lv_mem_free((void *)cmaps[i].glyph_id_ofs_list); if(NULL != cmaps[i].unicode_list) - lv_mem_free((void *) cmaps[i].unicode_list); + lv_mem_free((void *)cmaps[i].unicode_list); } lv_mem_free(cmaps); } if(NULL != dsc->glyph_bitmap) { - lv_mem_free((void *) dsc->glyph_bitmap); + lv_mem_free((void *)dsc->glyph_bitmap); } if(NULL != dsc->glyph_dsc) { - lv_mem_free((void *) dsc->glyph_dsc); + lv_mem_free((void *)dsc->glyph_dsc); } lv_mem_free(dsc); } @@ -278,7 +278,7 @@ static bool load_cmaps_tables(lv_fs_file_t * fp, lv_font_fmt_txt_dsc_t * font_ds case LV_FONT_FMT_TXT_CMAP_SPARSE_FULL: case LV_FONT_FMT_TXT_CMAP_SPARSE_TINY: { uint32_t list_size = sizeof(uint16_t) * cmap_table[i].data_entries_count; - uint16_t * unicode_list = (uint16_t *) lv_mem_alloc(list_size); + uint16_t * unicode_list = (uint16_t *)lv_mem_alloc(list_size); cmap->unicode_list = unicode_list; cmap->list_length = cmap_table[i].data_entries_count; @@ -414,7 +414,7 @@ static int32_t load_glyph(lv_fs_file_t * fp, lv_font_fmt_txt_dsc_t * font_dsc, } } - uint8_t * glyph_bmp = (uint8_t *) lv_mem_alloc(sizeof(uint8_t) * cur_bmp_size); + uint8_t * glyph_bmp = (uint8_t *)lv_mem_alloc(sizeof(uint8_t) * cur_bmp_size); font_dsc->glyph_bitmap = glyph_bmp; diff --git a/src/lv_gpu/lv_gpu_nxp_pxp.c b/src/lv_gpu/lv_gpu_nxp_pxp.c index 98da2cd54..cc3b90966 100644 --- a/src/lv_gpu/lv_gpu_nxp_pxp.c +++ b/src/lv_gpu/lv_gpu_nxp_pxp.c @@ -439,7 +439,7 @@ static void lv_gpu_nxp_pxp_blit_recolor(lv_color_t * dest, lv_coord_t dest_width /* Recolor with transparency */ /* Step 1: Recolor with full opacity to temporary buffer */ - lv_color_t * tmpBuf = (lv_color_t *) lv_mem_buf_get(copy_width * copy_height * sizeof(lv_color_t)); + lv_color_t * tmpBuf = (lv_color_t *)lv_mem_buf_get(copy_width * copy_height * sizeof(lv_color_t)); lv_gpu_nxp_pxp_blit_recolor(tmpBuf, copy_width, src, src_width, copy_width, copy_height, LV_OPA_COVER, recolor, recolorOpa); diff --git a/src/lv_gpu/lv_gpu_nxp_vglite.c b/src/lv_gpu/lv_gpu_nxp_vglite.c index 3ac384c85..4ff7f73d4 100644 --- a/src/lv_gpu/lv_gpu_nxp_vglite.c +++ b/src/lv_gpu/lv_gpu_nxp_vglite.c @@ -289,7 +289,7 @@ static lv_res_t init_vg_buf(vg_lite_buffer_t * dst, uint32_t width, uint32_t hei memset(&dst->yuv, 0, sizeof(dst->yuv)); - dst->memory = (void *) ptr; + dst->memory = (void *)ptr; dst->address = (uint32_t) dst->memory; dst->handle = 0x0; diff --git a/src/lv_misc/lv_ll.c b/src/lv_misc/lv_ll.c index edf213769..e81026a8b 100644 --- a/src/lv_misc/lv_ll.c +++ b/src/lv_misc/lv_ll.c @@ -382,7 +382,7 @@ static void node_set_prev(lv_ll_t * ll_p, lv_ll_node_t * act, lv_ll_node_t * pre { if(act == NULL) return; /*Can't set the prev node of `NULL`*/ - uint8_t * act8 = (uint8_t *) act; + uint8_t * act8 = (uint8_t *)act; act8 += LL_PREV_P_OFFSET(ll_p); @@ -401,7 +401,7 @@ static void node_set_prev(lv_ll_t * ll_p, lv_ll_node_t * act, lv_ll_node_t * pre static void node_set_next(lv_ll_t * ll_p, lv_ll_node_t * act, lv_ll_node_t * next) { if(act == NULL) return; /*Can't set the next node of `NULL`*/ - uint8_t * act8 = (uint8_t *) act; + uint8_t * act8 = (uint8_t *)act; act8 += LL_NEXT_P_OFFSET(ll_p); lv_ll_node_t ** act_node_p = (lv_ll_node_t **) act8; diff --git a/src/lv_misc/lv_mem.c b/src/lv_misc/lv_mem.c index 6a2a8dd4b..1c9229e02 100644 --- a/src/lv_misc/lv_mem.c +++ b/src/lv_misc/lv_mem.c @@ -389,7 +389,7 @@ lv_res_t lv_mem_test(void) LV_LOG_WARN("failed"); return LV_RES_INV; } - uint8_t * e8 = (uint8_t *) e; + uint8_t * e8 = (uint8_t *)e; if(e8 + e->header.s.d_size > work_mem + LV_MEM_SIZE) { LV_LOG_WARN("failed"); return LV_RES_INV; @@ -632,7 +632,7 @@ LV_ATTRIBUTE_FAST_MEM void * lv_memcpy(void * dst, const void * src, size_t len) LV_ATTRIBUTE_FAST_MEM void lv_memset(void * dst, uint8_t v, size_t len) { - uint8_t * d8 = (uint8_t *) dst; + uint8_t * d8 = (uint8_t *)dst; uintptr_t d_align = (lv_uintptr_t) d8 & ALIGN_MASK; @@ -674,7 +674,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_memset(void * dst, uint8_t v, size_t len) */ LV_ATTRIBUTE_FAST_MEM void lv_memset_00(void * dst, size_t len) { - uint8_t * d8 = (uint8_t *) dst; + uint8_t * d8 = (uint8_t *)dst; uintptr_t d_align = (lv_uintptr_t) d8 & ALIGN_MASK; /*Make the address aligned*/ @@ -712,7 +712,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_memset_00(void * dst, size_t len) */ LV_ATTRIBUTE_FAST_MEM void lv_memset_ff(void * dst, size_t len) { - uint8_t * d8 = (uint8_t *) dst; + uint8_t * d8 = (uint8_t *)dst; uintptr_t d_align = (lv_uintptr_t) d8 & ALIGN_MASK; /*Make the address aligned*/ diff --git a/src/lv_misc/lv_style.c b/src/lv_misc/lv_style.c index c6049c645..51a71f43a 100644 --- a/src/lv_misc/lv_style.c +++ b/src/lv_misc/lv_style.c @@ -84,7 +84,7 @@ bool lv_style_remove_prop(lv_style_t * style, lv_style_prop_t prop) } uint8_t * tmp = style->v_p.values_and_props + style->prop_cnt * sizeof(lv_style_value_t); - uint16_t * props = (uint16_t *) tmp; + uint16_t * props = (uint16_t *)tmp; uint32_t i; for(i = 0; i < style->prop_cnt; i++) { if(props[i] == prop) { @@ -95,7 +95,7 @@ bool lv_style_remove_prop(lv_style_t * style, lv_style_prop_t prop) if(new_values_and_props == NULL) return false; tmp = new_values_and_props + style->prop_cnt * sizeof(lv_style_value_t); - uint16_t * new_props = (uint16_t *) tmp; + uint16_t * new_props = (uint16_t *)tmp; lv_style_value_t * new_values = (lv_style_value_t *)new_values_and_props; uint32_t j; @@ -124,7 +124,7 @@ void lv_style_set_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_ if(style->allocated) { uint8_t * tmp = style->v_p.values_and_props + style->prop_cnt * sizeof(lv_style_value_t); - uint16_t * props = (uint16_t *) tmp; + uint16_t * props = (uint16_t *)tmp; int32_t i; for(i = 0; i < style->prop_cnt; i++) { if(props[i] == prop) { @@ -139,7 +139,7 @@ void lv_style_set_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_ uint8_t * values_and_props = lv_mem_realloc(style->v_p.values_and_props, size); if(values_and_props == NULL) return; tmp = values_and_props + (style->prop_cnt - 1) * sizeof(lv_style_value_t); - props = (uint16_t *) tmp; + props = (uint16_t *)tmp; /*Shift all props to make place for the value before them*/ for(i = style->prop_cnt - 2; i >= 0; i--) { props[i + sizeof(lv_style_value_t) /sizeof(uint16_t)] = props[i]; @@ -147,7 +147,7 @@ void lv_style_set_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_ /*Go to the new position wit the props*/ tmp = values_and_props + (style->prop_cnt) * sizeof(lv_style_value_t); - props = (uint16_t *) tmp; + props = (uint16_t *)tmp; lv_style_value_t * values = (lv_style_value_t *)values_and_props; /*Set the new property and value*/ @@ -165,7 +165,7 @@ void lv_style_set_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_value_ uint8_t * values_and_props = lv_mem_alloc(size); if(values_and_props == NULL) return; uint8_t * tmp = values_and_props + (style->prop_cnt) * sizeof(lv_style_value_t); - uint16_t * props = (uint16_t *) tmp; + uint16_t * props = (uint16_t *)tmp; lv_style_value_t * values = (lv_style_value_t *)values_and_props; props[0] = style->prop1; props[1] = prop; diff --git a/src/lv_misc/lv_style.h b/src/lv_misc/lv_style.h index 525a08691..29c591e98 100644 --- a/src/lv_misc/lv_style.h +++ b/src/lv_misc/lv_style.h @@ -342,7 +342,7 @@ static inline bool lv_style_get_prop_inlined(lv_style_t * style, lv_style_prop_t if(style->allocated) { uint8_t * tmp = style->v_p.values_and_props + style->prop_cnt * sizeof(lv_style_value_t); - uint16_t * props = (uint16_t *) tmp; + uint16_t * props = (uint16_t *)tmp; uint32_t i; for(i = 0; i < style->prop_cnt; i++) { if(props[i] == prop) { diff --git a/src/lv_widgets/lv_btnmatrix.c b/src/lv_widgets/lv_btnmatrix.c index 520a7d223..449c3d312 100644 --- a/src/lv_widgets/lv_btnmatrix.c +++ b/src/lv_widgets/lv_btnmatrix.c @@ -373,7 +373,7 @@ static void lv_btnmatrix_constructor(lv_obj_t * obj, const lv_obj_t * copy) } /*Copy an existing object*/ else { - lv_btnmatrix_t * copy_btnm = (lv_btnmatrix_t *) copy; + lv_btnmatrix_t * copy_btnm = (lv_btnmatrix_t *)copy; lv_btnmatrix_set_map(obj, copy_btnm->map_p); lv_btnmatrix_set_ctrl_map(obj, copy_btnm->ctrl_bits); } diff --git a/src/lv_widgets/lv_canvas.c b/src/lv_widgets/lv_canvas.c index 4bff86efc..af2e4cc81 100644 --- a/src/lv_widgets/lv_canvas.c +++ b/src/lv_widgets/lv_canvas.c @@ -80,7 +80,7 @@ void lv_canvas_set_buffer(lv_obj_t * obj, void * buf, lv_coord_t w, lv_coord_t h LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(buf); - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; canvas->dsc.header.cf = cf; canvas->dsc.header.w = w; @@ -94,7 +94,7 @@ void lv_canvas_set_px(lv_obj_t * obj, lv_coord_t x, lv_coord_t y, lv_color_t c) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; lv_img_buf_set_px_color(&canvas->dsc, x, y, c); lv_obj_invalidate(obj); @@ -104,7 +104,7 @@ void lv_canvas_set_palette(lv_obj_t * obj, uint8_t id, lv_color_t c) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; lv_img_buf_set_palette(&canvas->dsc, id, c); lv_obj_invalidate(obj); @@ -118,7 +118,7 @@ lv_color_t lv_canvas_get_px(lv_obj_t * obj, lv_coord_t x, lv_coord_t y) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; lv_color_t color = lv_obj_get_style_img_recolor(obj, LV_PART_MAIN); return lv_img_buf_get_px_color(&canvas->dsc, x, y, color); @@ -128,7 +128,7 @@ lv_img_dsc_t * lv_canvas_get_img(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; return &canvas->dsc; } @@ -141,7 +141,7 @@ void lv_canvas_copy_buf(lv_obj_t * obj, const void * to_copy, lv_coord_t x, lv_c LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(to_copy); - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; if(x + w >= (lv_coord_t)canvas->dsc.header.w || y + h >= (lv_coord_t)canvas->dsc.header.h) { LV_LOG_WARN("lv_canvas_copy_buf: x or y out of the canvas"); @@ -167,7 +167,7 @@ void lv_canvas_transform(lv_obj_t * obj, lv_img_dsc_t * img, int16_t angle, uint LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(img); - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; lv_color_t color = lv_obj_get_style_img_recolor(obj, LV_PART_MAIN); int32_t dest_width = canvas->dsc.header.w; @@ -268,7 +268,7 @@ void lv_canvas_blur_hor(lv_obj_t * obj, const lv_area_t * area, uint16_t r) if(r == 0) return; - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; lv_area_t a; if(area) { @@ -396,7 +396,7 @@ void lv_canvas_blur_ver(lv_obj_t * obj, const lv_area_t * area, uint16_t r) if(r == 0) return; - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; lv_area_t a; if(area) { @@ -897,7 +897,7 @@ static void lv_canvas_constructor(lv_obj_t * obj, const lv_obj_t * copy) LV_UNUSED(copy); LV_TRACE_OBJ_CREATE("begin"); - lv_canvas_t * canvas = (lv_canvas_t *) obj; + lv_canvas_t * canvas = (lv_canvas_t *)obj; /*Initialize the allocated 'ext' */ canvas->dsc.header.always_zero = 0; diff --git a/src/lv_widgets/lv_chart.c b/src/lv_widgets/lv_chart.c index e35348aae..e2427b634 100644 --- a/src/lv_widgets/lv_chart.c +++ b/src/lv_widgets/lv_chart.c @@ -486,7 +486,7 @@ lv_coord_t * lv_chart_get_array(const lv_obj_t * obj, lv_chart_series_t * ser) int32_t lv_chart_get_pressed_point(const lv_obj_t * obj) { - lv_chart_t * chart = (lv_chart_t *) obj; + lv_chart_t * chart = (lv_chart_t *)obj; return chart->pressed_point_id; } @@ -498,7 +498,7 @@ static void lv_chart_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_TRACE_OBJ_CREATE("begin"); - lv_chart_t * chart = (lv_chart_t *) obj; + lv_chart_t * chart = (lv_chart_t *)obj; _lv_ll_init(&chart->series_ll, sizeof(lv_chart_series_t)); @@ -535,7 +535,7 @@ static void lv_chart_constructor(lv_obj_t * obj, const lv_obj_t * copy) static void lv_chart_destructor(lv_obj_t * obj) { - lv_chart_t * chart = (lv_chart_t *) obj; + lv_chart_t * chart = (lv_chart_t *)obj; lv_chart_series_t * ser; while(chart->series_ll.head) { ser = _lv_ll_get_head(&chart->series_ll); diff --git a/src/lv_widgets/lv_checkbox.c b/src/lv_widgets/lv_checkbox.c index a2ca9ade0..ce40614f9 100644 --- a/src/lv_widgets/lv_checkbox.c +++ b/src/lv_widgets/lv_checkbox.c @@ -63,7 +63,7 @@ lv_obj_t * lv_checkbox_create(lv_obj_t * parent, const lv_obj_t * copy) void lv_checkbox_set_text(lv_obj_t * obj, const char * txt) { - lv_checkbox_t * cb = (lv_checkbox_t *) obj; + lv_checkbox_t * cb = (lv_checkbox_t *)obj; #if LV_USE_ARABIC_PERSIAN_CHARS size_t len = _lv_txt_ap_calc_bytes_cnt(txt); #else @@ -85,7 +85,7 @@ void lv_checkbox_set_text(lv_obj_t * obj, const char * txt) void lv_checkbox_set_text_static(lv_obj_t * obj, const char * txt) { - lv_checkbox_t * cb = (lv_checkbox_t *) obj; + lv_checkbox_t * cb = (lv_checkbox_t *)obj; if(!cb->static_txt) lv_mem_free(cb->txt); @@ -101,7 +101,7 @@ void lv_checkbox_set_text_static(lv_obj_t * obj, const char * txt) const char * lv_checkbox_get_text(const lv_obj_t * obj) { - lv_checkbox_t * cb = (lv_checkbox_t *) obj; + lv_checkbox_t * cb = (lv_checkbox_t *)obj; return cb->txt; } @@ -113,7 +113,7 @@ static void lv_checkbox_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_TRACE_OBJ_CREATE("begin"); - lv_checkbox_t * cb = (lv_checkbox_t *) obj; + lv_checkbox_t * cb = (lv_checkbox_t *)obj; /*Init the new checkbox object*/ if(copy == NULL) { @@ -132,7 +132,7 @@ static void lv_checkbox_constructor(lv_obj_t * obj, const lv_obj_t * copy) static void lv_checkbox_destructor(lv_obj_t * obj) { - lv_checkbox_t * cb = (lv_checkbox_t *) obj; + lv_checkbox_t * cb = (lv_checkbox_t *)obj; if(!cb->static_txt) { lv_mem_free(cb->txt); cb->txt = NULL; @@ -148,7 +148,7 @@ static lv_draw_res_t lv_checkbox_draw(lv_obj_t * obj, const lv_area_t * clip_are /*Draw the background*/ lv_obj_draw_base(MY_CLASS, obj, clip_area, mode); - lv_checkbox_t * cb = (lv_checkbox_t *) obj; + lv_checkbox_t * cb = (lv_checkbox_t *)obj; const lv_font_t * font = lv_obj_get_style_text_font(obj, LV_PART_MAIN); lv_coord_t font_h = lv_font_get_line_height(font); @@ -217,7 +217,7 @@ static lv_res_t lv_checkbox_signal(lv_obj_t * obj, lv_signal_t sign, void * para if (sign == LV_SIGNAL_GET_SELF_SIZE) { lv_point_t * p = param; - lv_checkbox_t * cb = (lv_checkbox_t *) obj; + lv_checkbox_t * cb = (lv_checkbox_t *)obj; const lv_font_t * font = lv_obj_get_style_text_font(obj, LV_PART_MAIN); lv_coord_t font_h = lv_font_get_line_height(font); diff --git a/src/lv_widgets/lv_dropdown.c b/src/lv_widgets/lv_dropdown.c index 56b45cb11..1820ff573 100644 --- a/src/lv_widgets/lv_dropdown.c +++ b/src/lv_widgets/lv_dropdown.c @@ -98,7 +98,7 @@ lv_obj_t * lv_dropdown_create(lv_obj_t * parent, const lv_obj_t * copy) void lv_dropdown_set_text(lv_obj_t * obj, const char * txt) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; if(dropdown->text == txt) return; dropdown->text = txt; @@ -111,7 +111,7 @@ void lv_dropdown_set_options(lv_obj_t * obj, const char * options) LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(options); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; /*Count the '\n'-s to determine the number of options*/ dropdown->option_cnt = 0; @@ -155,7 +155,7 @@ void lv_dropdown_set_options_static(lv_obj_t * obj, const char * options) LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(options); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; /*Count the '\n'-s to determine the number of options*/ dropdown->option_cnt = 0; @@ -181,7 +181,7 @@ void lv_dropdown_add_option(lv_obj_t * obj, const char * option, uint32_t pos) LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(option); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; /*Convert static options to dynamic*/ if(dropdown->static_txt != 0) { @@ -249,7 +249,7 @@ void lv_dropdown_add_option(lv_obj_t * obj, const char * option, uint32_t pos) void lv_dropdown_clear_options(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; if(dropdown->options == NULL) return; if(dropdown->static_txt == 0) @@ -266,7 +266,7 @@ void lv_dropdown_set_selected(lv_obj_t * obj, uint16_t sel_opt) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; if(dropdown->sel_opt_id == sel_opt) return; dropdown->sel_opt_id = sel_opt < dropdown->option_cnt ? sel_opt : dropdown->option_cnt - 1; @@ -279,7 +279,7 @@ void lv_dropdown_set_dir(lv_obj_t * obj, lv_dir_t dir) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; if(dropdown->dir == dir) return; dropdown->dir = dir; @@ -291,7 +291,7 @@ void lv_dropdown_set_max_height(lv_obj_t * obj, lv_coord_t h) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; if(dropdown->max_height == h) return; dropdown->max_height = h; @@ -301,7 +301,7 @@ void lv_dropdown_set_symbol(lv_obj_t * obj, const void * symbol) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; dropdown->symbol = symbol; lv_obj_invalidate(obj); } @@ -310,7 +310,7 @@ void lv_dropdown_set_selected_highlight(lv_obj_t * obj, bool en) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; dropdown->selected_highlight = en; if(dropdown->list) lv_obj_invalidate(dropdown->list); } @@ -322,7 +322,7 @@ void lv_dropdown_set_selected_highlight(lv_obj_t * obj, bool en) lv_obj_t * lv_dropdown_get_list(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; return dropdown->list; @@ -331,7 +331,7 @@ lv_obj_t * lv_dropdown_get_list(lv_obj_t * obj) const char * lv_dropdown_get_text(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; return dropdown->text; } @@ -340,7 +340,7 @@ const char * lv_dropdown_get_options(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; return dropdown->options; } @@ -348,7 +348,7 @@ uint16_t lv_dropdown_get_selected(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; return dropdown->sel_opt_id; } @@ -357,7 +357,7 @@ uint16_t lv_dropdown_get_option_cnt(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; return dropdown->option_cnt; } @@ -366,7 +366,7 @@ void lv_dropdown_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; uint32_t i; uint32_t line = 0; @@ -391,28 +391,28 @@ void lv_dropdown_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf lv_coord_t lv_dropdown_get_max_height(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; return dropdown->max_height; } const char * lv_dropdown_get_symbol(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; return dropdown->symbol; } bool lv_dropdown_get_selected_highlight(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; return dropdown->selected_highlight; } lv_dir_t lv_dropdown_get_dir(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; return dropdown->dir; } @@ -422,7 +422,7 @@ lv_dir_t lv_dropdown_get_dir(const lv_obj_t * obj) void lv_dropdown_open(lv_obj_t * dropdown_obj) { - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; lv_obj_add_state(dropdown_obj, LV_STATE_CHECKED); @@ -517,7 +517,7 @@ void lv_dropdown_open(lv_obj_t * dropdown_obj) void lv_dropdown_close(lv_obj_t * obj) { lv_obj_clear_state(obj, LV_STATE_CHECKED); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; dropdown->pr_opt_id = LV_DROPDOWN_PR_NONE; if(dropdown->list) lv_obj_del(dropdown->list); @@ -536,7 +536,7 @@ static void lv_dropdown_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_TRACE_OBJ_CREATE("begin"); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; /*Initialize the allocated 'ext' */ dropdown->list = NULL; @@ -579,7 +579,7 @@ static void lv_dropdown_constructor(lv_obj_t * obj, const lv_obj_t * copy) static void lv_dropdown_destructor(lv_obj_t * obj) { - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; if(dropdown->list) { lv_obj_del(dropdown->list); @@ -602,7 +602,7 @@ static lv_draw_res_t lv_dropdown_draw(lv_obj_t * obj, const lv_area_t * clip_are else if(mode == LV_DRAW_MODE_MAIN_DRAW) { lv_obj_draw_base(MY_CLASS, obj, clip_area, mode); - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; lv_coord_t left = lv_obj_get_style_pad_left(obj, LV_PART_MAIN); lv_coord_t right = lv_obj_get_style_pad_right(obj, LV_PART_MAIN); @@ -732,7 +732,7 @@ static lv_draw_res_t lv_dropdown_list_draw(lv_obj_t * list_obj, const lv_area_t lv_dropdown_list_t * list = (lv_dropdown_list_t *)list_obj; lv_obj_t * dropdown_obj = list->dropdown; - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; /*Draw the box labels if the list is not being deleted*/ if(dropdown->list) { @@ -779,7 +779,7 @@ static void lv_dropdown_list_destructor(lv_obj_t * list_obj) { lv_dropdown_list_t * list = (lv_dropdown_list_t *)list_obj; lv_obj_t * dropdown_obj = list->dropdown; - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; dropdown->list = NULL; } @@ -791,7 +791,7 @@ static lv_res_t lv_dropdown_signal(lv_obj_t * obj, lv_signal_t sign, void * para res = lv_obj_signal_base(MY_CLASS, obj, sign, param); if(res != LV_RES_OK) return res; - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; if(sign == LV_SIGNAL_FOCUS) { lv_group_t * g = lv_obj_get_group(obj); @@ -891,7 +891,7 @@ static lv_res_t lv_dropdown_list_signal(lv_obj_t * list, lv_signal_t sign, void if(res != LV_RES_OK) return res; lv_obj_t * dropdown_obj = ((lv_dropdown_list_t *)list)->dropdown; - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; if(sign == LV_SIGNAL_RELEASED) { if(lv_indev_get_scroll_obj(lv_indev_get_act()) == NULL) { @@ -912,7 +912,7 @@ static void draw_box(lv_obj_t * dropdown_obj, const lv_area_t * clip_area, uint1 { if(id == LV_DROPDOWN_PR_NONE) return; - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; lv_obj_t * list_obj = dropdown->list; lv_state_t state_orig = list_obj->state; @@ -948,7 +948,7 @@ static void draw_box_label(lv_obj_t * dropdown_obj, const lv_area_t * clip_area, { if(id == LV_DROPDOWN_PR_NONE) return; - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; lv_obj_t * list_obj = dropdown->list; lv_state_t state_orig = list_obj->state; @@ -993,7 +993,7 @@ static lv_res_t list_release_handler(lv_obj_t * list_obj) { lv_dropdown_list_t * list = (lv_dropdown_list_t*) list_obj; lv_obj_t * dropdown_obj = list->dropdown; - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; lv_indev_t * indev = lv_indev_get_act(); /*Leave edit mode once a new item is selected*/ @@ -1029,7 +1029,7 @@ static void page_press_handler(lv_obj_t * list_obj) { lv_dropdown_list_t * list = (lv_dropdown_list_t*) list_obj; lv_obj_t * dropdown_obj = list->dropdown; - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; lv_indev_t * indev = lv_indev_get_act(); if(indev && (lv_indev_get_type(indev) == LV_INDEV_TYPE_POINTER || lv_indev_get_type(indev) == LV_INDEV_TYPE_BUTTON)) { @@ -1042,7 +1042,7 @@ static void page_press_handler(lv_obj_t * list_obj) static uint16_t get_id_on_point(lv_obj_t * dropdown_obj, lv_coord_t y) { - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; lv_obj_t * label = get_label(dropdown_obj); if(label == NULL) return 0; y -= label->coords.y1; @@ -1066,7 +1066,7 @@ static uint16_t get_id_on_point(lv_obj_t * dropdown_obj, lv_coord_t y) */ static void position_to_selected(lv_obj_t * dropdown_obj) { - lv_dropdown_t * dropdown = (lv_dropdown_t *) dropdown_obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; lv_obj_t * label = get_label(dropdown_obj); if(label == NULL) return; @@ -1086,7 +1086,7 @@ static void position_to_selected(lv_obj_t * dropdown_obj) static lv_obj_t * get_label(const lv_obj_t * obj) { - lv_dropdown_t * dropdown = (lv_dropdown_t *) obj; + lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; if(dropdown->list == NULL) return NULL; return lv_obj_get_child(dropdown->list, 0); diff --git a/src/lv_widgets/lv_img.c b/src/lv_widgets/lv_img.c index e9a9642be..12ad9d44c 100644 --- a/src/lv_widgets/lv_img.c +++ b/src/lv_widgets/lv_img.c @@ -388,7 +388,7 @@ static void lv_img_constructor(lv_obj_t * obj, const lv_obj_t * copy) if(obj->parent) lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); } else { - lv_img_t * copy_img = (lv_img_t *) copy; + lv_img_t * copy_img = (lv_img_t *)copy; img->zoom = copy_img->zoom; img->angle = copy_img->angle; img->antialias = copy_img->antialias; diff --git a/src/lv_widgets/lv_line.c b/src/lv_widgets/lv_line.c index 2cefa69d1..44a9d5dbc 100644 --- a/src/lv_widgets/lv_line.c +++ b/src/lv_widgets/lv_line.c @@ -65,7 +65,7 @@ void lv_line_set_points(lv_obj_t * obj, const lv_point_t points[], uint16_t poin { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_line_t * line = (lv_line_t *) obj; + lv_line_t * line = (lv_line_t *)obj; line->point_array = points; line->point_num = point_num; @@ -78,7 +78,7 @@ void lv_line_set_y_invert(lv_obj_t * obj, bool en) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_line_t * line = (lv_line_t *) obj; + lv_line_t * line = (lv_line_t *)obj; if(line->y_inv == en) return; line->y_inv = en == false ? 0 : 1; @@ -94,7 +94,7 @@ bool lv_line_get_y_invert(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_line_t * line = (lv_line_t *) obj; + lv_line_t * line = (lv_line_t *)obj; return line->y_inv == 0 ? false : true; } @@ -107,7 +107,7 @@ static void lv_line_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_TRACE_OBJ_CREATE("begin"); - lv_line_t * line = (lv_line_t *) obj; + lv_line_t * line = (lv_line_t *)obj; line->point_num = 0; line->point_array = NULL; @@ -121,7 +121,7 @@ static void lv_line_constructor(lv_obj_t * obj, const lv_obj_t * copy) } /*Copy an existing object*/ else { - lv_line_t * copy_line = (lv_line_t *) copy; + lv_line_t * copy_line = (lv_line_t *)copy; lv_line_set_y_invert(obj, lv_line_get_y_invert(copy)); lv_line_set_points(obj, copy_line->point_array, copy_line->point_num); @@ -137,7 +137,7 @@ static lv_draw_res_t lv_line_draw(lv_obj_t * obj, const lv_area_t * clip_area, l return LV_DRAW_RES_NOT_COVER; else if(mode == LV_DRAW_MODE_MAIN_DRAW) { lv_obj_draw_base(MY_CLASS, obj, clip_area, mode); - lv_line_t * line = (lv_line_t *) obj; + lv_line_t * line = (lv_line_t *)obj; if(line->point_num == 0 || line->point_array == NULL) return false; @@ -192,7 +192,7 @@ static lv_res_t lv_line_signal(lv_obj_t * obj, lv_signal_t sign, void * param) if(*s < line_width) *s = line_width; } else if(sign == LV_SIGNAL_GET_SELF_SIZE) { - lv_line_t * line = (lv_line_t *) obj; + lv_line_t * line = (lv_line_t *)obj; lv_point_t * p = param; lv_coord_t w = 0; diff --git a/src/lv_widgets/lv_meter.c b/src/lv_widgets/lv_meter.c index 5168d2645..d77480639 100644 --- a/src/lv_widgets/lv_meter.c +++ b/src/lv_widgets/lv_meter.c @@ -212,7 +212,7 @@ static void lv_meter_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_TRACE_OBJ_CREATE("begin"); - lv_meter_t * meter = (lv_meter_t *) obj; + lv_meter_t * meter = (lv_meter_t *)obj; _lv_ll_init(&meter->scale_ll, sizeof(lv_meter_scale_t)); diff --git a/src/lv_widgets/lv_roller.c b/src/lv_widgets/lv_roller.c index 5aca9135b..7e8859a3f 100644 --- a/src/lv_widgets/lv_roller.c +++ b/src/lv_widgets/lv_roller.c @@ -306,7 +306,7 @@ static void lv_roller_constructor(lv_obj_t * obj, const lv_obj_t * copy) } else { lv_obj_create_from_class(&lv_roller_label_class, obj, NULL); - lv_roller_t * copy_roller = (lv_roller_t *) copy; + lv_roller_t * copy_roller = (lv_roller_t *)copy; roller->mode = copy_roller->mode; roller->option_cnt = copy_roller->option_cnt; roller->sel_opt_id = copy_roller->sel_opt_id; diff --git a/src/lv_widgets/lv_table.c b/src/lv_widgets/lv_table.c index e9f8c3801..638996532 100644 --- a/src/lv_widgets/lv_table.c +++ b/src/lv_widgets/lv_table.c @@ -73,7 +73,7 @@ void lv_table_set_cell_value(lv_obj_t * obj, uint16_t row, uint16_t col, const c LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(txt); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; /*Auto expand*/ if(col >= table->col_cnt) lv_table_set_col_cnt(obj, col + 1); @@ -109,7 +109,7 @@ void lv_table_set_cell_value_fmt(lv_obj_t * obj, uint16_t row, uint16_t col, con LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(fmt); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; if(col >= table->col_cnt) { LV_LOG_WARN("lv_table_set_cell_value: invalid column"); return; @@ -179,7 +179,7 @@ void lv_table_set_row_cnt(lv_obj_t * obj, uint16_t row_cnt) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; uint16_t old_row_cnt = table->row_cnt; table->row_cnt = row_cnt; @@ -205,7 +205,7 @@ void lv_table_set_col_cnt(lv_obj_t * obj, uint16_t col_cnt) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; uint16_t old_col_cnt = table->col_cnt; table->col_cnt = col_cnt; table->col_w = lv_mem_realloc(table->col_w, col_cnt * sizeof(table->row_h[0])); @@ -249,7 +249,7 @@ void lv_table_set_col_width(lv_obj_t * obj, uint16_t col_id, lv_coord_t w) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; /*Auto expand*/ if(col_id >= table->col_cnt) lv_table_set_col_cnt(obj, col_id + 1); @@ -262,7 +262,7 @@ void lv_table_add_cell_ctrl(lv_obj_t * obj, uint16_t row, uint16_t col, lv_table { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; /*Auto expand*/ if(col >= table->col_cnt) lv_table_set_col_cnt(obj, col + 1); @@ -286,7 +286,7 @@ void lv_table_clear_cell_ctrl(lv_obj_t * obj, uint16_t row, uint16_t col, lv_tab { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; /*Auto expand*/ if(col >= table->col_cnt) lv_table_set_col_cnt(obj, col + 1); @@ -314,7 +314,7 @@ const char * lv_table_get_cell_value(lv_obj_t * obj, uint16_t row, uint16_t col) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; if(row >= table->row_cnt || col >= table->col_cnt) { LV_LOG_WARN("lv_table_set_cell_value: invalid row or column"); return ""; @@ -330,7 +330,7 @@ uint16_t lv_table_get_row_cnt(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; return table->row_cnt; } @@ -338,7 +338,7 @@ uint16_t lv_table_get_col_cnt(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; return table->col_cnt; } @@ -346,7 +346,7 @@ lv_coord_t lv_table_get_col_width(lv_obj_t * obj, uint16_t col) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; if(col >= table->col_cnt) { LV_LOG_WARN("lv_table_set_col_width: too big 'col_id'. Must be < LV_TABLE_COL_MAX."); @@ -360,7 +360,7 @@ bool lv_table_has_cell_ctrl(lv_obj_t * obj, uint16_t row, uint16_t col, lv_table { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; if(row >= table->row_cnt || col >= table->col_cnt) { LV_LOG_WARN("lv_table_get_cell_crop: invalid row or column"); return false; @@ -373,7 +373,7 @@ bool lv_table_has_cell_ctrl(lv_obj_t * obj, uint16_t row, uint16_t col, lv_table void lv_table_get_selected_cell(lv_obj_t * obj, uint16_t * row, uint16_t * col) { - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; *row = table->row_act; *col = table->col_act; } @@ -386,7 +386,7 @@ static void lv_table_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_TRACE_OBJ_CREATE("begin"); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; /*Initialize the allocated 'ext' */ table->cell_data = NULL; @@ -410,7 +410,7 @@ static void lv_table_constructor(lv_obj_t * obj, const lv_obj_t * copy) } /*Copy an existing table*/ else { - lv_table_t * copy_table = (lv_table_t *) copy; + lv_table_t * copy_table = (lv_table_t *)copy; lv_table_set_row_cnt(obj, copy_table->row_cnt); lv_table_set_col_cnt(obj, copy_table->col_cnt); } @@ -420,7 +420,7 @@ static void lv_table_constructor(lv_obj_t * obj, const lv_obj_t * copy) static void lv_table_destructor(lv_obj_t * obj) { - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; /*Free the cell texts*/ uint16_t i; for(i = 0; i < table->col_cnt * table->row_cnt; i++) { @@ -445,7 +445,7 @@ static lv_draw_res_t lv_table_draw(lv_obj_t * obj, const lv_area_t * clip_area, /*Draw the background*/ lv_obj_draw_base(MY_CLASS, obj, clip_area, mode); - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; lv_point_t txt_size; lv_area_t cell_area; @@ -637,7 +637,7 @@ static lv_res_t lv_table_signal(lv_obj_t * obj, lv_signal_t sign, void * param) res = lv_obj_signal_base(MY_CLASS, obj, sign, param); if(res != LV_RES_OK) return res; - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; if(sign == LV_SIGNAL_STYLE_CHG) { refr_size(obj); @@ -719,7 +719,7 @@ static lv_res_t lv_table_signal(lv_obj_t * obj, lv_signal_t sign, void * param) static void refr_size(lv_obj_t * obj) { - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; uint32_t i; @@ -744,7 +744,7 @@ static lv_coord_t get_row_height(lv_obj_t * obj, uint16_t row_id, const lv_font_ lv_coord_t letter_space, lv_coord_t line_space, lv_coord_t cell_left, lv_coord_t cell_right, lv_coord_t cell_top, lv_coord_t cell_bottom) { - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; lv_point_t txt_size; lv_coord_t txt_w; @@ -800,7 +800,7 @@ static lv_coord_t get_row_height(lv_obj_t * obj, uint16_t row_id, const lv_font_ static lv_res_t get_pressed_cell(lv_obj_t * obj, uint16_t * row, uint16_t * col) { - lv_table_t * table = (lv_table_t *) obj; + lv_table_t * table = (lv_table_t *)obj; lv_indev_type_t type = lv_indev_get_type(lv_indev_get_act()); if(type != LV_INDEV_TYPE_POINTER && type != LV_INDEV_TYPE_BUTTON) { diff --git a/src/lv_widgets/lv_textarea.c b/src/lv_widgets/lv_textarea.c index ad4b17ff0..fbbd6b7cf 100644 --- a/src/lv_widgets/lv_textarea.c +++ b/src/lv_widgets/lv_textarea.c @@ -109,7 +109,7 @@ void lv_textarea_add_char(lv_obj_t * obj, uint32_t c) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; const char * letter_buf; @@ -193,7 +193,7 @@ void lv_textarea_add_text(lv_obj_t * obj, const char * txt) LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(txt); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(ta->pwd_mode != 0) pwd_char_hider(obj); /*Make sure all the current text contains only '*'*/ @@ -262,7 +262,7 @@ void lv_textarea_del_char(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; uint32_t cur_pos = ta->cursor.pos; if(cur_pos == 0) return; @@ -329,7 +329,7 @@ void lv_textarea_set_text(lv_obj_t * obj, const char * txt) LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(txt); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; /*Clear the existing selection*/ lv_textarea_clear_selection(obj); @@ -398,7 +398,7 @@ void lv_textarea_set_placeholder_text(lv_obj_t * obj, const char * txt) LV_ASSERT_OBJ(obj, MY_CLASS); LV_ASSERT_NULL(txt); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; size_t txt_len = strlen(txt); @@ -440,7 +440,7 @@ void lv_textarea_set_cursor_pos(lv_obj_t * obj, int32_t pos) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if((uint32_t)ta->cursor.pos == (uint32_t)pos) return; uint32_t len = _lv_txt_get_encoded_length(lv_label_get_text(ta->label)); @@ -487,7 +487,7 @@ void lv_textarea_set_cursor_click_pos(lv_obj_t * obj, bool en) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; ta->cursor.click_pos = en ? 1 : 0; } @@ -500,7 +500,7 @@ void lv_textarea_set_password_mode(lv_obj_t * obj, bool en) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(ta->pwd_mode == en) return; ta->pwd_mode = en == false ? 0 : 1; @@ -538,7 +538,7 @@ void lv_textarea_set_one_line(lv_obj_t * obj, bool en) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(ta->one_line == en) return; if(en) { @@ -568,7 +568,7 @@ void lv_textarea_set_accepted_chars(lv_obj_t * obj, const char * list) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; ta->accepted_chars = list; } @@ -582,7 +582,7 @@ void lv_textarea_set_max_length(lv_obj_t * obj, uint32_t num) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; ta->max_length = num; } @@ -613,7 +613,7 @@ void lv_textarea_set_text_sel(lv_obj_t * obj, bool en) LV_ASSERT_OBJ(obj, MY_CLASS); #if LV_LABEL_TEXT_SEL - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; ta->text_sel_en = en; @@ -633,7 +633,7 @@ void lv_textarea_set_password_show_time(lv_obj_t * obj, uint16_t time) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; ta->pwd_show_time = time; } @@ -650,7 +650,7 @@ const char * lv_textarea_get_text(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; const char * txt; if(ta->pwd_mode == 0) { @@ -672,7 +672,7 @@ const char * lv_textarea_get_placeholder_text(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(ta->placeholder_txt) return ta->placeholder_txt; else return ""; } @@ -686,7 +686,7 @@ lv_obj_t * lv_textarea_get_label(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; return ta->label; } @@ -699,7 +699,7 @@ uint32_t lv_textarea_get_cursor_pos(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; return ta->cursor.pos; } @@ -712,7 +712,7 @@ bool lv_textarea_get_cursor_click_pos(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; return ta->cursor.click_pos ? true : false; } @@ -725,7 +725,7 @@ bool lv_textarea_get_password_mode(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; return ta->pwd_mode == 0 ? false : true; } @@ -738,7 +738,7 @@ bool lv_textarea_get_one_line(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; return ta->one_line == 0 ? false : true; } @@ -751,7 +751,7 @@ const char * lv_textarea_get_accepted_chars(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; return ta->accepted_chars; } @@ -765,7 +765,7 @@ uint32_t lv_textarea_get_max_length(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; return ta->max_length; } @@ -779,7 +779,7 @@ bool lv_textarea_text_is_selected(const lv_obj_t * obj) LV_ASSERT_OBJ(obj, MY_CLASS); #if LV_LABEL_TEXT_SEL - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if((lv_label_get_text_sel_start(ta->label) == LV_DRAW_LABEL_NO_TXT_SEL || lv_label_get_text_sel_end(ta->label) == LV_DRAW_LABEL_NO_TXT_SEL)) { @@ -804,7 +804,7 @@ bool lv_textarea_get_text_sel_en(lv_obj_t * obj) LV_ASSERT_OBJ(obj, MY_CLASS); #if LV_LABEL_TEXT_SEL - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; return ta->text_sel_en; #else (void)obj; /*Unused*/ @@ -821,7 +821,7 @@ uint16_t lv_textarea_get_password_show_time(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; return ta->pwd_show_time; } @@ -839,7 +839,7 @@ void lv_textarea_clear_selection(lv_obj_t * obj) LV_ASSERT_OBJ(obj, MY_CLASS); #if LV_LABEL_TEXT_SEL - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(lv_label_get_text_sel_start(ta->label) != LV_DRAW_LABEL_NO_TXT_SEL || lv_label_get_text_sel_end(ta->label) != LV_DRAW_LABEL_NO_TXT_SEL) { @@ -887,7 +887,7 @@ void lv_textarea_cursor_down(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; lv_point_t pos; /*Get the position of the current letter*/ @@ -920,7 +920,7 @@ void lv_textarea_cursor_up(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; lv_point_t pos; /*Get the position of the current letter*/ @@ -948,7 +948,7 @@ static void lv_textarea_constructor(lv_obj_t * obj, const lv_obj_t * copy) { LV_TRACE_OBJ_CREATE("begin"); - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; ta->pwd_mode = 0; ta->pwd_tmp = NULL; @@ -977,7 +977,7 @@ static void lv_textarea_constructor(lv_obj_t * obj, const lv_obj_t * copy) /*Copy an existing object*/ else { - lv_textarea_t * copy_ta = (lv_textarea_t *) copy; + lv_textarea_t * copy_ta = (lv_textarea_t *)copy; ta->label = lv_label_create(obj, copy_ta->label); ta->pwd_mode = copy_ta->pwd_mode; ta->accepted_chars = copy_ta->accepted_chars; @@ -1011,7 +1011,7 @@ static void lv_textarea_constructor(lv_obj_t * obj, const lv_obj_t * copy) static void lv_textarea_destructor(lv_obj_t * obj) { - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(ta->pwd_tmp != NULL) { lv_mem_free(ta->pwd_tmp); ta->pwd_tmp = NULL; @@ -1055,7 +1055,7 @@ static lv_res_t lv_textarea_signal(lv_obj_t * obj, lv_signal_t sign, void * para res = lv_obj_signal_base(MY_CLASS, obj, sign, param); if(res != LV_RES_OK) return res; - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(sign == LV_SIGNAL_STYLE_CHG) { if(ta->label) { @@ -1133,7 +1133,7 @@ static lv_res_t lv_textarea_signal(lv_obj_t * obj, lv_signal_t sign, void * para */ static void cursor_blink_anim_cb(void * obj, int32_t show) { - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(show != ta->cursor.show) { ta->cursor.show = show == 0 ? 0 : 1; lv_area_t area_tmp; @@ -1175,7 +1175,7 @@ static void pwd_char_hider_anim_ready(lv_anim_t * a) */ static void pwd_char_hider(lv_obj_t * obj) { - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(ta->pwd_mode != 0) { char * txt = lv_label_get_text(ta->label); int32_t enc_len = _lv_txt_get_encoded_length(txt); @@ -1213,7 +1213,7 @@ static void pwd_char_hider(lv_obj_t * obj) */ static bool char_is_accepted(lv_obj_t * obj, uint32_t c) { - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; /*If no restriction accept it*/ if(ta->accepted_chars == NULL && ta->max_length == 0) return true; @@ -1241,7 +1241,7 @@ static bool char_is_accepted(lv_obj_t * obj, uint32_t c) static void start_cursor_blink(lv_obj_t * obj) { - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; uint32_t blink_time = lv_obj_get_style_anim_time(obj, LV_PART_MARKER); if(blink_time == 0) { lv_anim_del(obj, cursor_blink_anim_cb); @@ -1266,7 +1266,7 @@ static void start_cursor_blink(lv_obj_t * obj) static void refr_cursor_area(lv_obj_t * obj) { - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; const lv_font_t * font = lv_obj_get_style_text_font(obj, LV_PART_MAIN); lv_coord_t line_space = lv_obj_get_style_text_line_space(obj, LV_PART_MAIN); @@ -1351,7 +1351,7 @@ static void update_cursor_position_on_click(lv_obj_t * obj, lv_signal_t sign, lv { if(click_source == NULL) return; - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; if(ta->cursor.click_pos == 0) return; if(lv_indev_get_type(click_source) == LV_INDEV_TYPE_KEYPAD || @@ -1376,7 +1376,7 @@ static void update_cursor_position_on_click(lv_obj_t * obj, lv_signal_t sign, lv uint16_t char_id_at_click; #if LV_LABEL_TEXT_SEL - lv_label_t * label_data = (lv_label_t *) ta->label; + lv_label_t * label_data = (lv_label_t *)ta->label; bool click_outside_label; /*Check if the click happened on the left side of the area outside the label*/ if(rel_pos.x < 0) { @@ -1479,7 +1479,7 @@ static lv_res_t insert_handler(lv_obj_t * obj, const char * txt) static void draw_placeholder(lv_obj_t * obj, const lv_area_t * clip_area) { - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; const char * txt = lv_label_get_text(ta->label); /*Draw the place holder*/ @@ -1504,7 +1504,7 @@ static void draw_placeholder(lv_obj_t * obj, const lv_area_t * clip_area) static void draw_cursor(lv_obj_t * obj, const lv_area_t * clip_area) { - lv_textarea_t * ta = (lv_textarea_t *) obj; + lv_textarea_t * ta = (lv_textarea_t *)obj; const char * txt = lv_label_get_text(ta->label); if(ta->cursor.show == 0) return; diff --git a/tests/lv_test_core/lv_test_font_loader.c b/tests/lv_test_core/lv_test_font_loader.c index 7722988ef..9d9f38299 100644 --- a/tests/lv_test_core/lv_test_font_loader.c +++ b/tests/lv_test_core/lv_test_font_loader.c @@ -75,8 +75,8 @@ static int compare_fonts(lv_font_t * f1, lv_font_t * f2) #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) lv_test_assert_int_eq(f1->subpx, f2->subpx, "subpx"); #endif - lv_font_fmt_txt_dsc_t * dsc1 = (lv_font_fmt_txt_dsc_t *) f1->dsc; - lv_font_fmt_txt_dsc_t * dsc2 = (lv_font_fmt_txt_dsc_t *) f2->dsc; + lv_font_fmt_txt_dsc_t * dsc1 = (lv_font_fmt_txt_dsc_t *)f1->dsc; + lv_font_fmt_txt_dsc_t * dsc2 = (lv_font_fmt_txt_dsc_t *)f2->dsc; lv_test_assert_int_eq(dsc1->kern_scale, dsc2->kern_scale, "kern_scale"); lv_test_assert_int_eq(dsc1->cmap_num, dsc2->cmap_num, "cmap_num"); @@ -87,8 +87,8 @@ static int compare_fonts(lv_font_t * f1, lv_font_t * f2) // cmaps int total_glyphs = 0; for(int i = 0; i < dsc1->cmap_num; ++i) { - lv_font_fmt_txt_cmap_t * cmaps1 = (lv_font_fmt_txt_cmap_t *) &dsc1->cmaps[i]; - lv_font_fmt_txt_cmap_t * cmaps2 = (lv_font_fmt_txt_cmap_t *) &dsc2->cmaps[i]; + lv_font_fmt_txt_cmap_t * cmaps1 = (lv_font_fmt_txt_cmap_t *)&dsc1->cmaps[i]; + lv_font_fmt_txt_cmap_t * cmaps2 = (lv_font_fmt_txt_cmap_t *)&dsc2->cmaps[i]; lv_test_assert_int_eq(cmaps1->range_start, cmaps2->range_start, "range_start"); lv_test_assert_int_eq(cmaps1->range_length, cmaps2->range_length, "range_length"); @@ -100,8 +100,8 @@ static int compare_fonts(lv_font_t * f1, lv_font_t * f2) lv_test_assert_true(cmaps1->unicode_list && cmaps2->unicode_list, "unicode_list"); lv_test_assert_array_eq( - (uint8_t *) cmaps1->unicode_list, - (uint8_t *) cmaps2->unicode_list, + (uint8_t *)cmaps1->unicode_list, + (uint8_t *)cmaps2->unicode_list, sizeof(uint16_t) * cmaps1->list_length, "unicode_list"); total_glyphs += cmaps1->list_length; @@ -112,8 +112,8 @@ static int compare_fonts(lv_font_t * f1, lv_font_t * f2) } if(cmaps1->glyph_id_ofs_list != NULL && cmaps2->glyph_id_ofs_list != NULL) { - uint8_t * ids1 = (uint8_t *) cmaps1->glyph_id_ofs_list; - uint8_t * ids2 = (uint8_t *) cmaps2->glyph_id_ofs_list; + uint8_t * ids1 = (uint8_t *)cmaps1->glyph_id_ofs_list; + uint8_t * ids2 = (uint8_t *)cmaps2->glyph_id_ofs_list; lv_test_assert_array_eq(ids1, ids2, cmaps1->list_length, "glyph_id_ofs_list"); } @@ -124,27 +124,27 @@ static int compare_fonts(lv_font_t * f1, lv_font_t * f2) // kern_dsc if (dsc1->kern_classes == 1 && dsc2->kern_classes == 1) { - lv_font_fmt_txt_kern_classes_t * kern1 = (lv_font_fmt_txt_kern_classes_t *) dsc1->kern_dsc; - lv_font_fmt_txt_kern_classes_t * kern2 = (lv_font_fmt_txt_kern_classes_t *) dsc2->kern_dsc; + lv_font_fmt_txt_kern_classes_t * kern1 = (lv_font_fmt_txt_kern_classes_t *)dsc1->kern_dsc; + lv_font_fmt_txt_kern_classes_t * kern2 = (lv_font_fmt_txt_kern_classes_t *)dsc2->kern_dsc; if (kern1 != NULL && kern2 != NULL) { lv_test_assert_int_eq(kern1->right_class_cnt, kern2->right_class_cnt, "right_class_cnt"); lv_test_assert_int_eq(kern1->left_class_cnt, kern2->left_class_cnt, "left_class_cnt"); lv_test_assert_array_eq( - (uint8_t *) kern1->left_class_mapping, - (uint8_t *) kern2->left_class_mapping, + (uint8_t *)kern1->left_class_mapping, + (uint8_t *)kern2->left_class_mapping, kern1->left_class_cnt, "left_class_mapping"); lv_test_assert_array_eq( - (uint8_t *) kern1->right_class_mapping, - (uint8_t *) kern2->right_class_mapping, + (uint8_t *)kern1->right_class_mapping, + (uint8_t *)kern2->right_class_mapping, kern1->right_class_cnt, "right_class_mapping"); lv_test_assert_array_eq( - (uint8_t *) kern1->class_pair_values, - (uint8_t *) kern2->class_pair_values, + (uint8_t *)kern1->class_pair_values, + (uint8_t *)kern2->class_pair_values, kern1->right_class_cnt * kern1->left_class_cnt, "class_pair_values"); } @@ -153,8 +153,8 @@ static int compare_fonts(lv_font_t * f1, lv_font_t * f2) } } else if (dsc1->kern_classes == 0 && dsc2->kern_classes == 0) { - lv_font_fmt_txt_kern_pair_t * kern1 = (lv_font_fmt_txt_kern_pair_t *) dsc1->kern_dsc; - lv_font_fmt_txt_kern_pair_t * kern2 = (lv_font_fmt_txt_kern_pair_t *) dsc2->kern_dsc; + lv_font_fmt_txt_kern_pair_t * kern1 = (lv_font_fmt_txt_kern_pair_t *)dsc1->kern_dsc; + lv_font_fmt_txt_kern_pair_t * kern2 = (lv_font_fmt_txt_kern_pair_t *)dsc2->kern_dsc; if (kern1 != NULL && kern2 != NULL) { lv_test_assert_int_eq(kern1->glyph_ids_size, kern2->glyph_ids_size, "glyph_ids_size"); lv_test_assert_int_eq(kern1->pair_cnt, kern2->pair_cnt, "pair_cnt"); @@ -177,8 +177,8 @@ static int compare_fonts(lv_font_t * f1, lv_font_t * f2) } } - lv_font_fmt_txt_glyph_dsc_t * glyph_dsc1 = (lv_font_fmt_txt_glyph_dsc_t *) dsc1->glyph_dsc; - lv_font_fmt_txt_glyph_dsc_t * glyph_dsc2 = (lv_font_fmt_txt_glyph_dsc_t *) dsc2->glyph_dsc; + lv_font_fmt_txt_glyph_dsc_t * glyph_dsc1 = (lv_font_fmt_txt_glyph_dsc_t *)dsc1->glyph_dsc; + lv_font_fmt_txt_glyph_dsc_t * glyph_dsc2 = (lv_font_fmt_txt_glyph_dsc_t *)dsc2->glyph_dsc; for(int i = 0; i < total_glyphs; ++i) { if (i < total_glyphs - 1) {