Remove has_locator method

Earlier changes made it obvious that the has_locator method can only
be called for source/disassembly windows.  Because the only reference
to this now occurs in methods on this object, we can remove the
has_locator method entirely, in favor of using the member directly.

gdb/ChangeLog
2019-07-17  Tom Tromey  <tom@tromey.com>

	* tui/tui-win.c (tui_source_window_base::set_new_height)
	(tui_source_window_base::do_make_visible_with_new_height): Use
	m_has_locator field directly.
	* tui/tui-data.h (struct tui_win_info) <has_locator>: Remove
	method.
	(struct tui_source_window_base) <has_locator>: Likewise.
This commit is contained in:
Tom Tromey 2019-07-01 14:44:29 -06:00
parent 4a38112da0
commit 0fcd37117e
3 changed files with 11 additions and 14 deletions

View File

@ -1,3 +1,12 @@
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (tui_source_window_base::set_new_height)
(tui_source_window_base::do_make_visible_with_new_height): Use
m_has_locator field directly.
* tui/tui-data.h (struct tui_win_info) <has_locator>: Remove
method.
(struct tui_source_window_base) <has_locator>: Likewise.
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-wingeneral.h (tui_make_visible, tui_make_invisible):

View File

@ -295,12 +295,6 @@ public:
/* Clear the pertinent detail in the window. */
virtual void clear_detail () = 0;
/* Return true if this window has the locator. */
virtual bool has_locator () const
{
return false;
}
/* Called after all the TUI windows are refreshed, to let this
window have a chance to update itself further. */
virtual void refresh_all ()
@ -368,12 +362,6 @@ public:
void clear_detail () override;
/* Return true if this window has the locator. */
bool has_locator () const override
{
return m_has_locator;
}
void make_visible (bool visible) override;
void refresh_window () override;
void refresh_all () override;

View File

@ -1235,7 +1235,7 @@ tui_source_window_base::set_new_height (int height)
execution_info->viewport_height = height;
execution_info->viewport_height--;
if (has_locator ())
if (m_has_locator)
{
tui_locator_window *gen_win_info = tui_locator_win_info_ptr ();
gen_win_info->make_visible (false);
@ -1324,7 +1324,7 @@ tui_source_window_base::do_make_visible_with_new_height ()
}
tui_update_source_window (this, gdbarch, s, line, TRUE);
}
if (has_locator ())
if (m_has_locator)
{
tui_locator_win_info_ptr ()->make_visible (true);
tui_show_locator_content ();