diff options
author | Tom Tromey <tom@tromey.com> | 2019-07-02 15:55:01 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2019-07-17 12:19:24 -0600 |
commit | bfad4537079109d9c41ecd86af9cf84b6825a192 (patch) | |
tree | 91628df92b0a19958668a6b0dd4a1607a8af37c4 /gdb/tui | |
parent | 88f7e873362279462c676b26fee62376dba82b5c (diff) | |
download | gdb-bfad4537079109d9c41ecd86af9cf84b6825a192.zip gdb-bfad4537079109d9c41ecd86af9cf84b6825a192.tar.gz gdb-bfad4537079109d9c41ecd86af9cf84b6825a192.tar.bz2 |
Move tui_source_window to tui-source.h
This moves tui_source_window to tui-source.h. In this case there were
no method definitions to be moved.
gdb/ChangeLog
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui.c: Update.
* tui/tui-source.h (struct tui_source_window): Move from
tui-data.h.
* tui/tui-layout.c: Update.
* tui/tui-disasm.c: Update.
* tui/tui-data.h (struct tui_source_window): Move to
tui-source.h.
Diffstat (limited to 'gdb/tui')
-rw-r--r-- | gdb/tui/tui-data.h | 31 | ||||
-rw-r--r-- | gdb/tui/tui-disasm.c | 1 | ||||
-rw-r--r-- | gdb/tui/tui-layout.c | 1 | ||||
-rw-r--r-- | gdb/tui/tui-source.h | 31 | ||||
-rw-r--r-- | gdb/tui/tui.c | 1 |
5 files changed, 34 insertions, 31 deletions
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index bb7f0f9..aae1a6a 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -27,6 +27,7 @@ #include "observable.h" struct tui_cmd_window; +struct tui_source_window; /* This is a point definition. */ struct tui_point @@ -384,36 +385,6 @@ public: std::vector<tui_source_element> content; }; -/* A TUI source window. */ - -struct tui_source_window : public tui_source_window_base -{ - tui_source_window (); - ~tui_source_window (); - - DISABLE_COPY_AND_ASSIGN (tui_source_window); - - const char *name () const override - { - return SRC_NAME; - } - - bool location_matches_p (struct bp_location *loc, int line_no) override; - - bool showing_source_p (const char *filename) const; - -protected: - - void do_scroll_vertical (int num_to_scroll) override; - -private: - - void style_changed (); - - /* A token used to register and unregister an observer. */ - gdb::observers::token m_observable; -}; - extern int tui_win_is_auxiliary (enum tui_win_type win_type); diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index a644c28..effe8e7 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -35,6 +35,7 @@ #include "tui/tui-stack.h" #include "tui/tui-file.h" #include "tui/tui-disasm.h" +#include "tui/tui-source.h" #include "progspace.h" #include "objfiles.h" diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 2e67ed1..a5709c5 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -37,6 +37,7 @@ #include "tui/tui-winsource.h" #include "tui/tui-disasm.h" #include "tui/tui-layout.h" +#include "tui/tui-source.h" #include "gdb_curses.h" /******************************* diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h index fc129ab..6faaa2e 100644 --- a/gdb/tui/tui-source.h +++ b/gdb/tui/tui-source.h @@ -25,7 +25,36 @@ #include "tui/tui-data.h" struct symtab; -struct tui_win_info; + +/* A TUI source window. */ + +struct tui_source_window : public tui_source_window_base +{ + tui_source_window (); + ~tui_source_window (); + + DISABLE_COPY_AND_ASSIGN (tui_source_window); + + const char *name () const override + { + return SRC_NAME; + } + + bool location_matches_p (struct bp_location *loc, int line_no) override; + + bool showing_source_p (const char *filename) const; + +protected: + + void do_scroll_vertical (int num_to_scroll) override; + +private: + + void style_changed (); + + /* A token used to register and unregister an observer. */ + gdb::observers::token m_observable; +}; extern enum tui_status tui_set_source_content (tui_source_window_base *, struct symtab *, diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 22de9a7..b15eb32 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -31,6 +31,7 @@ #include "tui/tui-stack.h" #include "tui/tui-win.h" #include "tui/tui-winsource.h" +#include "tui/tui-source.h" #include "target.h" #include "frame.h" #include "breakpoint.h" |