diff options
| author | Tom Tromey <tom@tromey.com> | 2019-07-14 08:27:34 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-08-30 12:57:02 -0600 |
| commit | 18bb55c7225dfd07ec8d75226a83da1872db8b90 (patch) | |
| tree | b7a56d031345a4a8eed81b4aace4b6983b5c3105 | |
| parent | 1f6d2f100ae6de462f1e81b5de17de059f6b17ef (diff) | |
| download | gdb-18bb55c7225dfd07ec8d75226a83da1872db8b90.zip gdb-18bb55c7225dfd07ec8d75226a83da1872db8b90.tar.gz gdb-18bb55c7225dfd07ec8d75226a83da1872db8b90.tar.bz2 | |
Remove tui_data_window::display_all_data
tui_data_window::rerender clears the data item windows, and then calls
display_all_data. However, that method only does anything if the
contents are not empty. So, display_all_data can be renamed and the
wrapper removed.
gdb/ChangeLog
2019-08-30 Tom Tromey <tom@tromey.com>
* tui/tui-regs.h (struct tui_data_window) <display_all_data>:
Don't declare.
* tui/tui-regs.c (tui_data_window::show_registers): Call
rerender.
(tui_data_window::rerender): Rename from display_all_data.
(tui_data_window::rerender): Remove old implementation.
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/tui/tui-regs.c | 18 | ||||
| -rw-r--r-- | gdb/tui/tui-regs.h | 4 |
3 files changed, 11 insertions, 20 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0cb864f..e5f3f21 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2019-08-30 Tom Tromey <tom@tromey.com> + * tui/tui-regs.h (struct tui_data_window) <display_all_data>: + Don't declare. + * tui/tui-regs.c (tui_data_window::show_registers): Call + rerender. + (tui_data_window::rerender): Rename from display_all_data. + (tui_data_window::rerender): Remove old implementation. + +2019-08-30 Tom Tromey <tom@tromey.com> + * tui/tui-regs.c (tui_data_window::display_all_data): Change text. * tui/tui-data.h (NO_DATA_STRING): Remove define. diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 24b182f..7bac19d 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -161,7 +161,7 @@ tui_data_window::show_registers (struct reggroup *group) for (auto &&data_item_win : regs_content) data_item_win.highlight = false; current_group = group; - display_all_data (); + rerender (); } else { @@ -434,7 +434,7 @@ tui_data_window::erase_data_content (const char *prompt) /* See tui-regs.h. */ void -tui_data_window::display_all_data () +tui_data_window::rerender () { if (regs_content.empty ()) erase_data_content (_("[ Register Values Unavailable ]")); @@ -501,20 +501,6 @@ tui_data_window::do_scroll_vertical (int num_to_scroll) /* See tui-regs.h. */ void -tui_data_window::rerender () -{ - /* Delete all data item windows. */ - for (auto &&win : regs_content) - { - tui_delete_win (win.handle); - win.handle = NULL; - } - display_all_data (); -} - -/* See tui-regs.h. */ - -void tui_data_window::refresh_window () { tui_gen_win_info::refresh_window (); diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index 95e9440..fa76cae 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -121,10 +121,6 @@ private: past the register area (-1) is returned. */ int first_reg_element_no_inline (int line_no) const; - /* Displays the data that is in the data window's content. It does - not set the content. */ - void display_all_data (); - /* Delete all the item windows in the data window. This is usually done when the data window is scrolled. */ void delete_data_content_windows (); |