Move tui_disasm_window to tui-disasm.h

This moves tui_disasm_window to tui-disasm.h.  In this case there were
no method definitions to be moved.

gdb/ChangeLog
2019-07-17  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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5f413c987d6a53a8b46f2cfa981850949dd00f46..3b0aca613ad3a0341d9a0b0d71dccc33d58411e6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2019-07-17  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.
+
 2019-07-17  Tom Tromey  <tom@tromey.com>
 
        * tui/tui-regs.h (struct tui_data_item_window): Move from

diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index e66adc1f29ab724b57549036387d7c49e4b78b09..bb7f0f91ea23057ad5fd8972e5b4d8aef64d39ba 100644 (file)
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -414,29 +414,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 59822c70c5c9b7b1c26a41e93f0e9fbb5e050a0e..cc00d0018fa5f157b35c8a56db9317e91218e97e 100644 (file)
--- 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);