From 0fcd37117e94e5b9bf5f4aaa4dccc8038b38398e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 1 Jul 2019 14:44:29 -0600 Subject: [PATCH] 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 * 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) : Remove method. (struct tui_source_window_base) : Likewise. --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-data.h | 12 ------------ gdb/tui/tui-win.c | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f6d464f4ad2..5a3d6c584c7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2019-07-17 Tom Tromey + + * 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) : Remove + method. + (struct tui_source_window_base) : Likewise. + 2019-07-17 Tom Tromey * tui/tui-wingeneral.h (tui_make_visible, tui_make_invisible): diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index e1773004cc5..cfe24609b89 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -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; diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index c92a706efc6..2fb757a6a4d 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -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 (); -- 2.30.2