[06/11] Rename tui_data_item_window::item_no

Message ID 20200618021523.10681-7-tom@tromey.com
State New
Headers show
Series
  • TUI cleanups
Related show

Commit Message

Tom Tromey June 18, 2020, 2:15 a.m.
tui_data_item_window::item_no is misnamed -- it only can be used for a
register, but it references a "display" number as well.  (Based on
other comments I've seen in the past -- most since deleted -- I think
there were plans at one point to display variables in this window as
well.  However, this was never implemented.)

This patch renames this member to be more correct.

2020-06-14  Tom Tromey  <tom@tromey.com>

	* tui/tui-regs.c (tui_data_window::show_register_group)
	(tui_data_window::check_register_values): Update.
	* tui/tui-regs.h (struct tui_data_item_window) <regno>: Rename
	from item_no.
---
 gdb/ChangeLog      | 7 +++++++
 gdb/tui/tui-regs.c | 4 ++--
 gdb/tui/tui-regs.h | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

-- 
2.17.2

Patch

diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 51fc475beda..fcabe73a5ea 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -259,7 +259,7 @@  tui_data_window::show_register_group (struct reggroup *group,
       data_item_win = &m_regs_content[pos];
       if (!refresh_values_only)
 	{
-	  data_item_win->item_no = regnum;
+	  data_item_win->regno = regnum;
 	  data_item_win->highlight = false;
 	}
       tui_get_register (frame, data_item_win, regnum, 0);
@@ -486,7 +486,7 @@  tui_data_window::check_register_values (struct frame_info *frame)
 	  was_hilighted = data_item_win.highlight;
 
 	  tui_get_register (frame, &data_item_win,
-			    data_item_win.item_no,
+			    data_item_win.regno,
 			    &data_item_win.highlight);
 
 	  if (data_item_win.highlight || was_hilighted)
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 7acc0c7bd62..8b5e941a0a0 100644
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -48,8 +48,8 @@  struct tui_data_item_window : public tui_gen_win_info
     return 1;
   }
 
-  /* The register number, or data display number.  */
-  int item_no = -1;
+  /* The register number.  */
+  int regno = -1;
   bool highlight = false;
   std::string content;
 };