[binutils-gdb] Turn tui_first_data_item_displayed into a method

[binutils-gdb] Turn tui_first_data_item_displayed into a method

[Tom Tromey]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=eaf9738bedf8de68d4bf8eafd0689cf1973648aa

commit eaf9738bedf8de68d4bf8eafd0689cf1973648aa
Author: Tom Tromey <tom@tromey.com>
Date:   Sat Jun 22 11:55:33 2019 -0600

    Turn tui_first_data_item_displayed into a method
    
    tui_first_data_item_displayed is only called from tui_data_window
    methods, so turn it into a method as well.
    
    gdb/ChangeLog
    2019-06-25  Tom Tromey  <tom@tromey.com>
    
    	* tui/tui-windata.h (tui_first_data_item_displayed): Don't
    	declare.
    	* tui/tui-windata.c (tui_data_window::first_data_item_displayed):
    	Rename from tui_first_data_item_displayed.  Update.
    	(tui_data_window::refresh_all)
    	(tui_data_window::do_scroll_vertical): Update.
    	* tui/tui-data.h (struct tui_data_window)
    	<first_data_item_displayed>: Declare new method.

Diff:
---
 gdb/ChangeLog         | 11 +++++++++++
 gdb/tui/tui-data.h    |  4 ++++
 gdb/tui/tui-windata.c | 23 ++++++++---------------
 gdb/tui/tui-windata.h |  1 -
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index da9c19b..02dac98 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,16 @@
 2019-06-25  Tom Tromey  <tom@tromey.com>
 
+	* tui/tui-windata.h (tui_first_data_item_displayed): Don't
+	declare.
+	* tui/tui-windata.c (tui_data_window::first_data_item_displayed):
+	Rename from tui_first_data_item_displayed.  Update.
+	(tui_data_window::refresh_all)
+	(tui_data_window::do_scroll_vertical): Update.
+	* tui/tui-data.h (struct tui_data_window)
+	<first_data_item_displayed>: Declare new method.
+
+2019-06-25  Tom Tromey  <tom@tromey.com>
+
 	* tui/tui-data.h (tui_init_generic_part): Don't declare.
 	* tui/tui-data.c (tui_init_generic_part): Remove, moving
 	contents...
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index b8fdb4d..55d2cdd 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -505,6 +505,10 @@ protected:
   {
   }
   void do_make_visible_with_new_height () override;
+
+  /* Return the index of the first element displayed.  If none are
+     displayed, then return -1.  */
+  int first_data_item_displayed ();
 };
 
 struct tui_cmd_window : public tui_win_info
diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c
index c559345..82436a3 100644
--- a/gdb/tui/tui-windata.c
+++ b/gdb/tui/tui-windata.c
@@ -42,25 +42,18 @@
 /* Answer the index first element displayed.  If none are displayed,
    then return (-1).  */
 int
-tui_first_data_item_displayed (void)
+tui_data_window::first_data_item_displayed ()
 {
-  int element_no = (-1);
-  int i;
-
-  for (i = 0; 
-       i < TUI_DATA_WIN->content_size && element_no < 0;
-       i++)
+  for (int i = 0; i < content_size; i++)
     {
       struct tui_gen_win_info *data_item_win;
 
-      data_item_win
-	= TUI_DATA_WIN->content[i]->which_element.data_window;
-      if (data_item_win->handle != NULL
-	  && data_item_win->is_visible)
-	element_no = i;
+      data_item_win = content[i]->which_element.data_window;
+      if (data_item_win->handle != NULL && data_item_win->is_visible)
+	return i;
     }
 
-  return element_no;
+  return -1;
 }
 
 
@@ -198,7 +191,7 @@ tui_data_window::refresh_all ()
   tui_erase_data_content (NULL);
   if (content_size > 0)
     {
-      int first_element = tui_first_data_item_displayed ();
+      int first_element = first_data_item_displayed ();
 
       if (first_element >= 0)	/* Re-use existing windows.  */
 	tui_display_data_from (first_element, TRUE);
@@ -248,7 +241,7 @@ tui_data_window::do_scroll_vertical (int num_to_scroll)
   int first_element_no;
   int first_line = (-1);
 
-  first_element_no = tui_first_data_item_displayed ();
+  first_element_no = first_data_item_displayed ();
   if (first_element_no < regs_content_count)
     first_line = tui_line_from_reg_element_no (first_element_no);
   else
diff --git a/gdb/tui/tui-windata.h b/gdb/tui/tui-windata.h
index c070f76..4aa8cb0 100644
--- a/gdb/tui/tui-windata.h
+++ b/gdb/tui/tui-windata.h
@@ -28,7 +28,6 @@ extern void tui_erase_data_content (const char *);
 extern void tui_display_all_data (void);
 extern void tui_check_data_values (struct frame_info *);
 extern void tui_display_data_from_line (int);
-extern int tui_first_data_item_displayed (void);
 extern void tui_delete_data_content_windows (void);
 extern void tui_refresh_data_win (void);
 extern void tui_display_data_from (int, int);