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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b8b062fc3e6df923e77f4e45178a022a6d59c218..41d02a6b49b36acd905491f92a697036f02b2945 100644 (file)
--- 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 de445578807daedc62e92ce0b7857159992caf2c..95e944038c79d53ab6db09e5424e58719347f94e 100644 (file)
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -68,28 +68,20 @@ struct tui_data_window : public tui_win_info
   int regs_column_count = 0;
   struct reggroup *current_group = nullptr;
 
-  /* 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;
+  void check_register_values (struct frame_info *frame);
 
-  /* Answer the line number that the register element at element_no is
-     on.  If element_no is greater than the number of register
-     elements there are, -1 is returned.  */
-  int line_from_reg_element_no (int element_no) const;
+  void show_registers (struct reggroup *group);
 
-  /* Answer the index of the first element in line_no.  If line_no is
-     past the register area (-1) is returned.  */
-  int first_reg_element_no_inline (int line_no) const;
+protected:
 
-  /* Displays the data that is in the data window's content.  It does
-     not set the content.  */
-  void display_all_data ();
+  void do_scroll_vertical (int num_to_scroll) override;
+  void do_scroll_horizontal (int num_to_scroll) override
+  {
+  }
 
-  /* Delete all the item windows in the data window.  This is usually
-     done when the data window is scrolled.  */
-  void delete_data_content_windows ();
+  void rerender () override;
 
-  void erase_data_content (const char *prompt);
+private:
 
   /* Display the registers in the content from 'start_element_no'
      until the end of the register content or the end of the display
@@ -102,17 +94,6 @@ struct tui_data_window : public tui_win_info
      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 ();
@@ -123,11 +104,32 @@ protected:
      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);
+
+  /* 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;
+
+  /* Answer the line number that the register element at element_no is
+     on.  If element_no is greater than the number of register
+     elements there are, -1 is returned.  */
+  int line_from_reg_element_no (int element_no) const;
+
+  /* Answer the index of the first element in line_no.  If line_no is
+     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 ();
+
+  void erase_data_content (const char *prompt);
 };
 
 #endif /* TUI_TUI_REGS_H */