griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: change textview 'unsigned char' to 'uchar'

Browse Source
This commit is contained in:
Campbell Barton
2020-02-14 13:58:58 +11:00
parent 69be8039e8
commit 489cecb954
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_console/console_draw.c
View File

@@ -43,11 +43,11 @@
#include "../space_info/textview.h"
static int console_line_data(struct TextViewContext *tvc,
unsigned char fg[4],
unsigned char UNUSED(bg[4]),
uchar fg[4],
uchar UNUSED(bg[4]),
int *UNUSED(icon),
unsigned char UNUSED(icon_fg[4]),
unsigned char UNUSED(icon_bg[4]))
uchar UNUSED(icon_fg[4]),
uchar UNUSED(icon_bg[4]))
{
ConsoleLine *cl_iter = (ConsoleLine *)tvc->iter;
int fg_id = TH_TEXT;
@@ -180,7 +180,7 @@ static void console_textview_draw_cursor(struct TextViewContext *tvc)
immUnbindProgram();
}
static void console_textview_const_colors(TextViewContext *UNUSED(tvc), unsigned char bg_sel[4])
static void console_textview_const_colors(TextViewContext *UNUSED(tvc), uchar bg_sel[4])
{
UI_GetThemeColor4ubv(TH_CONSOLE_SELECT, bg_sel);
}

8
source/blender/editors/space_info/info_draw.c
View File

@@ -43,11 +43,11 @@
#include "GPU_framebuffer.h"
static int report_line_data(struct TextViewContext *tvc,
unsigned char fg[4],
unsigned char bg[4],
uchar fg[4],
uchar bg[4],
int *icon,
unsigned char icon_fg[4],
unsigned char icon_bg[4])
uchar icon_fg[4],
uchar icon_bg[4])
{
Report *report = (Report *)tvc->iter;

16
source/blender/editors/space_info/textview.c
View File

@@ -79,7 +79,7 @@ static void console_draw_sel(const char *str,
const int xy[2],
const int str_len_draw,
TextViewDrawState *tds,
const unsigned char bg_sel[4])
const uchar bg_sel[4])
{
const int sel[2] = {tds->sel[0], tds->sel[1]};
const int cwidth = tds->cwidth;
@@ -144,12 +144,12 @@ static int console_wrap_offsets(const char *str, int len, int width, int *lines,
static bool console_draw_string(TextViewDrawState *tds,
const char *str,
int str_len,
const unsigned char fg[4],
const unsigned char bg[4],
const uchar fg[4],
const uchar bg[4],
int icon,
const unsigned char icon_fg[4],
const unsigned char icon_bg[4],
const unsigned char bg_sel[4])
const uchar icon_fg[4],
const uchar icon_bg[4],
const uchar bg_sel[4])
{
int tot_lines; /* Total number of lines for wrapping. */
int *offsets; /* Offsets of line beginnings for wrapping. */
@@ -325,7 +325,7 @@ int textview_draw(TextViewContext *tvc,
int xy[2];
/* Disable selection by. */
int sel[2] = {-1, -1};
unsigned char fg[4], bg[4], icon_fg[4], icon_bg[4];
uchar fg[4], bg[4], icon_fg[4], icon_bg[4];
int icon = 0;
const int font_id = blf_mono_font;
@@ -383,7 +383,7 @@ int textview_draw(TextViewContext *tvc,
}
if (tvc->begin(tvc)) {
unsigned char bg_sel[4] = {0};
uchar bg_sel[4] = {0};
if (do_draw && tvc->const_colors) {
tvc->const_colors(tvc, bg_sel);