This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 56/61] Move tui_disasm_window to tui-disasm.h
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Thu, 4 Jul 2019 11:03:06 -0600
- Subject: [PATCH 56/61] Move tui_disasm_window to tui-disasm.h
- References: <20190704170311.15982-1-tom@tromey.com>
This moves tui_disasm_window to tui-disasm.h. In this case there were
no method definitions to be moved.
2019-07-04 Tom Tromey <tom@tromey.com>
* tui/tui-disasm.h (struct tui_disasm_window): Move from
tui-data.h.
* tui/tui-data.h (struct tui_disasm_window): Move to
tui-disasm.h.
---
gdb/ChangeLog | 7 +++++++
gdb/tui/tui-data.h | 23 -----------------------
gdb/tui/tui-disasm.h | 27 +++++++++++++++++++++++++--
3 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 2f2f2a0ab91..3446d51b8dc 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -412,29 +412,6 @@ private:
gdb::observers::token m_observable;
};
-/* A TUI disassembly window. */
-
-struct tui_disasm_window : public tui_source_window_base
-{
- tui_disasm_window ()
- : tui_source_window_base (DISASSEM_WIN)
- {
- }
-
- DISABLE_COPY_AND_ASSIGN (tui_disasm_window);
-
- const char *name () const override
- {
- return DISASSEM_NAME;
- }
-
- bool location_matches_p (struct bp_location *loc, int line_no) override;
-
-protected:
-
- void do_scroll_vertical (int num_to_scroll) override;
-};
-
extern int tui_win_is_auxiliary (enum tui_win_type win_type);
diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h
index 59822c70c5c..cc00d0018fa 100644
--- a/gdb/tui/tui-disasm.h
+++ b/gdb/tui/tui-disasm.h
@@ -22,8 +22,31 @@
#ifndef TUI_TUI_DISASM_H
#define TUI_TUI_DISASM_H
-#include "tui/tui.h" /* For enum tui_status. */
-#include "tui/tui-data.h" /* For enum tui_scroll_direction. */
+#include "tui/tui.h"
+#include "tui/tui-data.h"
+
+/* A TUI disassembly window. */
+
+struct tui_disasm_window : public tui_source_window_base
+{
+ tui_disasm_window ()
+ : tui_source_window_base (DISASSEM_WIN)
+ {
+ }
+
+ DISABLE_COPY_AND_ASSIGN (tui_disasm_window);
+
+ const char *name () const override
+ {
+ return DISASSEM_NAME;
+ }
+
+ bool location_matches_p (struct bp_location *loc, int line_no) override;
+
+protected:
+
+ void do_scroll_vertical (int num_to_scroll) override;
+};
extern enum tui_status tui_set_disassem_content (tui_source_window_base *,
struct gdbarch *, CORE_ADDR);
--
2.17.2