From 891949cbb47143420f4324cb60efc05ef5d70b39 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 25 Sep 2022 17:04:52 +1000 Subject: Cleanup: use 'u' prefixed integer types for brevity & cast style To use function style cast '(unsigned char)x' can't be replaced by 'unsigned char(x)'. --- source/blender/windowmanager/intern/wm_dragdrop.cc | 6 ++---- source/blender/windowmanager/intern/wm_event_system.cc | 4 ++-- source/blender/windowmanager/intern/wm_gesture.c | 6 +++--- source/blender/windowmanager/intern/wm_jobs.c | 4 ++-- source/blender/windowmanager/intern/wm_playanim.c | 2 +- source/blender/windowmanager/intern/wm_window.c | 8 ++++---- 6 files changed, 14 insertions(+), 16 deletions(-) (limited to 'source/blender/windowmanager/intern') diff --git a/source/blender/windowmanager/intern/wm_dragdrop.cc b/source/blender/windowmanager/intern/wm_dragdrop.cc index 94bd33a9765..92f7a5b7c42 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.cc +++ b/source/blender/windowmanager/intern/wm_dragdrop.cc @@ -174,8 +174,7 @@ static void wm_dropbox_invoke(bContext *C, wmDrag *drag) } } -wmDrag *WM_drag_data_create( - bContext *C, int icon, int type, void *poin, double value, unsigned int flags) +wmDrag *WM_drag_data_create(bContext *C, int icon, int type, void *poin, double value, uint flags) { wmDrag *drag = MEM_cnew(__func__); @@ -234,8 +233,7 @@ void WM_event_start_prepared_drag(bContext *C, wmDrag *drag) wm_dropbox_invoke(C, drag); } -void WM_event_start_drag( - bContext *C, int icon, int type, void *poin, double value, unsigned int flags) +void WM_event_start_drag(bContext *C, int icon, int type, void *poin, double value, uint flags) { wmDrag *drag = WM_drag_data_create(C, icon, type, poin, value, flags); WM_event_start_prepared_drag(C, drag); diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 2fcb39aeee4..79bf8020caf 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -325,7 +325,7 @@ void WM_event_add_notifier(const bContext *C, uint type, void *reference) WM_event_add_notifier_ex(CTX_wm_manager(C), CTX_wm_window(C), type, reference); } -void WM_main_add_notifier(unsigned int type, void *reference) +void WM_main_add_notifier(uint type, void *reference) { Main *bmain = G_MAIN; wmWindowManager *wm = static_cast(bmain->wm.first); @@ -5484,7 +5484,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, void if (BLI_str_utf8_size(event.utf8_buf) == -1) { CLOG_ERROR(WM_LOG_EVENTS, "ghost detected an invalid unicode character '%d'", - (int)(unsigned char)event.utf8_buf[0]); + (int)(uchar)event.utf8_buf[0]); event.utf8_buf[0] = '\0'; } } diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 2bc1fb1519a..88a292477cf 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -275,14 +275,14 @@ static void wm_gesture_draw_circle(wmGesture *gt) } struct LassoFillData { - unsigned char *px; + uchar *px; int width; }; static void draw_filled_lasso_px_cb(int x, int x_end, int y, void *user_data) { struct LassoFillData *data = user_data; - unsigned char *col = &(data->px[(y * data->width) + x]); + uchar *col = &(data->px[(y * data->width) + x]); memset(col, 0x10, x_end - x); } @@ -310,7 +310,7 @@ static void draw_filled_lasso(wmGesture *gt) if (BLI_rcti_is_empty(&rect) == false) { const int w = BLI_rcti_size_x(&rect); const int h = BLI_rcti_size_y(&rect); - unsigned char *pixel_buf = MEM_callocN(sizeof(*pixel_buf) * w * h, __func__); + uchar *pixel_buf = MEM_callocN(sizeof(*pixel_buf) * w * h, __func__); struct LassoFillData lasso_fill_data = {pixel_buf, w}; BLI_bitmap_draw_2d_poly_v2i_n(rect.xmin, diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index d5c4d07e9ed..5360f327a0a 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -104,7 +104,7 @@ struct wmJob { /** Only start job after specified time delay */ double start_delay_time; /** The notifier event timers should send */ - unsigned int note, endnote; + uint note, endnote; /* internal */ const void *owner; @@ -336,7 +336,7 @@ void WM_jobs_customdata_set(wmJob *wm_job, void *customdata, void (*free)(void * } } -void WM_jobs_timer(wmJob *wm_job, double timestep, unsigned int note, unsigned int endnote) +void WM_jobs_timer(wmJob *wm_job, double timestep, uint note, uint endnote) { wm_job->timestep = timestep; wm_job->note = note; diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 73c7c0a2435..bb19ba4748f 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -659,7 +659,7 @@ static void build_pict_list_ex( int fp_framenr; struct { char head[FILE_MAX], tail[FILE_MAX]; - unsigned short digits; + ushort digits; } fp_decoded; char filepath[FILE_MAX]; diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 436087e1cf3..b7a3538aeb2 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -158,8 +158,8 @@ static bool wm_window_timer(const bContext *C); void wm_get_screensize(int *r_width, int *r_height) { - unsigned int uiwidth; - unsigned int uiheight; + uint uiwidth; + uint uiheight; GHOST_GetMainDisplayDimensions(g_system, &uiwidth, &uiheight); *r_width = uiwidth; @@ -168,8 +168,8 @@ void wm_get_screensize(int *r_width, int *r_height) void wm_get_desktopsize(int *r_width, int *r_height) { - unsigned int uiwidth; - unsigned int uiheight; + uint uiwidth; + uint uiheight; GHOST_GetAllDisplayDimensions(g_system, &uiwidth, &uiheight); *r_width = uiwidth; -- cgit v1.2.3