Turn tui_show_exec_info_content into a method

This changes tui_show_exec_info_content to be a method on
tui_source_window_base.  As it is only called by other methods on this
class, it can be private.

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

	* tui/tui-winsource.h (struct tui_source_window_base)
	<show_exec_info_content>: Declare.
	(tui_show_exec_info_content): Don't declare.
	* tui/tui-winsource.c
	(tui_source_window_base::show_exec_info_content): Rename from
	tui_show_exec_info_content.
	(tui_source_window_base::update_exec_info): Update.
This commit is contained in:
Tom Tromey
2019-07-05 17:35:13 -06:00
parent 7b56485db5
commit 8270ac6229
3 changed files with 19 additions and 7 deletions

View File

@ -1,3 +1,13 @@
2019-08-13 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (struct tui_source_window_base)
<show_exec_info_content>: Declare.
(tui_show_exec_info_content): Don't declare.
* tui/tui-winsource.c
(tui_source_window_base::show_exec_info_content): Rename from
tui_show_exec_info_content.
(tui_source_window_base::update_exec_info): Update.
2019-08-13 Tom Tromey <tom@tromey.com> 2019-08-13 Tom Tromey <tom@tromey.com>
* tui/tui-data.h (enum tui_bp_flag, tui_bp_flags, struct tui_source_element) * tui/tui-data.h (enum tui_bp_flag, tui_bp_flags, struct tui_source_element)

View File

@ -641,17 +641,17 @@ tui_source_window_base::set_exec_info_content ()
void void
tui_show_exec_info_content (struct tui_source_window_base *win_info) tui_source_window_base::show_exec_info_content ()
{ {
struct tui_exec_info_window *exec_info = win_info->execution_info; struct tui_exec_info_window *exec_info = execution_info;
const tui_exec_info_content *content = exec_info->get_content (); const tui_exec_info_content *exec_content = exec_info->get_content ();
werase (exec_info->handle); werase (exec_info->handle);
for (int cur_line = 1; cur_line <= win_info->content.size (); cur_line++) for (int cur_line = 1; cur_line <= content.size (); cur_line++)
mvwaddstr (exec_info->handle, mvwaddstr (exec_info->handle,
cur_line, cur_line,
0, 0,
content[cur_line - 1]); exec_content[cur_line - 1]);
exec_info->refresh_window (); exec_info->refresh_window ();
} }
@ -676,7 +676,7 @@ void
tui_source_window_base::update_exec_info () tui_source_window_base::update_exec_info ()
{ {
set_exec_info_content (); set_exec_info_content ();
tui_show_exec_info_content (this); show_exec_info_content ();
} }
void void

View File

@ -150,6 +150,9 @@ public:
struct gdbarch *gdbarch = nullptr; struct gdbarch *gdbarch = nullptr;
std::vector<tui_source_element> content; std::vector<tui_source_element> content;
private:
void show_exec_info_content ();
}; };
/* Update the execution windows to show the active breakpoints. This /* Update the execution windows to show the active breakpoints. This
@ -185,7 +188,6 @@ extern void tui_update_source_windows_with_line (struct symtab *,
int); int);
extern void tui_clear_source_content (struct tui_source_window_base *); 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_erase_source_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 *); extern void tui_erase_exec_info_content (struct tui_source_window_base *);
extern void tui_clear_exec_info_content (struct tui_source_window_base *); extern void tui_clear_exec_info_content (struct tui_source_window_base *);