This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 02/15] Remove tui_data_window::display_all_data
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Tue, 20 Aug 2019 20:25:22 -0600
- Subject: [PATCH 02/15] Remove tui_data_window::display_all_data
- References: <20190821022535.9762-1-tom@tromey.com>
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-20 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.
---
gdb/ChangeLog | 9 +++++++++
gdb/tui/tui-regs.c | 18 ++----------------
gdb/tui/tui-regs.h | 4 ----
3 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 24b182f2aec..7bac19da281 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 ]"));
@@ -500,20 +500,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 ()
{
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 95e944038c7..fa76cae0b18 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 ();
--
2.17.2