From e43b10e10eba9d9493a0ad40176b2aea9cfb62ab Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 5 Jun 2019 16:21:24 -0600 Subject: Remove the ui_out_style_kind enum This removes the ui_out_style_kind enum, in favor of simply using ui_file_style references. This simplifies the code somewhat. gdb/ChangeLog 2019-10-01 Tom Tromey * ui-out.h (enum class ui_out_style_kind): Remove. (class ui_out) : Change type of "style". * ui-out.c (ui_out::field_core_addr, ui_out::field_stream) (ui_out::field_string): Update. * tui/tui-out.h (class tui_ui_out) : Change type of "style". * tui/tui-out.c (tui_ui_out::do_field_string): Update. * tracepoint.c (print_one_static_tracepoint_marker): Update. * stack.c (print_frame_arg, print_frame_info, print_frame): Update. * source.c (print_source_lines_base): Update. * solib.c (info_sharedlibrary_command): Update. * skip.c (info_skip_command): Update. * record-btrace.c (btrace_call_history_src_line) (btrace_call_history): Update. * python/py-framefilter.c (py_print_frame): Update. * mi/mi-out.h (class mi_ui_out) : Change type of "style". * mi/mi-out.c (mi_ui_out::do_table_header) (mi_ui_out::do_field_signed, mi_ui_out::do_field_unsigned) (mi_ui_out::do_field_string): Update. * disasm.c (gdb_pretty_print_disassembler::pretty_print_insn): Update. * cli-out.h (class cli_ui_out) : Change type of "style". * cli-out.c (cli_ui_out::do_table_header) (cli_ui_out::do_field_signed, cli_ui_out::do_field_unsigned) (cli_ui_out::do_field_skip, cli_ui_out::do_field_string) (cli_ui_out::do_field_fmt): Update. * breakpoint.c (print_breakpoint_location): Update. (update_static_tracepoint): Update. --- gdb/record-btrace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gdb/record-btrace.c') diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index b55459e..c923b36 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -42,6 +42,7 @@ #include "inferior.h" #include #include "gdbarch.h" +#include "cli/cli-style.h" static const target_info record_btrace_target_info = { "record-btrace", @@ -1084,7 +1085,7 @@ btrace_call_history_src_line (struct ui_out *uiout, uiout->field_string ("file", symtab_to_filename_for_display (symbol_symtab (sym)), - ui_out_style_kind::FILE); + file_name_style.style ()); btrace_compute_src_line_range (bfun, &begin, &end); if (end < begin) @@ -1176,13 +1177,13 @@ btrace_call_history (struct ui_out *uiout, if (sym != NULL) uiout->field_string ("function", SYMBOL_PRINT_NAME (sym), - ui_out_style_kind::FUNCTION); + function_name_style.style ()); else if (msym != NULL) uiout->field_string ("function", MSYMBOL_PRINT_NAME (msym), - ui_out_style_kind::FUNCTION); + function_name_style.style ()); else if (!uiout->is_mi_like_p ()) uiout->field_string ("function", "??", - ui_out_style_kind::FUNCTION); + function_name_style.style ()); if ((flags & RECORD_PRINT_INSN_RANGE) != 0) { -- cgit v1.1