chore(widgets): add parentheses to MY_CLASS definition (#5485)

2024-01-26 17:32:02 +08:00
parent 0b5c1a1642
commit 56cd592527
45 changed files with 50 additions and 48 deletions
--- a/src/core/lv_obj.c
+++ b/src/core/lv_obj.c
@@ -25,7 +25,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_obj_class
+#define MY_CLASS (&lv_obj_class)
 #define LV_OBJ_DEF_WIDTH    (LV_DPX(100))
 #define LV_OBJ_DEF_HEIGHT   (LV_DPX(50))
 #define STYLE_TRANSITION_MAX 32
--- a/src/core/lv_obj_class.c
+++ b/src/core/lv_obj_class.c
@@ -15,7 +15,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_obj_class
+#define MY_CLASS (&lv_obj_class)

 /**********************
 *      TYPEDEFS
--- a/src/core/lv_obj_draw.c
+++ b/src/core/lv_obj_draw.c
@@ -15,7 +15,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_obj_class
+#define MY_CLASS (&lv_obj_class)

 /**********************
 *      TYPEDEFS
--- a/src/core/lv_obj_event.c
+++ b/src/core/lv_obj_event.c
@@ -13,7 +13,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_obj_class
+#define MY_CLASS (&lv_obj_class)

 /**********************
 *      TYPEDEFS
--- a/src/core/lv_obj_pos.c
+++ b/src/core/lv_obj_pos.c
@@ -15,7 +15,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_obj_class
+#define MY_CLASS (&lv_obj_class)
 #define update_layout_mutex LV_GLOBAL_DEFAULT()->layout_update_mutex

 /**********************
--- a/src/core/lv_obj_scroll.c
+++ b/src/core/lv_obj_scroll.c
@@ -15,7 +15,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_obj_class
+#define MY_CLASS (&lv_obj_class)
 #define SCROLL_ANIM_TIME_MIN    200    /*ms*/
 #define SCROLL_ANIM_TIME_MAX    400    /*ms*/
 #define SCROLLBAR_MIN_SIZE      (LV_DPX(10))
--- a/src/core/lv_obj_style.c
+++ b/src/core/lv_obj_style.c
@@ -15,7 +15,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_obj_class
+#define MY_CLASS (&lv_obj_class)
 #define style_refr LV_GLOBAL_DEFAULT()->style_refresh
 #define style_trans_ll_p &(LV_GLOBAL_DEFAULT()->style_trans_ll)
 #define _style_custom_prop_flag_lookup_table LV_GLOBAL_DEFAULT()->style_custom_prop_flag_lookup_table
--- a/src/core/lv_obj_tree.c
+++ b/src/core/lv_obj_tree.c
@@ -20,7 +20,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_obj_class
+#define MY_CLASS (&lv_obj_class)
 #define disp_ll_p &(LV_GLOBAL_DEFAULT()->disp_ll)

 #define OBJ_DUMP_STRING_LEN 128
--- a/src/libs/barcode/lv_barcode.c
+++ b/src/libs/barcode/lv_barcode.c
@@ -14,7 +14,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_barcode_class
+#define MY_CLASS (&lv_barcode_class)

 /**********************
 *      TYPEDEFS
--- a/src/libs/ffmpeg/lv_ffmpeg.c
+++ b/src/libs/ffmpeg/lv_ffmpeg.c
@@ -29,7 +29,7 @@
    #error Unsupported  LV_COLOR_DEPTH
 #endif

-#define MY_CLASS &lv_ffmpeg_player_class
+#define MY_CLASS (&lv_ffmpeg_player_class)

 #define FRAME_DEF_REFR_PERIOD   33  /*[ms]*/

--- a/src/libs/gif/lv_gif.c
+++ b/src/libs/gif/lv_gif.c
@@ -14,7 +14,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS    &lv_gif_class
+#define MY_CLASS (&lv_gif_class)

 /**********************
 *      TYPEDEFS
--- a/src/libs/qrcode/lv_qrcode.c
+++ b/src/libs/qrcode/lv_qrcode.c
@@ -14,7 +14,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_qrcode_class
+#define MY_CLASS (&lv_qrcode_class)

 /**********************
 *      TYPEDEFS
--- a/src/libs/rlottie/lv_rlottie.c
+++ b/src/libs/rlottie/lv_rlottie.c
@@ -14,7 +14,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_rlottie_class
+#define MY_CLASS (&lv_rlottie_class)
 #define LV_ARGB32   32

 /**********************
--- a/src/others/file_explorer/lv_file_explorer.c
+++ b/src/others/file_explorer/lv_file_explorer.c
@@ -14,7 +14,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_file_explorer_class
+#define MY_CLASS (&lv_file_explorer_class)

 #define FILE_EXPLORER_QUICK_ACCESS_AREA_WIDTH       (22)
 #define FILE_EXPLORER_BROWSER_AREA_WIDTH            (100 - FILE_EXPLORER_QUICK_ACCESS_AREA_WIDTH)
--- a/src/others/ime/lv_ime_pinyin.c
+++ b/src/others/ime/lv_ime_pinyin.c
@@ -15,7 +15,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS    &lv_ime_pinyin_class
+#define MY_CLASS (&lv_ime_pinyin_class)
 #define cand_len LV_GLOBAL_DEFAULT()->ime_cand_len

 /**********************
--- a/src/others/sysmon/lv_sysmon.c
+++ b/src/others/sysmon/lv_sysmon.c
@@ -19,7 +19,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_sysmon_class
+#define MY_CLASS (&lv_sysmon_class)

 #define SYSMON_REFR_PERIOD_DEF 300 /* ms */

--- a/src/widgets/animimage/lv_animimage.c
+++ b/src/widgets/animimage/lv_animimage.c
@@ -27,7 +27,7 @@
 *********************/
 #define LV_OBJX_NAME "lv_animimg"

-#define MY_CLASS &lv_animimg_class
+#define MY_CLASS (&lv_animimg_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/arc/lv_arc.c
+++ b/src/widgets/arc/lv_arc.c
@@ -18,7 +18,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_arc_class
+#define MY_CLASS (&lv_arc_class)

 #define VALUE_UNSET INT16_MIN
 #define CLICK_OUTSIDE_BG_ANGLES ((uint32_t) 0x00U)
--- a/src/widgets/bar/lv_bar.c
+++ b/src/widgets/bar/lv_bar.c
@@ -17,7 +17,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_bar_class
+#define MY_CLASS (&lv_bar_class)

 /** hor. pad and ver. pad cannot make the indicator smaller than this [px]*/
 #define LV_BAR_SIZE_MIN  4
--- a/src/widgets/button/lv_button.c
+++ b/src/widgets/button/lv_button.c
@@ -13,7 +13,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_button_class
+#define MY_CLASS (&lv_button_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/buttonmatrix/lv_buttonmatrix.c
+++ b/src/widgets/buttonmatrix/lv_buttonmatrix.c
@@ -21,7 +21,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_buttonmatrix_class
+#define MY_CLASS (&lv_buttonmatrix_class)

 #define BTN_EXTRA_CLICK_AREA_MAX (LV_DPI_DEF / 10)
 #define LV_BUTTONMATRIX_WIDTH_MASK 0x000F
--- a/src/widgets/calendar/lv_calendar.c
+++ b/src/widgets/calendar/lv_calendar.c
@@ -18,7 +18,7 @@
 #define LV_CALENDAR_CTRL_TODAY      LV_BUTTONMATRIX_CTRL_CUSTOM_1
 #define LV_CALENDAR_CTRL_HIGHLIGHT  LV_BUTTONMATRIX_CTRL_CUSTOM_2

-#define MY_CLASS &lv_calendar_class
+#define MY_CLASS (&lv_calendar_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/canvas/lv_canvas.c
+++ b/src/widgets/canvas/lv_canvas.c
@@ -19,7 +19,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_canvas_class
+#define MY_CLASS (&lv_canvas_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/chart/lv_chart.c
+++ b/src/widgets/chart/lv_chart.c
@@ -14,7 +14,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_chart_class
+#define MY_CLASS (&lv_chart_class)

 #define LV_CHART_HDIV_DEF 3
 #define LV_CHART_VDIV_DEF 5
--- a/src/widgets/checkbox/lv_checkbox.c
+++ b/src/widgets/checkbox/lv_checkbox.c
@@ -18,7 +18,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_checkbox_class
+#define MY_CLASS (&lv_checkbox_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/dropdown/lv_dropdown.c
+++ b/src/widgets/dropdown/lv_dropdown.c
@@ -25,7 +25,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_dropdown_class
+#define MY_CLASS (&lv_dropdown_class)
 #define MY_CLASS_LIST &lv_dropdownlist_class

 #define LV_DROPDOWN_PR_NONE 0xFFFF
--- a/src/widgets/image/lv_image.c
+++ b/src/widgets/image/lv_image.c
@@ -14,7 +14,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_image_class
+#define MY_CLASS (&lv_image_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/imagebutton/lv_imagebutton.c
+++ b/src/widgets/imagebutton/lv_imagebutton.c
@@ -16,7 +16,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_imagebutton_class
+#define MY_CLASS (&lv_imagebutton_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/keyboard/lv_keyboard.c
+++ b/src/widgets/keyboard/lv_keyboard.c
@@ -19,7 +19,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS    &lv_keyboard_class
+#define MY_CLASS (&lv_keyboard_class)
 #define LV_KB_BTN(width) LV_BUTTONMATRIX_CTRL_POPOVER | width

 /**********************
--- a/src/widgets/label/lv_label.c
+++ b/src/widgets/label/lv_label.c
@@ -23,7 +23,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_label_class
+#define MY_CLASS (&lv_label_class)

 #define LV_LABEL_DEF_SCROLL_SPEED   lv_anim_speed_clamped(40, 300, 10000)
 #define LV_LABEL_SCROLL_DELAY       300
--- a/src/widgets/led/lv_led.c
+++ b/src/widgets/led/lv_led.c
@@ -16,7 +16,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_led_class
+#define MY_CLASS (&lv_led_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/line/lv_line.c
+++ b/src/widgets/line/lv_line.c
@@ -19,7 +19,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_line_class
+#define MY_CLASS (&lv_line_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/list/lv_list.c
+++ b/src/widgets/list/lv_list.c
@@ -18,7 +18,9 @@
 /*********************
 *      DEFINES
 *********************/
-#define MV_CLASS &lv_list
+#define MY_CLASS        (&lv_list_class)
+#define MY_CLASS_BUTTON (&lv_list_button_class)
+#define MY_CLASS_TEXT   (&lv_list_text_class)

 /**********************
 *      TYPEDEFS
@@ -63,7 +65,7 @@ const lv_obj_class_t lv_list_text_class = {
 lv_obj_t * lv_list_create(lv_obj_t * parent)
 {
    LV_LOG_INFO("begin");
-    lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_class, parent);
+    lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent);
    lv_obj_class_init_obj(obj);
    lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_COLUMN);
    return obj;
@@ -73,7 +75,7 @@ lv_obj_t * lv_list_add_text(lv_obj_t * list, const char * txt)
 {
    LV_LOG_INFO("begin");

-    lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_text_class, list);
+    lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS_TEXT, list);
    lv_obj_class_init_obj(obj);
    lv_label_set_text(obj, txt);
    return obj;
@@ -82,7 +84,7 @@ lv_obj_t * lv_list_add_text(lv_obj_t * list, const char * txt)
 lv_obj_t * lv_list_add_button(lv_obj_t * list, const void * icon, const char * txt)
 {
    LV_LOG_INFO("begin");
-    lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_button_class, list);
+    lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS_BUTTON, list);
    lv_obj_class_init_obj(obj);
    lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_ROW);

--- a/src/widgets/menu/lv_menu.c
+++ b/src/widgets/menu/lv_menu.c
@@ -13,7 +13,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_menu_class
+#define MY_CLASS (&lv_menu_class)

 #include "../../core/lv_obj.h"
 #include "../../layouts/lv_layout.h"
--- a/src/widgets/msgbox/lv_msgbox.c
+++ b/src/widgets/msgbox/lv_msgbox.c
@@ -21,7 +21,7 @@
 *      DEFINES
 *********************/
 #define LV_MSGBOX_FLAG_AUTO_PARENT  LV_OBJ_FLAG_WIDGET_1        /*Mark that the parent was automatically created*/
-#define MY_CLASS    &lv_msgbox_class
+#define MY_CLASS (&lv_msgbox_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/objx_templ/lv_objx_templ.c
+++ b/src/widgets/objx_templ/lv_objx_templ.c
@@ -22,7 +22,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_templ_class
+#define MY_CLASS (&lv_templ_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/roller/lv_roller.c
+++ b/src/widgets/roller/lv_roller.c
@@ -20,7 +20,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_roller_class
+#define MY_CLASS (&lv_roller_class)
 #define MY_CLASS_LABEL &lv_roller_label_class
 #define EXTRA_INF_SIZE      1000 /*[px]: add the options multiple times until getting this height*/

--- a/src/widgets/scale/lv_scale.c
+++ b/src/widgets/scale/lv_scale.c
@@ -17,7 +17,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_scale_class
+#define MY_CLASS (&lv_scale_class)

 #define LV_SCALE_LABEL_TXT_LEN          (20U)
 #define LV_SCALE_DEFAULT_ANGLE_RANGE    ((uint32_t) 270U)
--- a/src/widgets/slider/lv_slider.c
+++ b/src/widgets/slider/lv_slider.c
@@ -22,7 +22,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_slider_class
+#define MY_CLASS (&lv_slider_class)

 #define LV_SLIDER_KNOB_COORD(is_reversed, area) (is_reversed ? area.x1 : area.x2)
 #define LV_SLIDER_KNOB_COORD_VERTICAL(is_reversed, area) (is_reversed ? area.y2 : area.y1)
--- a/src/widgets/span/lv_span.c
+++ b/src/widgets/span/lv_span.c
@@ -16,7 +16,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_spangroup_class
+#define MY_CLASS (&lv_spangroup_class)
 #define snippet_stack LV_GLOBAL_DEFAULT()->span_snippet_stack

 /**********************
--- a/src/widgets/spinbox/lv_spinbox.c
+++ b/src/widgets/spinbox/lv_spinbox.c
@@ -16,7 +16,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS    &lv_spinbox_class
+#define MY_CLASS (&lv_spinbox_class)
 #define LV_SPINBOX_MAX_DIGIT_COUNT_WITH_8BYTES (LV_SPINBOX_MAX_DIGIT_COUNT + 8U)
 #define LV_SPINBOX_MAX_DIGIT_COUNT_WITH_4BYTES (LV_SPINBOX_MAX_DIGIT_COUNT + 4U)

--- a/src/widgets/switch/lv_switch.c
+++ b/src/widgets/switch/lv_switch.c
@@ -19,7 +19,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_switch_class
+#define MY_CLASS (&lv_switch_class)

 #define LV_SWITCH_IS_ANIMATING(sw) (((sw)->anim_state) != LV_SWITCH_ANIM_STATE_INV)

--- a/src/widgets/table/lv_table.c
+++ b/src/widgets/table/lv_table.c
@@ -21,7 +21,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_table_class
+#define MY_CLASS (&lv_table_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/tabview/lv_tabview.c
+++ b/src/widgets/tabview/lv_tabview.c
@@ -15,7 +15,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS    &lv_tabview_class
+#define MY_CLASS (&lv_tabview_class)

 /**********************
 *      TYPEDEFS
--- a/src/widgets/textarea/lv_textarea.c
+++ b/src/widgets/textarea/lv_textarea.c
@@ -23,7 +23,7 @@
 /*********************
 *      DEFINES
 *********************/
-#define MY_CLASS &lv_textarea_class
+#define MY_CLASS (&lv_textarea_class)

 /*Test configuration*/
 #ifndef LV_TEXTAREA_DEF_CURSOR_BLINK_TIME