Change tui_show_source_content to be a method

This changes tui_show_source_content to be a method on
tui_source_window_base.

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

	* tui/tui-winsource.h (struct tui_source_window_base)
	<show_source_content>: Declare.
	(tui_show_source_content): Don't declare.
	* tui/tui-winsource.c (tui_update_source_window_as_is): Update.
	(tui_source_window_base::show_source_content): Rename from
	tui_show_source_content.
	(tui_source_window_base::refresh_all): Update.
	* tui/tui-layout.c (show_source_disasm_command)
	(show_source_or_disasm_and_command): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1c2b0d803c0b84c9233856a618f14b188db9dbab..a43a8f33c481b3dc1ee2a1cee0012da0bef2a28b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2019-08-13  Tom Tromey  <tom@tromey.com>
+
+       * tui/tui-winsource.h (struct tui_source_window_base)
+       <show_source_content>: Declare.
+       (tui_show_source_content): Don't declare.
+       * tui/tui-winsource.c (tui_update_source_window_as_is): Update.
+       (tui_source_window_base::show_source_content): Rename from
+       tui_show_source_content.
+       (tui_source_window_base::refresh_all): Update.
+       * tui/tui-layout.c (show_source_disasm_command)
+       (show_source_or_disasm_and_command): Update.
+
 2019-08-13  Tom Tromey  <tom@tromey.com>
 
        * tui/tui-winsource.c (tui_erase_source_content)

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 2715d322dc7f68320a190329e176734af681ea79..3683835954d0edce2e9dc919c98e8ee508af250e 100644 (file)
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -520,7 +520,7 @@ show_source_disasm_command (void)
   struct tui_locator_window *locator = tui_locator_win_info_ptr ();
   gdb_assert (locator != nullptr);
 
-  tui_show_source_content (TUI_SRC_WIN);
+  TUI_SRC_WIN->show_source_content ();
   if (TUI_DISASM_WIN == NULL)
     tui_win_list[DISASSEM_WIN] = new tui_disasm_window ();
   TUI_DISASM_WIN->reset (asm_height,
@@ -536,7 +536,7 @@ show_source_disasm_command (void)
   TUI_DISASM_WIN->m_has_locator = true;
   locator->make_visible (true);
   tui_show_locator_content ();
-  tui_show_source_content (TUI_DISASM_WIN);
+  TUI_DISASM_WIN->show_source_content ();
 
   if (TUI_CMD_WIN == NULL)
     tui_win_list[CMD_WIN] = new tui_cmd_window ();
@@ -664,7 +664,7 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
   win_info->m_has_locator = true;
   locator->make_visible (true);
   tui_show_locator_content ();
-  tui_show_source_content (win_info);
+  win_info->show_source_content ();
 
   if (TUI_CMD_WIN == NULL)
     tui_win_list[CMD_WIN] = new tui_cmd_window ();

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 6a72c6fe74b697b583229f86efccf38606f54690..bccc345fed91c01c92687793b5613c25fc410e27 100644 (file)
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -105,7 +105,7 @@ tui_update_source_window_as_is (struct tui_source_window_base *win_info,
   else
     {
       tui_update_breakpoint_info (win_info, nullptr, false);
-      tui_show_source_content (win_info);
+      win_info->show_source_content ();
       tui_update_exec_info (win_info);
       if (win_info->type == SRC_WIN)
        {
@@ -275,20 +275,20 @@ tui_show_source_line (struct tui_source_window_base *win_info, int lineno)
 }
 
 void
-tui_show_source_content (struct tui_source_window_base *win_info)
+tui_source_window_base::show_source_content ()
 {
-  if (!win_info->content.empty ())
+  if (!content.empty ())
     {
       int lineno;
 
-      for (lineno = 1; lineno <= win_info->content.size (); lineno++)
-        tui_show_source_line (win_info, lineno);
+      for (lineno = 1; lineno <= content.size (); lineno++)
+        tui_show_source_line (this, lineno);
     }
   else
-    tui_erase_source_content (win_info);
+    tui_erase_source_content (this);
 
-  win_info->check_and_display_highlight_if_needed ();
-  win_info->refresh_window ();
+  check_and_display_highlight_if_needed ();
+  refresh_window ();
 }
 
 /* See tui-data.h.  */
@@ -332,7 +332,7 @@ tui_source_window_base::reset (int height, int width,
 void
 tui_source_window_base::refresh_all ()
 {
-  tui_show_source_content (this);
+  show_source_content ();
   check_and_display_highlight_if_needed ();
   tui_erase_exec_info_content (this);
   tui_update_exec_info (this);

diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 9d7f0a7d774390f8e3baaa15fb8b97c1a76e1d2b..8c76322d0692c36d7477a5f7b3a95022a3b72fde 100644 (file)
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -89,6 +89,8 @@ public:
   void reset (int height, int width,
              int origin_x, int origin_y) override;
 
+  void show_source_content ();
+
   /* Does the locator belong to this window?  */
   bool m_has_locator = false;
   /* Execution information window.  */
@@ -139,7 +141,6 @@ extern void tui_update_source_windows_with_line (struct symtab *,
                                                 int);
 extern void tui_clear_source_content (struct tui_source_window_base *);
 extern void tui_erase_source_content (struct tui_source_window_base *);
-extern void tui_show_source_content (struct tui_source_window_base *);
 extern void tui_set_exec_info_content (struct tui_source_window_base *);
 extern void tui_show_exec_info_content (struct tui_source_window_base *);
 extern void tui_erase_exec_info_content (struct tui_source_window_base *);