diff options
| author | Tom Tromey <tom@tromey.com> | 2019-06-05 16:21:24 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-10-01 15:12:37 -0600 |
| commit | e43b10e10eba9d9493a0ad40176b2aea9cfb62ab (patch) | |
| tree | cc57a08cdee3a133b1f0c726a7596719d47060d7 /gdb/ui-out.c | |
| parent | 53d666ecfbb18f836cd4cb9f1de7013e3d03f4df (diff) | |
| download | binutils-gdb-e43b10e10eba9d9493a0ad40176b2aea9cfb62ab.tar.gz | |
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 <tom@tromey.com>
* ui-out.h (enum class ui_out_style_kind): Remove.
(class ui_out) <field_string, field_stsream, do_field_string>:
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) <do_field_string>: 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) <do_field_string>: 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) <do_field_string>: 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.
Diffstat (limited to 'gdb/ui-out.c')
| -rw-r--r-- | gdb/ui-out.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gdb/ui-out.c b/gdb/ui-out.c index 91662fac4a2..e8fe44c8268 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -24,6 +24,8 @@ #include "expression.h" /* For language.h */ #include "language.h" #include "ui-out.h" +#include "gdbsupport/format.h" +#include "cli/cli-style.h" #include <vector> #include <memory> @@ -483,12 +485,12 @@ ui_out::field_core_addr (const char *fldname, struct gdbarch *gdbarch, CORE_ADDR address) { field_string (fldname, print_core_address (gdbarch, address), - ui_out_style_kind::ADDRESS); + address_style.style ()); } void ui_out::field_stream (const char *fldname, string_file &stream, - ui_out_style_kind style) + const ui_file_style &style) { if (!stream.empty ()) field_string (fldname, stream.c_str (), style); @@ -513,7 +515,7 @@ ui_out::field_skip (const char *fldname) void ui_out::field_string (const char *fldname, const char *string, - ui_out_style_kind style) + const ui_file_style &style) { int fldno; int width; |