Private data members in tui_data_window

This changes tui_data_window so that the data members are private.
This required the addition of a simple accessor method in one case.

gdb/ChangeLog
2019-08-30  Tom Tromey  <tom@tromey.com>

	* tui/tui-regs.h (struct tui_data_window) <regs_content,
	regs_column_count, current_group>: Move later.  Now private.
	<get_current_group>: New method.
	* tui/tui-regs.c (tui_reg_command): Update.
	* tui/tui-layout.c (tui_set_layout): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b95be65f6f57cb4211d31f1d6ce535f6613159e5..2a2c08cae46df69ded50501f465982fabbf96734 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2019-08-30  Tom Tromey  <tom@tromey.com>
+
+       * tui/tui-regs.h (struct tui_data_window) <regs_content,
+       regs_column_count, current_group>: Move later.  Now private.
+       <get_current_group>: New method.
+       * tui/tui-regs.c (tui_reg_command): Update.
+       * tui/tui-layout.c (tui_set_layout): Update.
+
 2019-08-30  Tom Tromey  <tom@tromey.com>
 
        * tui/tui-regs.c (tui_data_window::display_registers_from_line)

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 01d50e437e5f5049d6e40f6f74cfebef2d9e5962..387a4f51affeafa246d5acd90461cb20c9b35085 100644 (file)
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -189,7 +189,7 @@ tui_set_layout (enum tui_layout_type layout_type)
       tui_update_source_windows_with_addr (gdbarch, addr);
       if (new_layout == SRC_DATA_COMMAND
          || new_layout == DISASSEM_DATA_COMMAND)
-       TUI_DATA_WIN->show_registers (TUI_DATA_WIN->current_group);
+       TUI_DATA_WIN->show_registers (TUI_DATA_WIN->get_current_group ());
     }
 }
 

diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 4a09a59044669c123dd2a512b3fa4b35d843c1bf..98096e2cdc4881562ca845cc28fb4fd27c186ea8 100644 (file)
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -622,7 +622,7 @@ tui_reg_command (const char *args, int from_tty)
       if (TUI_DATA_WIN == NULL || !TUI_DATA_WIN->is_visible ())
        tui_reg_layout ();
 
-      struct reggroup *current_group = TUI_DATA_WIN->current_group;
+      struct reggroup *current_group = TUI_DATA_WIN->get_current_group ();
       if (strncmp (args, "next", len) == 0)
        match = tui_reg_next (current_group, gdbarch);
       else if (strncmp (args, "prev", len) == 0)

diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index fa76cae0b18c01c3ea1d41115df6f0f019fe38b8..2606c39f5a190bcce744a54f13ca940cee3988a5 100644 (file)
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -63,15 +63,15 @@ struct tui_data_window : public tui_win_info
     return DATA_NAME;
   }
 
-  /* Windows that are used to display registers.  */
-  std::vector<tui_data_item_window> regs_content;
-  int regs_column_count = 0;
-  struct reggroup *current_group = nullptr;
-
   void check_register_values (struct frame_info *frame);
 
   void show_registers (struct reggroup *group);
 
+  struct reggroup *get_current_group () const
+  {
+    return current_group;
+  }
+
 protected:
 
   void do_scroll_vertical (int num_to_scroll) override;
@@ -126,6 +126,11 @@ private:
   void delete_data_content_windows ();
 
   void erase_data_content (const char *prompt);
+
+  /* Windows that are used to display registers.  */
+  std::vector<tui_data_item_window> regs_content;
+  int regs_column_count = 0;
+  struct reggroup *current_group = nullptr;
 };
 
 #endif /* TUI_TUI_REGS_H */