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/mi/mi-out.c | 10 +++++----- gdb/mi/mi-out.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gdb/mi') diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index a668717..0b93073 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -70,9 +70,9 @@ mi_ui_out::do_table_header (int width, ui_align alignment, do_field_signed (0, 0, ui_center, "width", width); do_field_signed (0, 0, ui_center, "alignment", alignment); do_field_string (0, 0, ui_center, "col_name", col_name.c_str (), - ui_out_style_kind::DEFAULT); + ui_file_style ()); do_field_string (0, width, alignment, "colhdr", col_hdr.c_str (), - ui_out_style_kind::DEFAULT); + ui_file_style ()); close (ui_out_type_tuple); } @@ -99,7 +99,7 @@ mi_ui_out::do_field_signed (int fldno, int width, ui_align alignment, const char *fldname, LONGEST value) { do_field_string (fldno, width, alignment, fldname, plongest (value), - ui_out_style_kind::DEFAULT); + ui_file_style ()); } /* Output an unsigned field. */ @@ -109,7 +109,7 @@ mi_ui_out::do_field_unsigned (int fldno, int width, ui_align alignment, const char *fldname, ULONGEST value) { do_field_string (fldno, width, alignment, fldname, pulongest (value), - ui_out_style_kind::DEFAULT); + ui_file_style ()); } /* Used to omit a field. */ @@ -126,7 +126,7 @@ mi_ui_out::do_field_skip (int fldno, int width, ui_align alignment, void mi_ui_out::do_field_string (int fldno, int width, ui_align align, const char *fldname, const char *string, - ui_out_style_kind style) + const ui_file_style &style) { ui_file *stream = m_streams.back (); field_separator (); diff --git a/gdb/mi/mi-out.h b/gdb/mi/mi-out.h index fe96658..90528fd 100644 --- a/gdb/mi/mi-out.h +++ b/gdb/mi/mi-out.h @@ -66,7 +66,7 @@ protected: const char *fldname) override; virtual void do_field_string (int fldno, int width, ui_align align, const char *fldname, const char *string, - ui_out_style_kind style) override; + const ui_file_style &style) override; virtual void do_field_fmt (int fldno, int width, ui_align align, const char *fldname, const char *format, va_list args) override ATTRIBUTE_PRINTF (6,0); -- cgit v1.1