Private data members in tui_data_window
This changes tui_data_window so that the data members are private. This required the addition of a simple accessor method in one case. gdb/ChangeLog 2019-08-30 Tom Tromey <tom@tromey.com> * tui/tui-regs.h (struct tui_data_window) <regs_content, regs_column_count, current_group>: Move later. Now private. <get_current_group>: New method. * tui/tui-regs.c (tui_reg_command): Update. * tui/tui-layout.c (tui_set_layout): Update.
This commit is contained in:
parent
1bf2866a59
commit
89df7f9056
|
@ -1,3 +1,11 @@
|
|||
2019-08-30 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* tui/tui-regs.h (struct tui_data_window) <regs_content,
|
||||
regs_column_count, current_group>: Move later. Now private.
|
||||
<get_current_group>: New method.
|
||||
* tui/tui-regs.c (tui_reg_command): Update.
|
||||
* tui/tui-layout.c (tui_set_layout): Update.
|
||||
|
||||
2019-08-30 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* tui/tui-regs.c (tui_data_window::display_registers_from_line)
|
||||
|
|
|
@ -189,7 +189,7 @@ tui_set_layout (enum tui_layout_type layout_type)
|
|||
tui_update_source_windows_with_addr (gdbarch, addr);
|
||||
if (new_layout == SRC_DATA_COMMAND
|
||||
|| new_layout == DISASSEM_DATA_COMMAND)
|
||||
TUI_DATA_WIN->show_registers (TUI_DATA_WIN->current_group);
|
||||
TUI_DATA_WIN->show_registers (TUI_DATA_WIN->get_current_group ());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -622,7 +622,7 @@ tui_reg_command (const char *args, int from_tty)
|
|||
if (TUI_DATA_WIN == NULL || !TUI_DATA_WIN->is_visible ())
|
||||
tui_reg_layout ();
|
||||
|
||||
struct reggroup *current_group = TUI_DATA_WIN->current_group;
|
||||
struct reggroup *current_group = TUI_DATA_WIN->get_current_group ();
|
||||
if (strncmp (args, "next", len) == 0)
|
||||
match = tui_reg_next (current_group, gdbarch);
|
||||
else if (strncmp (args, "prev", len) == 0)
|
||||
|
|
|
@ -63,15 +63,15 @@ struct tui_data_window : public tui_win_info
|
|||
return DATA_NAME;
|
||||
}
|
||||
|
||||
/* Windows that are used to display registers. */
|
||||
std::vector<tui_data_item_window> regs_content;
|
||||
int regs_column_count = 0;
|
||||
struct reggroup *current_group = nullptr;
|
||||
|
||||
void check_register_values (struct frame_info *frame);
|
||||
|
||||
void show_registers (struct reggroup *group);
|
||||
|
||||
struct reggroup *get_current_group () const
|
||||
{
|
||||
return current_group;
|
||||
}
|
||||
|
||||
protected:
|
||||
|
||||
void do_scroll_vertical (int num_to_scroll) override;
|
||||
|
@ -126,6 +126,11 @@ private:
|
|||
void delete_data_content_windows ();
|
||||
|
||||
void erase_data_content (const char *prompt);
|
||||
|
||||
/* Windows that are used to display registers. */
|
||||
std::vector<tui_data_item_window> regs_content;
|
||||
int regs_column_count = 0;
|
||||
struct reggroup *current_group = nullptr;
|
||||
};
|
||||
|
||||
#endif /* TUI_TUI_REGS_H */
|
||||
|
|
Loading…
Reference in New Issue