gdb/tui: cleanup includes

Remove includes reported as unused by clangd.  Then, add any includes
necessary to get rid of errors (includes possibly relying on previous
includes)..

I didn't remove the includes of gdb-safe-ctypes.h, because it appears to
do some some preprocessor magic, redefining standard macros.  I'm afraid
that removing these includes could change the behavior unintentionally.

Change-Id: I4c5b652355c3bbce022fe0d447a72dc4e1d17d34
Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/tui/tui-command.c b/gdb/tui/tui-command.c
index d36c1372fb88a48fd8c131c8fee8ea52baa2f5a1..b9bc19ee9eeb0199fcb0e7157207cd825d6cfed7 100644 (file)
--- a/gdb/tui/tui-command.c
+++ b/gdb/tui/tui-command.c
@@ -19,10 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "tui/tui.h"
-#include "tui/tui-data.h"
-#include "tui/tui-win.h"
-#include "tui/tui-io.h"
 #include "tui/tui-command.h"
 #include "tui/tui-wingeneral.h"
 

diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 462771ca163744b6ec7358e6278d70a2a898a398..962dbc5116073a4226e9dbe02d55628b4db6583b 100644 (file)
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -19,12 +19,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "symtab.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-win.h"
 #include "tui/tui-wingeneral.h"
-#include "tui/tui-winsource.h"
 #include "tui/tui-status.h"
 #include "gdb_curses.h"
 #include <algorithm>

diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 04cce0244318be38af6c0253e8ca2298cdd6d16e..b9922db574d74343e32e5d380b0b9959f97c072f 100644 (file)
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -24,8 +24,6 @@
 
 #include "tui/tui.h"
 #include "gdb_curses.h"
-#include "observable.h"
-#include "gdbsupport/gdb-checked-static-cast.h"
 
 /* A deleter that calls delwin.  */
 struct curses_deleter

diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 24a5044ed3799ed7033e679f6ed8c336e6b9ff47..0727d3a90a82df3523be9e31e7508199b5c7d082 100644 (file)
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -29,13 +29,9 @@
 #include "tui/tui.h"
 #include "tui/tui-command.h"
 #include "tui/tui-data.h"
-#include "tui/tui-win.h"
-#include "tui/tui-layout.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-status.h"
-#include "tui/tui-file.h"
 #include "tui/tui-disasm.h"
-#include "tui/tui-source.h"
 #include "progspace.h"
 #include "objfiles.h"
 #include "cli/cli-style.h"
@@ -43,8 +39,6 @@
 #include "gdbsupport/selftest.h"
 #include "inferior.h"
 
