From 4f743a7aa8bc971b3b3fc03378679ff9b432cfe5 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 3 May 2021 13:58:20 +0200 Subject: [PATCH] refactor(obj class) rename lv_obj_create_from_class to lv_obj_class_create_obj --- src/core/lv_obj.c | 2 +- src/core/lv_obj_class.c | 2 +- src/core/lv_obj_class.h | 2 +- src/extra/widgets/calendar/lv_calendar.c | 2 +- src/extra/widgets/chart/lv_chart.c | 2 +- src/extra/widgets/colorwheel/lv_colorwheel.c | 2 +- src/extra/widgets/imgbtn/lv_imgbtn.c | 2 +- src/extra/widgets/keyboard/lv_keyboard.c | 2 +- src/extra/widgets/led/lv_led.c | 2 +- src/extra/widgets/list/lv_list.c | 6 +++--- src/extra/widgets/meter/lv_meter.c | 2 +- src/extra/widgets/msgbox/lv_msgbox.c | 2 +- src/extra/widgets/spinbox/lv_spinbox.c | 2 +- src/extra/widgets/tabview/lv_tabview.c | 2 +- src/extra/widgets/tileview/lv_tileview.c | 4 ++-- src/extra/widgets/win/lv_win.c | 2 +- src/widgets/lv_arc.c | 2 +- src/widgets/lv_bar.c | 2 +- src/widgets/lv_btn.c | 2 +- src/widgets/lv_btnmatrix.c | 2 +- src/widgets/lv_canvas.c | 2 +- src/widgets/lv_checkbox.c | 2 +- src/widgets/lv_dropdown.c | 4 ++-- src/widgets/lv_img.c | 2 +- src/widgets/lv_label.c | 2 +- src/widgets/lv_line.c | 2 +- src/widgets/lv_roller.c | 4 ++-- src/widgets/lv_slider.c | 2 +- src/widgets/lv_switch.c | 2 +- src/widgets/lv_table.c | 2 +- src/widgets/lv_textarea.c | 2 +- 31 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index 08443a2ea..0f3a7894a 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -174,7 +174,7 @@ void lv_deinit(void) lv_obj_t * lv_obj_create(lv_obj_t * parent) { - return lv_obj_create_from_class(&lv_obj_class, parent); + return lv_obj_class_create_obj(&lv_obj_class, parent); } /*===================== diff --git a/src/core/lv_obj_class.c b/src/core/lv_obj_class.c index a1045cd81..a8bf93f81 100644 --- a/src/core/lv_obj_class.c +++ b/src/core/lv_obj_class.c @@ -40,7 +40,7 @@ static uint32_t get_instance_size(const lv_obj_class_t * class_p); * GLOBAL FUNCTIONS **********************/ -lv_obj_t * lv_obj_create_from_class(const lv_obj_class_t * class_p, lv_obj_t * parent) +lv_obj_t * lv_obj_class_create_obj(const lv_obj_class_t * class_p, lv_obj_t * parent) { LV_TRACE_OBJ_CREATE("Creating object with %p class on %p parent", class_p, parent); uint32_t s = get_instance_size(class_p); diff --git a/src/core/lv_obj_class.h b/src/core/lv_obj_class.h index 25af37b2a..64c987eaf 100644 --- a/src/core/lv_obj_class.h +++ b/src/core/lv_obj_class.h @@ -72,7 +72,7 @@ typedef struct _lv_obj_class_t { * @param parent pointer to an object where the new object should be created * @return pointer to the created object */ -struct _lv_obj_t * lv_obj_create_from_class(const struct _lv_obj_class_t * class_p, struct _lv_obj_t * parent); +struct _lv_obj_t * lv_obj_class_create_obj(const struct _lv_obj_class_t * class_p, struct _lv_obj_t * parent); void _lv_obj_destructor(struct _lv_obj_t * obj); diff --git a/src/extra/widgets/calendar/lv_calendar.c b/src/extra/widgets/calendar/lv_calendar.c index 892da3a8c..d52605497 100644 --- a/src/extra/widgets/calendar/lv_calendar.c +++ b/src/extra/widgets/calendar/lv_calendar.c @@ -56,7 +56,7 @@ static const char * day_names_def[7] = LV_CALENDAR_DEFAULT_DAY_NAMES; lv_obj_t * lv_calendar_create(lv_obj_t * parent) { - lv_obj_t * obj = lv_obj_create_from_class(&lv_calendar_class, parent); + lv_obj_t * obj = lv_obj_class_create_obj(&lv_calendar_class, parent); return obj; } diff --git a/src/extra/widgets/chart/lv_chart.c b/src/extra/widgets/chart/lv_chart.c index f14a428d2..e6ca877b1 100644 --- a/src/extra/widgets/chart/lv_chart.c +++ b/src/extra/widgets/chart/lv_chart.c @@ -65,7 +65,7 @@ const lv_obj_class_t lv_chart_class = { lv_obj_t * lv_chart_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_chart_class, parent); + return lv_obj_class_create_obj(&lv_chart_class, parent); } void lv_chart_set_type(lv_obj_t * obj, lv_chart_type_t type) diff --git a/src/extra/widgets/colorwheel/lv_colorwheel.c b/src/extra/widgets/colorwheel/lv_colorwheel.c index 2f435eedf..14bcdf3c5 100644 --- a/src/extra/widgets/colorwheel/lv_colorwheel.c +++ b/src/extra/widgets/colorwheel/lv_colorwheel.c @@ -75,7 +75,7 @@ static bool create_knob_recolor; lv_obj_t * lv_colorwheel_create(lv_obj_t * parent, bool knob_recolor) { create_knob_recolor = knob_recolor; - return lv_obj_create_from_class(&lv_colorwheel_class, parent); + return lv_obj_class_create_obj(&lv_colorwheel_class, parent); } /*===================== diff --git a/src/extra/widgets/imgbtn/lv_imgbtn.c b/src/extra/widgets/imgbtn/lv_imgbtn.c index 7865dfb4b..e38396bfa 100644 --- a/src/extra/widgets/imgbtn/lv_imgbtn.c +++ b/src/extra/widgets/imgbtn/lv_imgbtn.c @@ -55,7 +55,7 @@ const lv_obj_class_t lv_imgbtn_class = { */ lv_obj_t * lv_imgbtn_create(lv_obj_t * parent) { - return lv_obj_create_from_class(&lv_imgbtn_class, parent); + return lv_obj_class_create_obj(&lv_imgbtn_class, parent); } /*===================== diff --git a/src/extra/widgets/keyboard/lv_keyboard.c b/src/extra/widgets/keyboard/lv_keyboard.c index f0877def3..7137e3b2a 100644 --- a/src/extra/widgets/keyboard/lv_keyboard.c +++ b/src/extra/widgets/keyboard/lv_keyboard.c @@ -121,7 +121,7 @@ static const lv_btnmatrix_ctrl_t * kb_ctrl[5] = { */ lv_obj_t * lv_keyboard_create(lv_obj_t * parent) { - return lv_obj_create_from_class(&lv_keyboard_class, parent); + return lv_obj_class_create_obj(&lv_keyboard_class, parent); } /*===================== diff --git a/src/extra/widgets/led/lv_led.c b/src/extra/widgets/led/lv_led.c index 0f6f73178..8dbe81372 100644 --- a/src/extra/widgets/led/lv_led.c +++ b/src/extra/widgets/led/lv_led.c @@ -59,7 +59,7 @@ const lv_obj_class_t lv_led_class = { */ lv_obj_t * lv_led_create(lv_obj_t * parent) { - return lv_obj_create_from_class(&lv_led_class, parent); + return lv_obj_class_create_obj(&lv_led_class, parent); } /*===================== diff --git a/src/extra/widgets/list/lv_list.c b/src/extra/widgets/list/lv_list.c index d64d0a437..e83caf3cb 100644 --- a/src/extra/widgets/list/lv_list.c +++ b/src/extra/widgets/list/lv_list.c @@ -55,7 +55,7 @@ const lv_obj_class_t lv_list_text_class = { lv_obj_t * lv_list_create(lv_obj_t * parent) { - lv_obj_t * list = lv_obj_create_from_class(&lv_list_class, parent); + lv_obj_t * list = lv_obj_class_create_obj(&lv_list_class, parent); lv_obj_set_flex_flow(list, LV_FLEX_FLOW_COLUMN); return list; @@ -63,7 +63,7 @@ lv_obj_t * lv_list_create(lv_obj_t * parent) lv_obj_t * lv_list_add_text(lv_obj_t * list, const char * txt) { - lv_obj_t * label = lv_obj_create_from_class(&lv_list_text_class, list); + lv_obj_t * label = lv_obj_class_create_obj(&lv_list_text_class, list); lv_label_set_text(label, txt); lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR); lv_obj_set_width(label, LV_PCT(100)); @@ -72,7 +72,7 @@ lv_obj_t * lv_list_add_text(lv_obj_t * list, const char * txt) lv_obj_t * lv_list_add_btn(lv_obj_t * list, const char * icon, const char * txt, lv_event_cb_t event_cb) { - lv_obj_t * btn = lv_obj_create_from_class(&lv_list_btn_class, list); + lv_obj_t * btn = lv_obj_class_create_obj(&lv_list_btn_class, list); lv_obj_set_size(btn, LV_PCT(100), LV_SIZE_CONTENT); if(event_cb) { lv_obj_add_event_cb(btn, event_cb, LV_EVENT_ALL, NULL); diff --git a/src/extra/widgets/meter/lv_meter.c b/src/extra/widgets/meter/lv_meter.c index fcdc83696..0b482ed83 100644 --- a/src/extra/widgets/meter/lv_meter.c +++ b/src/extra/widgets/meter/lv_meter.c @@ -52,7 +52,7 @@ const lv_obj_class_t lv_meter_class = { lv_obj_t * lv_meter_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_meter_class, parent); + return lv_obj_class_create_obj(&lv_meter_class, parent); } /*===================== diff --git a/src/extra/widgets/msgbox/lv_msgbox.c b/src/extra/widgets/msgbox/lv_msgbox.c index f2b51c3e0..cc434803f 100644 --- a/src/extra/widgets/msgbox/lv_msgbox.c +++ b/src/extra/widgets/msgbox/lv_msgbox.c @@ -49,7 +49,7 @@ lv_obj_t * lv_msgbox_create(lv_obj_t * parent, const char * title, const char * lv_obj_set_size(parent, LV_PCT(100), LV_PCT(100)); } - lv_obj_t * mbox = lv_obj_create_from_class(&lv_msgbox_class, parent); + lv_obj_t * mbox = lv_obj_class_create_obj(&lv_msgbox_class, parent); LV_ASSERT_MALLOC(mbox); if(mbox == NULL) return NULL; diff --git a/src/extra/widgets/spinbox/lv_spinbox.c b/src/extra/widgets/spinbox/lv_spinbox.c index 762c3ae6d..bee89450c 100644 --- a/src/extra/widgets/spinbox/lv_spinbox.c +++ b/src/extra/widgets/spinbox/lv_spinbox.c @@ -46,7 +46,7 @@ const lv_obj_class_t lv_spinbox_class = { lv_obj_t * lv_spinbox_create(lv_obj_t * parent) { - return lv_obj_create_from_class(&lv_spinbox_class, parent); + return lv_obj_class_create_obj(&lv_spinbox_class, parent); } /*===================== diff --git a/src/extra/widgets/tabview/lv_tabview.c b/src/extra/widgets/tabview/lv_tabview.c index 452812864..54ab915e1 100644 --- a/src/extra/widgets/tabview/lv_tabview.c +++ b/src/extra/widgets/tabview/lv_tabview.c @@ -51,7 +51,7 @@ lv_obj_t * lv_tabview_create(lv_obj_t * parent, lv_dir_t tab_pos, lv_coord_t tab { tabpos_create = tab_pos; tabsize_create = tab_size; - return lv_obj_create_from_class(&lv_tabview_class, parent); + return lv_obj_class_create_obj(&lv_tabview_class, parent); } lv_obj_t * lv_tabview_add_tab(lv_obj_t * obj, const char * name) diff --git a/src/extra/widgets/tileview/lv_tileview.c b/src/extra/widgets/tileview/lv_tileview.c index 9975b6619..e68be5956 100644 --- a/src/extra/widgets/tileview/lv_tileview.c +++ b/src/extra/widgets/tileview/lv_tileview.c @@ -50,7 +50,7 @@ static uint32_t create_row_id; lv_obj_t * lv_tileview_create(lv_obj_t * parent) { - return lv_obj_create_from_class(&lv_tileview_class, parent); + return lv_obj_class_create_obj(&lv_tileview_class, parent); } /*====================== @@ -62,7 +62,7 @@ lv_obj_t * lv_tileview_add_tile(lv_obj_t * tv, uint8_t col_id, uint8_t row_id, l create_dir = dir; create_col_id = col_id; create_row_id = row_id; - return lv_obj_create_from_class(&lv_tileview_tile_class, tv); + return lv_obj_class_create_obj(&lv_tileview_tile_class, tv); } void lv_obj_set_tile(lv_obj_t * tv, lv_obj_t * tile_obj, lv_anim_enable_t anim_en) diff --git a/src/extra/widgets/win/lv_win.c b/src/extra/widgets/win/lv_win.c index a783106f7..36fe4415f 100644 --- a/src/extra/widgets/win/lv_win.c +++ b/src/extra/widgets/win/lv_win.c @@ -45,7 +45,7 @@ static lv_coord_t create_header_height; lv_obj_t * lv_win_create(lv_obj_t * parent, lv_coord_t header_height) { create_header_height = header_height; - return lv_obj_create_from_class(&lv_win_class, parent); + return lv_obj_class_create_obj(&lv_win_class, parent); } lv_obj_t * lv_win_add_title(lv_obj_t * win, const char * txt) diff --git a/src/widgets/lv_arc.c b/src/widgets/lv_arc.c index ded27ff6a..885e8c0e8 100644 --- a/src/widgets/lv_arc.c +++ b/src/widgets/lv_arc.c @@ -65,7 +65,7 @@ const lv_obj_class_t lv_arc_class = { lv_obj_t * lv_arc_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_arc_class, parent); + return lv_obj_class_create_obj(&lv_arc_class, parent); } /*====================== diff --git a/src/widgets/lv_bar.c b/src/widgets/lv_bar.c index b6c1a1a95..9c4fa1b25 100644 --- a/src/widgets/lv_bar.c +++ b/src/widgets/lv_bar.c @@ -78,7 +78,7 @@ const lv_obj_class_t lv_bar_class = { lv_obj_t * lv_bar_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_bar_class, parent); + return lv_obj_class_create_obj(&lv_bar_class, parent); } /*===================== diff --git a/src/widgets/lv_btn.c b/src/widgets/lv_btn.c index 803022ac1..005687c7f 100644 --- a/src/widgets/lv_btn.c +++ b/src/widgets/lv_btn.c @@ -48,7 +48,7 @@ const lv_obj_class_t lv_btn_class = { lv_obj_t * lv_btn_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_btn_class, parent); + return lv_obj_class_create_obj(&lv_btn_class, parent); } /********************** diff --git a/src/widgets/lv_btnmatrix.c b/src/widgets/lv_btnmatrix.c index 18a0223d5..0436bb284 100644 --- a/src/widgets/lv_btnmatrix.c +++ b/src/widgets/lv_btnmatrix.c @@ -79,7 +79,7 @@ const lv_obj_class_t lv_btnmatrix_class = { lv_obj_t * lv_btnmatrix_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_btnmatrix_class, parent); + return lv_obj_class_create_obj(&lv_btnmatrix_class, parent); } /*===================== diff --git a/src/widgets/lv_canvas.c b/src/widgets/lv_canvas.c index 930d1ba96..f5465f099 100644 --- a/src/widgets/lv_canvas.c +++ b/src/widgets/lv_canvas.c @@ -67,7 +67,7 @@ const lv_obj_class_t lv_canvas_class = { lv_obj_t * lv_canvas_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_canvas_class, parent); + return lv_obj_class_create_obj(&lv_canvas_class, parent); } /*===================== diff --git a/src/widgets/lv_checkbox.c b/src/widgets/lv_checkbox.c index 40b6e8d73..59d306044 100644 --- a/src/widgets/lv_checkbox.c +++ b/src/widgets/lv_checkbox.c @@ -56,7 +56,7 @@ const lv_obj_class_t lv_checkbox_class = { lv_obj_t * lv_checkbox_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_checkbox_class, parent); + return lv_obj_class_create_obj(&lv_checkbox_class, parent); } /*===================== diff --git a/src/widgets/lv_dropdown.c b/src/widgets/lv_dropdown.c index dcd3e5e59..066519d68 100644 --- a/src/widgets/lv_dropdown.c +++ b/src/widgets/lv_dropdown.c @@ -90,7 +90,7 @@ const lv_obj_class_t lv_dropdownlist_class = { lv_obj_t * lv_dropdown_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_dropdown_class, parent); + return lv_obj_class_create_obj(&lv_dropdown_class, parent); } /*===================== @@ -535,7 +535,7 @@ void lv_dropdown_close(lv_obj_t * obj) static lv_obj_t * lv_dropdown_list_create(lv_obj_t * parent) { - return lv_obj_create_from_class(&lv_dropdownlist_class, parent); + return lv_obj_class_create_obj(&lv_dropdownlist_class, parent); } static void lv_dropdown_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj) diff --git a/src/widgets/lv_img.c b/src/widgets/lv_img.c index c01082212..8a3be8b1a 100644 --- a/src/widgets/lv_img.c +++ b/src/widgets/lv_img.c @@ -57,7 +57,7 @@ const lv_obj_class_t lv_img_class = { lv_obj_t * lv_img_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_img_class, parent); + return lv_obj_class_create_obj(&lv_img_class, parent); } /*===================== diff --git a/src/widgets/lv_label.c b/src/widgets/lv_label.c index 76c14f47c..ae9301b18 100644 --- a/src/widgets/lv_label.c +++ b/src/widgets/lv_label.c @@ -74,7 +74,7 @@ const lv_obj_class_t lv_label_class = { lv_obj_t * lv_label_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_label_class, parent); + return lv_obj_class_create_obj(&lv_label_class, parent); } /*===================== diff --git a/src/widgets/lv_line.c b/src/widgets/lv_line.c index 42f1849bb..ee8170d13 100644 --- a/src/widgets/lv_line.c +++ b/src/widgets/lv_line.c @@ -54,7 +54,7 @@ const lv_obj_class_t lv_line_class = { lv_obj_t * lv_line_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_line_class, parent); + return lv_obj_class_create_obj(&lv_line_class, parent); } /*===================== diff --git a/src/widgets/lv_roller.c b/src/widgets/lv_roller.c index 4fbf24fc9..a3454d802 100644 --- a/src/widgets/lv_roller.c +++ b/src/widgets/lv_roller.c @@ -77,7 +77,7 @@ const lv_obj_class_t lv_roller_label_class = { lv_obj_t * lv_roller_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_roller_class, parent); + return lv_obj_class_create_obj(&lv_roller_class, parent); } /*===================== @@ -297,7 +297,7 @@ static void lv_roller_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE); lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLL_CHAIN); - lv_obj_create_from_class(&lv_roller_label_class, obj); + lv_obj_class_create_obj(&lv_roller_label_class, obj); lv_roller_set_options(obj, "Option 1\nOption 2\nOption 3\nOption 4\nOption 5", LV_ROLLER_MODE_NORMAL); LV_LOG_TRACE("finshed"); diff --git a/src/widgets/lv_slider.c b/src/widgets/lv_slider.c index 6d5965103..f21a264a9 100644 --- a/src/widgets/lv_slider.c +++ b/src/widgets/lv_slider.c @@ -59,7 +59,7 @@ const lv_obj_class_t lv_slider_class = { lv_obj_t * lv_slider_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_slider_class, parent); + return lv_obj_class_create_obj(&lv_slider_class, parent); } bool lv_slider_is_dragged(const lv_obj_t * obj) diff --git a/src/widgets/lv_switch.c b/src/widgets/lv_switch.c index e31df09e4..2f797a3e9 100644 --- a/src/widgets/lv_switch.c +++ b/src/widgets/lv_switch.c @@ -61,7 +61,7 @@ const lv_obj_class_t lv_switch_class = { lv_obj_t * lv_switch_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_switch_class, parent); + return lv_obj_class_create_obj(&lv_switch_class, parent); } /********************** diff --git a/src/widgets/lv_table.c b/src/widgets/lv_table.c index c5675fb88..1f2756adf 100644 --- a/src/widgets/lv_table.c +++ b/src/widgets/lv_table.c @@ -64,7 +64,7 @@ const lv_obj_class_t lv_table_class = { lv_obj_t * lv_table_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_table_class, parent); + return lv_obj_class_create_obj(&lv_table_class, parent); } /*===================== diff --git a/src/widgets/lv_textarea.c b/src/widgets/lv_textarea.c index 6dae9baf7..cba0763c4 100644 --- a/src/widgets/lv_textarea.c +++ b/src/widgets/lv_textarea.c @@ -84,7 +84,7 @@ static const char * ta_insert_replace; lv_obj_t * lv_textarea_create(lv_obj_t * parent) { LV_LOG_INFO("begin") - return lv_obj_create_from_class(&lv_textarea_class, parent); + return lv_obj_class_create_obj(&lv_textarea_class, parent); } /*======================