[57/61] Move tui_source_window to tui-source.h
Commit Message
This moves tui_source_window to tui-source.h. In this case there were
no method definitions to be moved.
2019-07-04 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.
---
gdb/ChangeLog | 10 ++++++++++
gdb/tui/tui-data.h | 31 +------------------------------
gdb/tui/tui-disasm.c | 1 +
gdb/tui/tui-layout.c | 1 +
gdb/tui/tui-source.h | 31 ++++++++++++++++++++++++++++++-
gdb/tui/tui.c | 1 +
6 files changed, 44 insertions(+), 31 deletions(-)
@@ -27,6 +27,7 @@
#include "observable.h"
struct tui_cmd_window;
+struct tui_source_window;
/* This is a point definition. */
struct tui_point
@@ -382,36 +383,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);
@@ -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"
@@ -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"
/*******************************
@@ -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 *,
@@ -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"