-#include "gdb_curses.h"
-
 struct tui_asm_line
 {
   CORE_ADDR addr;

diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h
index 4a7735450ce46349588edab5b9cd2c252bf7cbc1..c5e8eb483d191aa94bd14c1e75bc68b254e50987 100644 (file)
--- a/gdb/tui/tui-disasm.h
+++ b/gdb/tui/tui-disasm.h
@@ -22,6 +22,7 @@
 #ifndef TUI_TUI_DISASM_H
 #define TUI_TUI_DISASM_H
 
+#include "gdbsupport/gdb-checked-static-cast.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui-winsource.h"

diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
index a0d72a0fbd2e45ffbd0d598aba4d7a8c432b03db..78781909b1c38ff2a485985e4196ce03ad4d88d2 100644 (file)
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -19,7 +19,6 @@
 #include "tui/tui-file.h"
 #include "tui/tui-io.h"
 #include "tui/tui-command.h"
-#include "tui.h"
 
 void
 tui_file::puts (const char *linebuffer)

diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index 9dcf789ccae9cb55e04dc5f6ee45cbf62dc9e62b..e6673ab650d8534280dfe82b21d3261bcf85bc0d 100644 (file)
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -19,18 +19,11 @@
 
 #include "symtab.h"
 #include "inferior.h"
-#include "command.h"
-#include "bfd.h"
 #include "symfile.h"
 #include "objfiles.h"
 #include "target.h"
-#include "gdbcore.h"
-#include "gdbsupport/event-loop.h"
-#include "event-top.h"
 #include "frame.h"
 #include "breakpoint.h"
-#include "ui-out.h"
-#include "top.h"
 #include "observable.h"
 #include "source.h"
 #include <unistd.h>
@@ -38,16 +31,11 @@
 
 #include "tui/tui.h"
 #include "tui/tui-hooks.h"
-#include "tui/tui-data.h"
 #include "tui/tui-layout.h"
-#include "tui/tui-io.h"
 #include "tui/tui-regs.h"
-#include "tui/tui-win.h"
 #include "tui/tui-status.h"
 #include "tui/tui-winsource.h"
 
-#include "gdb_curses.h"
-
 static void
 tui_new_objfile_hook (struct objfile* objfile)
 {

diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c
index 7ebaf8f83f74e006c42db892f786b57b3cc8f7f8..25761befc65186a8960921acce1d53c305a7d6db 100644 (file)
--- a/gdb/tui/tui-interp.c
+++ b/gdb/tui/tui-interp.c
@@ -21,16 +21,11 @@
 #include "interps.h"
 #include "ui.h"
 #include "event-top.h"
-#include "gdbsupport/event-loop.h"
 #include "ui-out.h"
 #include "cli-out.h"
-#include "tui/tui-data.h"
 #include "tui/tui-win.h"
 #include "tui/tui.h"
 #include "tui/tui-io.h"
-#include "infrun.h"
-#include "observable.h"
-#include "gdbthread.h"
 #include "inferior.h"
 #include "main.h"
 

diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
index 299a809a939fd8fafe323af163c57f73bc865c8d..f962d7bdc82b66fd00c64b6f4119f42140f84880 100644 (file)
--- a/gdb/tui/tui-io.c
+++ b/gdb/tui/tui-io.c
@@ -23,7 +23,6 @@
 #include "target.h"
 #include "gdbsupport/event-loop.h"
 #include "event-top.h"
-#include "command.h"
 #include "top.h"
 #include "ui.h"
 #include "tui/tui.h"

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 3cb5a05b626a82b808010308aac2529ca7e8caa8..665b5211559816d3864a9576d5a879a922fb146f 100644 (file)
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -19,15 +19,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "arch-utils.h"
 #include "command.h"
 #include "symtab.h"
 #include "frame.h"
-#include "source.h"
-#include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "cli/cli-utils.h"
-#include <ctype.h>
 #include <unordered_set>
 
 #include "tui/tui.h"
@@ -37,7 +33,6 @@
 #include "tui/tui-status.h"
 #include "tui/tui-regs.h"
 #include "tui/tui-win.h"
-#include "tui/tui-winsource.h"
 #include "tui/tui-disasm.h"
 #include "tui/tui-layout.h"
 #include "tui/tui-source.h"

diff --git a/gdb/tui/tui-location.c b/gdb/tui/tui-location.c
index 7e8f769d804737c5764c2eed6fa40c1cf0f48cb2..8e63d4f2c4108b1153fc8255b7d537c6ebf95845 100644 (file)
--- a/gdb/tui/tui-location.c
+++ b/gdb/tui/tui-location.c
@@ -15,9 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "tui/tui.h"
 #include "tui/tui-status.h"
-#include "tui/tui-data.h"
 #include "tui/tui-location.h"
 #include "symtab.h"
 #include "source.h"

diff --git a/gdb/tui/tui-location.h b/gdb/tui/tui-location.h
index db558a4e14732f1e8aab169f4f5ac3755affad7d..ec05f45706925aae429b1f1a6fa5debd93f972a7 100644 (file)
--- a/gdb/tui/tui-location.h
+++ b/gdb/tui/tui-location.h
@@ -18,11 +18,6 @@
 #ifndef TUI_TUI_LOCATION_H
 #define TUI_TUI_LOCATION_H
 
-#include "tui/tui.h"
-#include "tui/tui.h"
-#include "gdb_curses.h"
-#include "observable.h"
-
 /* Class used to track the current location that the TUI is displaying.  An
    instance of this class will be created; as events occur within GDB the
    location information within this instance will be updated.  As windows

diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 50708fd383fcafa09351a9945aa6075e11b06a8d..43b519ac127c2047c76ddb0b3c744572fe99bf38 100644 (file)
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -21,10 +21,7 @@
 
 #include "arch-utils.h"
 #include "tui/tui.h"
-#include "tui/tui-data.h"
 #include "symtab.h"
-#include "gdbtypes.h"
-#include "cli/cli-cmds.h"
 #include "frame.h"
 #include "regcache.h"
 #include "inferior.h"
@@ -32,11 +29,8 @@
 #include "tui/tui-layout.h"
 #include "tui/tui-win.h"
 #include "tui/tui-wingeneral.h"
-#include "tui/tui-file.h"
 #include "tui/tui-regs.h"
-#include "tui/tui-io.h"
 #include "reggroups.h"
-#include "valprint.h"
 #include "completer.h"
 
 #include "gdb_curses.h"

diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 4a799e6b2f682a20eb8361df00cf5347df5cf27a..69ba10724e7c2f325ca9d3e1e8fb995656c975f4 100644 (file)
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -22,6 +22,7 @@
 #ifndef TUI_TUI_REGS_H
 #define TUI_TUI_REGS_H
 
+#include "gdbsupport/gdb-checked-static-cast.h"
 #include "tui/tui-data.h"
 #include "reggroups.h"
 

diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 5c17aba3a1a24f88d0bc0b074c284f637d6d5272..444c0f7a90e6aaeb292e13ab6488a71868c695f9 100644 (file)
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <math.h>
-#include <ctype.h>
 #include "symtab.h"
 #include "frame.h"
 #include "breakpoint.h"
@@ -28,16 +27,11 @@
 #include "objfiles.h"
 #include "filenames.h"
 #include "source-cache.h"
-
-#include "tui/tui.h"
-#include "tui/tui-data.h"
-#include "tui/tui-io.h"
 #include "tui/tui-status.h"
 #include "tui/tui-win.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
 #include "tui/tui-location.h"
-#include "gdb_curses.h"
 
 /* Function to display source in the source window.  */
 bool

diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h
index 9a72ed90b476b8c96e5370ed27a5a0f5bc8df7a0..f32167f42246dfdd2f05f46b6cb5071548e8fd27 100644 (file)
--- a/gdb/tui/tui-source.h
+++ b/gdb/tui/tui-source.h
@@ -22,6 +22,7 @@
 #ifndef TUI_TUI_SOURCE_H
 #define TUI_TUI_SOURCE_H
 
+#include "gdbsupport/gdb-checked-static-cast.h"
 #include "tui/tui-data.h"
 #include "tui-winsource.h"
 

diff --git a/gdb/tui/tui-status.c b/gdb/tui/tui-status.c
index de754cbe6a6c35583f10d03219b4c3d9bff6d88b..5239415761189f1856b2db2885223700c7f48b6c 100644 (file)
--- a/gdb/tui/tui-status.c
+++ b/gdb/tui/tui-status.c
@@ -20,21 +20,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "symtab.h"
-#include "breakpoint.h"
 #include "frame.h"
 #include "command.h"
 #include "inferior.h"
 #include "target.h"
 #include "top.h"
 #include "gdb-demangle.h"
-#include "source.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-status.h"
 #include "tui/tui-wingeneral.h"
-#include "tui/tui-source.h"
 #include "tui/tui-winsource.h"
-#include "tui/tui-file.h"
 #include "tui/tui-location.h"
 
 #include "gdb_curses.h"

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index f43ead8e7dd159108f498561fbad24ee68ce8b67..2f793e264e1c0945e4a092d5a96686c1cd9086a5 100644 (file)
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -26,14 +26,9 @@
 
 #include "command.h"
 #include "symtab.h"
-#include "breakpoint.h"
 #include "frame.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-style.h"
-#include "top.h"
-#include "source.h"
-#include "gdbsupport/event-loop.h"
-#include "async-event.h"
 #include "ui-out.h"
 #include "utils.h"
 
@@ -43,8 +38,6 @@
 #include "tui/tui-data.h"
 #include "tui/tui-layout.h"
 #include "tui/tui-wingeneral.h"
-#include "tui/tui-status.h"
-#include "tui/tui-regs.h"
 #include "tui/tui-disasm.h"
 #include "tui/tui-source.h"
 #include "tui/tui-winsource.h"
@@ -55,8 +48,6 @@
 #include "readline/readline.h"
 #include <string_view>
 
-#include <signal.h>
-
 static void tui_set_tab_width_command (const char *, int);
 static void tui_refresh_all_command (const char *, int);
 static void tui_all_windows_info (const char *, int);

diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index 6260d08cd3d774f3310ba313c22fad68f94ff2d8..11530472687e0ba1ba214080508f7b0260b3192b 100644 (file)
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -19,12 +19,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-io.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-win.h"
-#include "tui/tui-status.h"
 #include "cli/cli-style.h"
 
 #include "gdb_curses.h"

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index a05f6480d800b7fcaaaf57d8dd300130bad4a108..80297e59dd60dfc64cef249dd886504797d9c0b4 100644 (file)
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -19,14 +19,13 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <ctype.h>
+#include "observable.h"
 #include "symtab.h"
 #include "frame.h"
 #include "breakpoint.h"
 #include "value.h"
 #include "source.h"
 #include "objfiles.h"
-#include "filenames.h"
 #include "gdbsupport/gdb-safe-ctype.h"
 
 #include "tui/tui.h"
@@ -34,7 +33,6 @@
 #include "tui/tui-io.h"
 #include "tui/tui-status.h"
 #include "tui/tui-win.h"
-#include "tui/tui-wingeneral.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
 #include "tui/tui-disasm.h"

diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 646597306f26ede528acc51af233d20e0fe72cc9..29828c121bd6af8022f053eeee2554f09a6b4479 100644 (file)
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -22,6 +22,7 @@
 #ifndef TUI_TUI_WINSOURCE_H
 #define TUI_TUI_WINSOURCE_H
 
+#include "gdbsupport/observable.h"
 #include "tui/tui-data.h"
 #include "symtab.h"
 

diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 1318caed2059cead5585f065b3c46b77c84b9c7c..781ec85f8e826d4ad9fb37933ef7f391e9d503e2 100644 (file)
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -28,7 +28,6 @@
 #include "tui/tui-data.h"
 #include "tui/tui-layout.h"
 #include "tui/tui-io.h"
-#include "tui/tui-regs.h"
 #include "tui/tui-status.h"
 #include "tui/tui-win.h"
 #include "tui/tui-wingeneral.h"
@@ -36,18 +35,13 @@
 #include "tui/tui-source.h"
 #include "target.h"
 #include "frame.h"
-#include "breakpoint.h"
 #include "inferior.h"
 #include "symtab.h"
-#include "source.h"
 #include "terminal.h"
 #include "top.h"
 #include "ui.h"
 
-#include <ctype.h>
-#include <signal.h>
 #include <fcntl.h>
-#include <setjmp.h>
 
 #include "gdb_curses.h"
 #include "interps.h"