aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui/tui-data.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-06-16 16:35:31 -0600
committerTom Tromey <tom@tromey.com>2019-06-25 07:48:38 -0600
commit152f3f4b3342ae16df5ae0640896b8cea008c893 (patch)
treeb057f41be67f8879cf0c2664098a2192e543925b /gdb/tui/tui-data.c
parentbe4da58857ee4a26b7e58893211ea4f54922e8fd (diff)
downloadbinutils-152f3f4b3342ae16df5ae0640896b8cea008c893.zip
binutils-152f3f4b3342ae16df5ae0640896b8cea008c893.tar.gz
binutils-152f3f4b3342ae16df5ae0640896b8cea008c893.tar.bz2
Introduce tui_gen_win_info::name method
This removes tui_win_name and replaces it with a method on tui_gen_win_info, removing another spot that switched on window type. gdb/ChangeLog 2019-06-25 Tom Tromey <tom@tromey.com> * tui/tui-win.c (window_name_completer, tui_set_focus) (tui_all_windows_info): Use name method. * tui/tui-data.h (struct tui_gen_win_info) (struct tui_source_window, struct tui_disasm_window) (struct tui_data_window, struct tui_cmd_window) <name>: New method. (tui_win_name): Don't declare. * tui/tui-data.c (tui_partial_win_by_name): Use name method. (tui_win_name): Remove.
Diffstat (limited to 'gdb/tui/tui-data.c')
-rw-r--r--gdb/tui/tui-data.c31
1 files changed, 1 insertions, 30 deletions
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index c9f401f..79990b8 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -337,7 +337,7 @@ tui_partial_win_by_name (const char *name)
{
if (tui_win_list[i] != 0)
{
- const char *cur_name = tui_win_name (tui_win_list[i]);
+ const char *cur_name = tui_win_list[i]->name ();
if (strlen (name) <= strlen (cur_name)
&& startswith (cur_name, name))
@@ -351,35 +351,6 @@ tui_partial_win_by_name (const char *name)
}
-/* Answer the name of the window. */
-const char *
-tui_win_name (const struct tui_gen_win_info *win_info)
-{
- const char *name = NULL;
-
- switch (win_info->type)
- {
- case SRC_WIN:
- name = SRC_NAME;
- break;
- case CMD_WIN:
- name = CMD_NAME;
- break;
- case DISASSEM_WIN:
- name = DISASSEM_NAME;
- break;
- case DATA_WIN:
- name = DATA_NAME;
- break;
- default:
- name = "";
- break;
- }
-
- return name;
-}
-
-
void
tui_initialize_static_data (void)
{