From 04c72a68e073e54aabbec004154f45fdb4026d3d Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Sun, 14 Jul 2019 08:25:43 -0600
Subject: [PATCH] Change some tui_data_window methods to be private

Turning various calls into methods has made it possible to now change
some tui_data_window methods to be private.

2019-08-20  Tom Tromey  <tom@tromey.com>

	* tui/tui-regs.h (struct tui_data_window) <last_regs_line_no,
	line_from_reg_element_no, first_reg_element_no_inline,
	display_all_data, delete_data_content_windows,
	erase_data_content>: Now private.
---
 gdb/ChangeLog      |  7 +++++
 gdb/tui/tui-regs.h | 78 ++++++++++++++++++++++++----------------------
 2 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b8b062fc3e6..41d02a6b49b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2019-08-20  Tom Tromey  <tom@tromey.com>
+
+	* tui/tui-regs.h (struct tui_data_window) <last_regs_line_no,
+	line_from_reg_element_no, first_reg_element_no_inline,
+	display_all_data, delete_data_content_windows,
+	erase_data_content>: Now private.
+
 2019-08-20  Tom Tromey  <tom@tromey.com>
 
 	* tui/tui-wingeneral.c (box_win): Change type of highlight_flag.
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index de445578807..95e944038c7 100644
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -68,6 +68,46 @@ struct tui_data_window : public tui_win_info
   int regs_column_count = 0;
   struct reggroup *current_group = nullptr;
 
+  void check_register_values (struct frame_info *frame);
+
+  void show_registers (struct reggroup *group);
+
+protected:
+
+  void do_scroll_vertical (int num_to_scroll) override;
+  void do_scroll_horizontal (int num_to_scroll) override
+  {
+  }
+
+  void rerender () override;
+
+private:
+
+  /* Display the registers in the content from 'start_element_no'
+     until the end of the register content or the end of the display
+     height.  No checking for displaying past the end of the registers
+     is done here.  */
+  void display_registers_from (int start_element_no);
+
+  /* Display the registers starting at line line_no in the data
+     window.  Answers the line number that the display actually
+     started from.  If nothing is displayed (-1) is returned.  */
+  int display_registers_from_line (int line_no);
+
+  /* Return the index of the first element displayed.  If none are
+     displayed, then return -1.  */
+  int first_data_item_displayed ();
+
+  /* Display the registers in the content from 'start_element_no' on
+     'start_line_no' until the end of the register content or the end
+     of the display height.  This function checks that we won't
+     display off the end of the register display.  */
+  void display_reg_element_at_line (int start_element_no, int start_line_no);
+
+  void show_register_group (struct reggroup *group,
+			    struct frame_info *frame,
+			    int refresh_values_only);
+
   /* Answer the number of the last line in the regs display.  If there
      are no registers (-1) is returned.  */
   int last_regs_line_no () const;
@@ -90,44 +130,6 @@ struct tui_data_window : public tui_win_info
   void delete_data_content_windows ();
 
   void erase_data_content (const char *prompt);
-
-  /* Display the registers in the content from 'start_element_no'
-     until the end of the register content or the end of the display
-     height.  No checking for displaying past the end of the registers
-     is done here.  */
-  void display_registers_from (int start_element_no);
-
-  /* Display the registers starting at line line_no in the data
-     window.  Answers the line number that the display actually
-     started from.  If nothing is displayed (-1) is returned.  */
-  int display_registers_from_line (int line_no);
-
-  void check_register_values (struct frame_info *frame);
-
-  void show_registers (struct reggroup *group);
-
-protected:
-
-  void do_scroll_vertical (int num_to_scroll) override;
-  void do_scroll_horizontal (int num_to_scroll) override
-  {
-  }
-
-  /* Return the index of the first element displayed.  If none are
-     displayed, then return -1.  */
-  int first_data_item_displayed ();
-
-  /* Display the registers in the content from 'start_element_no' on
-     'start_line_no' until the end of the register content or the end
-     of the display height.  This function checks that we won't
-     display off the end of the register display.  */
-  void display_reg_element_at_line (int start_element_no, int start_line_no);
-
-  void rerender () override;
-
-  void show_register_group (struct reggroup *group,
-			    struct frame_info *frame,
-			    int refresh_values_only);
 };
 
 #endif /* TUI_TUI_REGS_H */