Skip to content

Commit e832e52

Browse files
committed
[tidy] use correct wide character type
1 parent 3668fc1 commit e832e52

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/base/lnav.console.cc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -476,39 +476,39 @@ wchar_for_icon(ui_icon_t ic)
476476
{
477477
switch (ic) {
478478
case ui_icon_t::hidden:
479-
return {L'\u22ee', role_t::VCR_HIDDEN};
479+
return {U'\u22ee', role_t::VCR_HIDDEN};
480480
case ui_icon_t::ok:
481-
return {L'\u2714', role_t::VCR_OK};
481+
return {U'\u2714', role_t::VCR_OK};
482482
case ui_icon_t::info:
483-
return {L'\u24d8', role_t::VCR_INFO};
483+
return {U'\u24d8', role_t::VCR_INFO};
484484
case ui_icon_t::warning:
485-
return {L'\u26a0', role_t::VCR_WARNING};
485+
return {U'\u26a0', role_t::VCR_WARNING};
486486
case ui_icon_t::error:
487-
return {L'\u2718', role_t::VCR_ERROR};
487+
return {U'\u2718', role_t::VCR_ERROR};
488488

489489
case ui_icon_t::log_level_trace:
490-
return {L'\U0001F143', role_t::VCR_TEXT};
490+
return {U'\U0001F143', role_t::VCR_TEXT};
491491
case ui_icon_t::log_level_debug:
492-
return {L'\U0001F133', role_t::VCR_TEXT};
492+
return {U'\U0001F133', role_t::VCR_TEXT};
493493
case ui_icon_t::log_level_info:
494-
return {L'\U0001F138', role_t::VCR_TEXT};
494+
return {U'\U0001F138', role_t::VCR_TEXT};
495495
case ui_icon_t::log_level_stats:
496-
return {L'\U0001F142', role_t::VCR_TEXT};
496+
return {U'\U0001F142', role_t::VCR_TEXT};
497497
case ui_icon_t::log_level_notice:
498-
return {L'\U0001F13d', role_t::VCR_TEXT};
498+
return {U'\U0001F13d', role_t::VCR_TEXT};
499499
case ui_icon_t::log_level_warning:
500-
return {L'\U0001F146', role_t::VCR_WARNING};
500+
return {U'\U0001F146', role_t::VCR_WARNING};
501501
case ui_icon_t::log_level_error:
502-
return {L'\U0001F134', role_t::VCR_ERROR};
502+
return {U'\U0001F134', role_t::VCR_ERROR};
503503
case ui_icon_t::log_level_critical:
504-
return {L'\U0001F132', role_t::VCR_ERROR};
504+
return {U'\U0001F132', role_t::VCR_ERROR};
505505
case ui_icon_t::log_level_fatal:
506-
return {L'\U0001F135', role_t::VCR_ERROR};
506+
return {U'\U0001F135', role_t::VCR_ERROR};
507507

508508
case ui_icon_t::play:
509-
return {L'\u25b6', role_t::VCR_TEXT};
509+
return {U'\u25b6', role_t::VCR_TEXT};
510510
case ui_icon_t::edit:
511-
return {L'\u270f', role_t::VCR_TEXT};
511+
return {U'\u270f', role_t::VCR_TEXT};
512512
}
513513

514514
ensure(false);

src/base/string_attr_type.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ struct text_attrs {
309309
};
310310

311311
struct block_elem_t {
312-
wchar_t value;
312+
char32_t value;
313313
role_t role;
314314

315315
bool operator==(const block_elem_t& rhs) const

src/view_curses.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ view_colors::init_roles(const lnav_theme& lt,
990990
break;
991991
}
992992
this->vc_icons[icon_index]
993-
= block_elem_t{(wchar_t) read_res.unwrap(), icon_role};
993+
= block_elem_t{(char32_t) read_res.unwrap(), icon_role};
994994
}
995995
}
996996
icon_index += 1;

0 commit comments

Comments
 (0)