From 8921f87f44ff3134d54521859d951355f9cffbea Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sun, 13 Oct 2024 14:47:46 -0400 Subject: [PATCH] Apply suggestions from include-what-you-use --- src/browser/actions.c | 14 +++++++++++--- src/browser/actions.h | 4 ++++ src/browser/actions_pane.c | 5 ++--- src/browser/actions_pane.h | 3 +++ src/browser/browser.c | 15 +++++++-------- src/browser/browser.h | 4 ++++ src/browser/directory_pane.c | 9 ++++----- src/browser/directory_pane.h | 4 ++++ src/common.h | 2 ++ src/conv/audio.c | 5 ++++- src/conv/audio.h | 2 ++ src/conv/endoom.c | 4 ++-- src/conv/error.c | 5 ++--- src/conv/export.c | 12 ++++++++---- src/conv/export.h | 7 +++++++ src/conv/graphic.c | 6 +++++- src/conv/graphic.h | 4 ++++ src/conv/import.c | 11 ++++++----- src/conv/import.h | 6 ++++++ src/conv/mus2mid.c | 4 ++-- src/conv/mus2mid.h | 2 ++ src/conv/palette.c | 5 +++-- src/conv/vpng.c | 8 +++++++- src/conv/vpng.h | 8 ++++++++ src/fs/file_set.c | 6 ------ src/fs/real_dir.c | 8 ++------ src/fs/vfs.c | 9 +++------ src/fs/vfs.h | 4 ++++ src/fs/wad_dir.c | 8 +------- src/fs/wad_file.c | 5 +++-- src/fs/wad_file.h | 4 ++++ src/lump_info.c | 6 +++++- src/pager/help.c | 8 ++++++-- src/pager/help.h | 4 ++++ src/pager/hexdump.c | 10 ++++++++-- src/pager/hexdump.h | 6 ++++++ src/pager/pager.c | 5 ++++- src/pager/pager.h | 3 +++ src/pager/plaintext.c | 6 +++++- src/pager/plaintext.h | 7 +++++++ src/palette/actions.c | 13 ++++++++----- src/palette/doom.c | 5 ----- src/palette/palette.c | 11 +++++++++-- src/palette/palette.h | 6 ++++++ src/palette/palfs.c | 11 +++++------ src/palette/palfs.h | 3 +++ src/sixel_display.c | 8 +++----- src/sixel_display.h | 2 ++ src/stringlib.c | 4 +++- src/stringlib.h | 1 + src/struct.c | 5 ++--- src/struct.h | 2 ++ src/termfuncs.c | 8 ++++++-- src/termfuncs.h | 4 ++++ src/textures/actions.c | 9 ++++++--- src/textures/bundle.c | 5 ++--- src/textures/config.c | 3 +-- src/textures/lump_dir.c | 6 +----- src/textures/pnames.c | 5 ++--- src/textures/pnames_dir.c | 7 ++----- src/textures/texture_dir.c | 6 ++---- src/textures/textures.c | 6 +++--- src/textures/textures.h | 10 ++++++++++ src/ui/actions_bar.c | 8 +++++--- src/ui/actions_bar.h | 2 ++ src/ui/dialog.c | 6 ++++-- src/ui/list_pane.c | 4 ++-- src/ui/list_pane.h | 3 +++ src/ui/pane.c | 5 ++--- src/ui/pane.h | 1 + src/ui/stack.c | 8 +++----- src/ui/stack.h | 3 +++ src/ui/text_input.c | 4 ++-- src/ui/text_input.h | 1 + src/ui/title_bar.c | 9 +++++---- src/ui/ui.c | 7 +++---- src/ui/ui.h | 2 ++ src/view.c | 11 ++++++++--- src/view.h | 5 +++++ src/wadgadget.c | 4 ++-- 80 files changed, 310 insertions(+), 161 deletions(-) diff --git a/src/browser/actions.c b/src/browser/actions.c index 6a5c177..aab1102 100644 --- a/src/browser/actions.c +++ b/src/browser/actions.c @@ -8,13 +8,18 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "browser/actions.h" + #include #include #include #include #include +#include +#include +#include +#include -#include "browser/actions.h" #include "browser/browser.h" #include "common.h" #include "conv/error.h" @@ -22,16 +27,19 @@ #include "ui/dialog.h" #include "conv/export.h" #include "ui/pane.h" -#include "pager/pager.h" #include "pager/help.h" #include "pager/hexdump.h" #include "palette/palfs.h" #include "stringlib.h" #include "ui/title_bar.h" -#include "ui/ui.h" #include "fs/vfs.h" #include "textures/textures.h" #include "view.h" +#include "browser/directory_pane.h" +#include "fs/vfile.h" +#include "fs/wad_file.h" +#include "ui/actions_bar.h" +#include "ui/list_pane.h" #define WAD_JUNK_THRESHOLD_KB 500 diff --git a/src/browser/actions.h b/src/browser/actions.h index 6543848..090a0ab 100644 --- a/src/browser/actions.h +++ b/src/browser/actions.h @@ -11,9 +11,13 @@ #ifndef BROWSER__ACTIONS_H_INCLUDED #define BROWSER__ACTIONS_H_INCLUDED +#include + #include "browser/directory_pane.h" #include "ui/actions_bar.h" +struct directory; + extern const struct action copy_action; extern const struct action copy_noconv_action; extern const struct action export_action; diff --git a/src/browser/actions_pane.c b/src/browser/actions_pane.c index eaed74f..2d930f6 100644 --- a/src/browser/actions_pane.c +++ b/src/browser/actions_pane.c @@ -8,14 +8,13 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "browser/actions_pane.h" + #include -#include #include -#include "browser/actions_pane.h" #include "ui/colors.h" #include "common.h" -#include "stringlib.h" #include "ui/ui.h" static const int key_ordering[] = { diff --git a/src/browser/actions_pane.h b/src/browser/actions_pane.h index 60d8849..397c38e 100644 --- a/src/browser/actions_pane.h +++ b/src/browser/actions_pane.h @@ -11,6 +11,9 @@ #ifndef BROWSER__ACTIONS_PANE_H_INCLUDED #define BROWSER__ACTIONS_PANE_H_INCLUDED +#include +#include + #include "ui/actions_bar.h" #include "ui/pane.h" diff --git a/src/browser/browser.c b/src/browser/browser.c index ac45f3e..fdca14e 100644 --- a/src/browser/browser.c +++ b/src/browser/browser.c @@ -8,32 +8,31 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "browser/browser.h" + #include #include -#include #include +#include +#include #include "common.h" #include "fs/vfs.h" #include "lump_info.h" -#include "sixel_display.h" -#include "stringlib.h" #include "termfuncs.h" #include "textures/textures.h" #include "ui/actions_bar.h" #include "ui/colors.h" -#include "ui/dialog.h" #include "ui/stack.h" #include "ui/title_bar.h" #include "ui/ui.h" -#include "view.h" - #include "browser/actions_pane.h" #include "browser/actions.h" #include "browser/directory_pane.h" -#include "browser/browser.h" - #include "palette/actions.h" +#include "ui/list_pane.h" +#include "ui/pane.h" +#include "ui/text_input.h" #define INFO_PANE_WIDTH 30 diff --git a/src/browser/browser.h b/src/browser/browser.h index 66b422f..93f98a0 100644 --- a/src/browser/browser.h +++ b/src/browser/browser.h @@ -11,6 +11,10 @@ #ifndef BROWSER__BROWSER_H_INCLUDED #define BROWSER__BROWSER_H_INCLUDED +#include + +struct directory_pane; + void B_SwitchToPane(struct directory_pane *pane); void B_ReplacePane(struct directory_pane *old_pane, struct directory_pane *new_pane); diff --git a/src/browser/directory_pane.c b/src/browser/directory_pane.c index 31dcb72..ecbfac9 100644 --- a/src/browser/directory_pane.c +++ b/src/browser/directory_pane.c @@ -8,18 +8,17 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "browser/directory_pane.h" + #include #include #include #include -#include +#include #include "ui/colors.h" -#include "browser/directory_pane.h" -#include "common.h" -#include "ui/dialog.h" #include "stringlib.h" -#include "ui/ui.h" +#include "ui/pane.h" static int HeaderEntries(struct directory_pane *dp) { diff --git a/src/browser/directory_pane.h b/src/browser/directory_pane.h index 6148f64..34ff3ce 100644 --- a/src/browser/directory_pane.h +++ b/src/browser/directory_pane.h @@ -11,6 +11,10 @@ #ifndef BROWSER__DIRECTORY_PANE_H_INCLUDED #define BROWSER__DIRECTORY_PANE_H_INCLUDED +#include +#include +#include + #include "ui/list_pane.h" #include "fs/vfs.h" diff --git a/src/common.h b/src/common.h index 89fd5e0..2b16e03 100644 --- a/src/common.h +++ b/src/common.h @@ -12,6 +12,8 @@ #define COMMON_H_INCLUDED #include +#include +#include #include #define CTRL_(x) ((x) & 0x1f) diff --git a/src/conv/audio.c b/src/conv/audio.c index b63291d..88ebe1e 100644 --- a/src/conv/audio.c +++ b/src/conv/audio.c @@ -8,11 +8,14 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "conv/audio.h" + #include #include #include +#include +#include -#include "conv/audio.h" #include "conv/error.h" #include "common.h" diff --git a/src/conv/audio.h b/src/conv/audio.h index c15ac5a..d18b5fa 100644 --- a/src/conv/audio.h +++ b/src/conv/audio.h @@ -11,6 +11,8 @@ #ifndef CONV__AUDIO_H_INCLUDED #define CONV__AUDIO_H_INCLUDED +#include + #include "fs/vfile.h" struct sound_header { diff --git a/src/conv/endoom.c b/src/conv/endoom.c index 2305933..712ad46 100644 --- a/src/conv/endoom.c +++ b/src/conv/endoom.c @@ -9,16 +9,16 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "conv/endoom.h" + #include #include #include #include #include #include -#include #include "common.h" -#include "conv/endoom.h" #include "termfuncs.h" static const char *cp437_to_utf8[256] = { diff --git a/src/conv/error.c b/src/conv/error.c index 02c729d..ba761aa 100644 --- a/src/conv/error.c +++ b/src/conv/error.c @@ -8,14 +8,13 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "conv/error.h" + #include -#include #include #include #include -#include "conv/error.h" - #define MAX_ERROR_LEN 256 static bool have_error; diff --git a/src/conv/export.c b/src/conv/export.c index 2938232..851097e 100644 --- a/src/conv/export.c +++ b/src/conv/export.c @@ -8,15 +8,15 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // -#include +#include "conv/export.h" + #include #include -#include +#include #include "conv/audio.h" #include "conv/error.h" #include "ui/dialog.h" -#include "conv/export.h" #include "conv/graphic.h" #include "conv/palette.h" #include "lump_info.h" @@ -24,7 +24,11 @@ #include "stringlib.h" #include "textures/textures.h" #include "ui/title_bar.h" -#include "ui/ui.h" +#include "fs/vfile.h" +#include "fs/vfs.h" +#include "palette/palette.h" + +struct lump_type; static VFILE *ConvertPnames(VFILE *input) { diff --git a/src/conv/export.h b/src/conv/export.h index 0ba4602..99037f8 100644 --- a/src/conv/export.h +++ b/src/conv/export.h @@ -11,9 +11,16 @@ #ifndef CONV__EXPORT_H_INCLUDED #define CONV__EXPORT_H_INCLUDED +#include + #include "lump_info.h" #include "fs/vfs.h" +struct directory; +struct directory_entry; +struct file_set; +struct lump_type; + bool ExportToFile(struct directory *from, struct directory_entry *ent, const struct lump_type *lt, const char *to_filename, bool convert); diff --git a/src/conv/graphic.c b/src/conv/graphic.c index 9bffd21..d84e0a4 100644 --- a/src/conv/graphic.c +++ b/src/conv/graphic.c @@ -8,15 +8,19 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "conv/graphic.h" + #include #include #include +#include +#include +#include #include "common.h" #include "fs/vfile.h" #include "palette/palette.h" #include "conv/error.h" -#include "conv/graphic.h" #include "conv/vpng.h" // Hexen loading screen diff --git a/src/conv/graphic.h b/src/conv/graphic.h index 831c689..7615dfb 100644 --- a/src/conv/graphic.h +++ b/src/conv/graphic.h @@ -11,9 +11,13 @@ #ifndef CONV__GRAPHIC_H_INCLUDED #define CONV__GRAPHIC_H_INCLUDED +#include + #include "fs/vfile.h" #include "palette/palette.h" +struct palette; + struct patch_header { uint16_t width, height; int16_t leftoffset, topoffset; diff --git a/src/conv/import.c b/src/conv/import.c index b45a64a..c40aa72 100644 --- a/src/conv/import.c +++ b/src/conv/import.c @@ -8,22 +8,23 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "conv/import.h" + #include #include #include -#include -#include +#include -#include "common.h" #include "conv/audio.h" #include "conv/error.h" #include "conv/graphic.h" -#include "conv/import.h" #include "conv/palette.h" -#include "lump_info.h" #include "stringlib.h" #include "textures/textures.h" #include "ui/dialog.h" +#include "fs/vfs.h" +#include "fs/wad_file.h" +#include "palette/palette.h" static void LumpNameForEntry(char *namebuf, struct directory_entry *ent) { diff --git a/src/conv/import.h b/src/conv/import.h index 33b47a5..7464efc 100644 --- a/src/conv/import.h +++ b/src/conv/import.h @@ -11,7 +11,13 @@ #ifndef CONV__IMPORT_H_INCLUDED #define CONV__IMPORT_H_INCLUDED +#include + #include "fs/vfs.h" +#include "fs/vfile.h" + +struct directory; +struct file_set; bool ImportFromFile(VFILE *from_file, const char *src_name, struct directory *to_wad, int lumpnum, bool convert); diff --git a/src/conv/mus2mid.c b/src/conv/mus2mid.c index 90ab79e..4f8ddb5 100644 --- a/src/conv/mus2mid.c +++ b/src/conv/mus2mid.c @@ -13,12 +13,12 @@ // mus2mid.c - Ben Ryves 2006 - http://benryves.com - benryves@benryves.com // Use to convert a MUS file into a single track, type 0 MIDI file. +#include "conv/mus2mid.h" + #include #include #include -#include "common.h" -#include "conv/mus2mid.h" #include "fs/vfile.h" // TODO diff --git a/src/conv/mus2mid.h b/src/conv/mus2mid.h index 8b6832a..1bf1e83 100644 --- a/src/conv/mus2mid.h +++ b/src/conv/mus2mid.h @@ -16,6 +16,8 @@ #ifndef CONV__MUS2MID_H_INCLUDED #define CONV__MUS2MID_H_INCLUDED +#include + #include "fs/vfile.h" bool mus2mid(VFILE *musinput, VFILE *midioutput); diff --git a/src/conv/palette.c b/src/conv/palette.c index 7758783..6280a2d 100644 --- a/src/conv/palette.c +++ b/src/conv/palette.c @@ -10,9 +10,10 @@ #include #include -#include +#include +#include +#include -#include "common.h" #include "fs/vfile.h" #include "palette/palette.h" #include "conv/error.h" diff --git a/src/conv/vpng.c b/src/conv/vpng.c index 0be42f8..31f22f0 100644 --- a/src/conv/vpng.c +++ b/src/conv/vpng.c @@ -11,16 +11,22 @@ // Basic libpng wrapper functions for reading and writing PNG files // through the VFILE interface. +#include "conv/vpng.h" + #include #include #include +#include +#include +#include #include "common.h" #include "fs/vfile.h" #include "palette/palette.h" #include "conv/error.h" #include "conv/graphic.h" -#include "conv/vpng.h" +#include "png.h" +#include "pngconf.h" #define OFFSET_CHUNK_NAME "grAb" diff --git a/src/conv/vpng.h b/src/conv/vpng.h index e34ce39..125281a 100644 --- a/src/conv/vpng.h +++ b/src/conv/vpng.h @@ -12,6 +12,14 @@ #define CONV__VPNG_H_INCLUDED #include +#include +#include +#include + +#include "fs/vfile.h" + +struct palette; +struct patch_header; struct png_context { png_structp ppng; diff --git a/src/fs/file_set.c b/src/fs/file_set.c index 513ca62..2dddeb6 100644 --- a/src/fs/file_set.c +++ b/src/fs/file_set.c @@ -13,15 +13,9 @@ #include #include #include -#include #include -#include -#include -#include - #include "common.h" -#include "stringlib.h" #include "fs/vfs.h" void VFS_ClearSet(struct file_set *l) diff --git a/src/fs/real_dir.c b/src/fs/real_dir.c index 9ae0ff2..0a97eca 100644 --- a/src/fs/real_dir.c +++ b/src/fs/real_dir.c @@ -11,20 +11,16 @@ #include #include #include -#include #include -#include -#include #include - #include -#include #include +#include #include "common.h" #include "stringlib.h" #include "fs/vfs.h" -#include "fs/wad_file.h" +#include "fs/vfile.h" static int HasWadExtension(const char *name) { diff --git a/src/fs/vfs.c b/src/fs/vfs.c index ec46bc9..b239d91 100644 --- a/src/fs/vfs.c +++ b/src/fs/vfs.c @@ -8,6 +8,8 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "fs/vfs.h" + #include #include #include @@ -15,15 +17,10 @@ #include #include #include -#include - -#include -#include -#include +#include #include "common.h" #include "stringlib.h" -#include "fs/vfs.h" struct directory *VFS_OpenRealDir(const char *path); // real_dir.c struct directory *VFS_OpenWadAsDirectory(const char *path); // wad_dir.c diff --git a/src/fs/vfs.h b/src/fs/vfs.h index c2fded0..0d20e47 100644 --- a/src/fs/vfs.h +++ b/src/fs/vfs.h @@ -11,6 +11,10 @@ #ifndef FS__VFS_H_INCLUDED #define FS__VFS_H_INCLUDED +#include +#include +#include + #include "fs/vfile.h" #include "fs/wad_file.h" diff --git a/src/fs/wad_dir.c b/src/fs/wad_dir.c index a76529c..b0f1feb 100644 --- a/src/fs/wad_dir.c +++ b/src/fs/wad_dir.c @@ -11,19 +11,13 @@ #include #include #include -#include #include -#include -#include - -#include -#include -#include #include "common.h" #include "stringlib.h" #include "fs/vfs.h" #include "fs/wad_file.h" +#include "fs/vfile.h" struct wad_directory { struct directory dir; diff --git a/src/fs/wad_file.c b/src/fs/wad_file.c index 7981b43..72bf731 100644 --- a/src/fs/wad_file.c +++ b/src/fs/wad_file.c @@ -8,19 +8,20 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "fs/wad_file.h" + #include #include #include #include -#include #include #include #include +#include #include "common.h" #include "ui/dialog.h" #include "fs/vfile.h" -#include "fs/wad_file.h" #define REVISION_DESCR_LEN 40 #define WAD_FILE_ENTRY_LEN 16 diff --git a/src/fs/wad_file.h b/src/fs/wad_file.h index 6d14d57..d9f738d 100644 --- a/src/fs/wad_file.h +++ b/src/fs/wad_file.h @@ -11,6 +11,10 @@ #ifndef FS__WAD_FILE_H_INCLUDED #define FS__WAD_FILE_H_INCLUDED +#include +#include +#include + #include "fs/vfile.h" #define LUMP_HEADER_LEN 8 diff --git a/src/lump_info.c b/src/lump_info.c index c3aea44..d5031bf 100644 --- a/src/lump_info.c +++ b/src/lump_info.c @@ -8,10 +8,12 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // -#include #include #include #include +#include +#include +#include #include "common.h" #include "conv/audio.h" @@ -19,6 +21,8 @@ #include "stringlib.h" #include "fs/wad_file.h" +struct wad_file; + struct lump_section { const char *start1, *start2; const char *end1, *end2; diff --git a/src/pager/help.c b/src/pager/help.c index 3fcf4c4..64a9c98 100644 --- a/src/pager/help.c +++ b/src/pager/help.c @@ -11,16 +11,20 @@ // Help viewer. This implements a very restricted subset of the Markdown // syntax. +#include "pager/help.h" + #include #include #include +#include +#include +#include +#include #include "common.h" -#include "fs/vfile.h" #include "help_text.h" #include "pager/pager.h" #include "pager/plaintext.h" -#include "pager/help.h" #include "stringlib.h" #include "ui/actions_bar.h" #include "ui/dialog.h" diff --git a/src/pager/help.h b/src/pager/help.h index 52fe2ae..859c2c5 100644 --- a/src/pager/help.h +++ b/src/pager/help.h @@ -11,6 +11,10 @@ #ifndef PAGER__HELP_H_INCLUDED #define PAGER__HELP_H_INCLUDED +#include + +#include "pager/pager.h" + struct help_pager_history { char *filename; int window_offset, current_link, current_column; diff --git a/src/pager/hexdump.c b/src/pager/hexdump.c index fe1c71d..1268792 100644 --- a/src/pager/hexdump.c +++ b/src/pager/hexdump.c @@ -8,17 +8,23 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "pager/hexdump.h" + #include -#include +#include +#include +#include +#include #include "common.h" #include "fs/vfile.h" #include "pager/pager.h" #include "pager/help.h" -#include "pager/hexdump.h" #include "pager/plaintext.h" #include "ui/dialog.h" #include "ui/title_bar.h" +#include "ui/actions_bar.h" +#include "ui/pane.h" // Record lengths for different lump types. TODO: This should probably be // done by lump type (lump_info.h), not by name. diff --git a/src/pager/hexdump.h b/src/pager/hexdump.h index 67df6e3..311ba82 100644 --- a/src/pager/hexdump.h +++ b/src/pager/hexdump.h @@ -11,7 +11,13 @@ #ifndef PAGER__HEXDUMP_H_INCLUDED #define PAGER__HEXDUMP_H_INCLUDED +#include +#include +#include + #include "pager/help.h" +#include "fs/vfile.h" +#include "pager/pager.h" struct hexdump_pager_config { struct pager_config pc; diff --git a/src/pager/pager.c b/src/pager/pager.c index d51aef3..5e60f3a 100644 --- a/src/pager/pager.c +++ b/src/pager/pager.c @@ -8,12 +8,15 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "pager/pager.h" + #include #include #include +#include +#include #include "common.h" -#include "pager/pager.h" #include "pager/help.h" #include "ui/actions_bar.h" #include "ui/dialog.h" diff --git a/src/pager/pager.h b/src/pager/pager.h index a3ebca2..5c52e25 100644 --- a/src/pager/pager.h +++ b/src/pager/pager.h @@ -12,6 +12,9 @@ #define PAGER__PAGER_H_INCLUDED #include +#include +#include + #include "ui/actions_bar.h" #include "ui/pane.h" diff --git a/src/pager/plaintext.c b/src/pager/plaintext.c index 10b94ad..737a175 100644 --- a/src/pager/plaintext.c +++ b/src/pager/plaintext.c @@ -8,15 +8,19 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "pager/plaintext.h" + #include #include +#include +#include #include "common.h" #include "fs/vfile.h" #include "pager/pager.h" #include "pager/hexdump.h" -#include "pager/plaintext.h" #include "ui/actions_bar.h" +#include "ui/pane.h" static void SwitchToHexdump(void) { diff --git a/src/pager/plaintext.h b/src/pager/plaintext.h index d82767d..9c8c0e9 100644 --- a/src/pager/plaintext.h +++ b/src/pager/plaintext.h @@ -11,6 +11,13 @@ #ifndef PAGER__PLAINTEXT_H_INCLUDED #define PAGER__PLAINTEXT_H_INCLUDED +#include +#include +#include + +#include "fs/vfile.h" +#include "pager/pager.h" + struct plaintext_pager_config { struct pager_config pc; char **lines; diff --git a/src/palette/actions.c b/src/palette/actions.c index c18734e..a06a76a 100644 --- a/src/palette/actions.c +++ b/src/palette/actions.c @@ -9,25 +9,28 @@ // #include -#include #include +#include +#include +#include #include "ui/actions_bar.h" #include "ui/dialog.h" -#include "ui/title_bar.h" - #include "browser/actions.h" #include "browser/browser.h" #include "browser/directory_pane.h" #include "common.h" #include "conv/error.h" -#include "conv/export.h" #include "stringlib.h" #include "view.h" #include "fs/wad_file.h" - #include "palette/palette.h" #include "palette/palfs.h" +#include "fs/vfile.h" +#include "fs/vfs.h" +#include "lump_info.h" + +struct wad_file; static void PerformViewPalette(void) { diff --git a/src/palette/doom.c b/src/palette/doom.c index e3fddbf..a0cc5e2 100644 --- a/src/palette/doom.c +++ b/src/palette/doom.c @@ -8,11 +8,6 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // -#include -#include -#include - -#include "fs/vfile.h" #include "palette/palette.h" // TODO: Get palette from current WADs diff --git a/src/palette/palette.c b/src/palette/palette.c index 9e72426..2addeb4 100644 --- a/src/palette/palette.c +++ b/src/palette/palette.c @@ -1,17 +1,24 @@ +#include "palette/palette.h" + #include #include #include #include #include +#include +#include +#include +#include #include "common.h" #include "stringlib.h" #include "fs/vfile.h" -#include "palette/palette.h" -#include "conv/graphic.h" #include "conv/error.h" #include "conv/vpng.h" +#include "fs/vfs.h" +#include "png.h" +#include "pngconf.h" #define PALETTE_SIZE (256 * 3) diff --git a/src/palette/palette.h b/src/palette/palette.h index 48063ea..992e8a8 100644 --- a/src/palette/palette.h +++ b/src/palette/palette.h @@ -11,7 +11,13 @@ #ifndef PALETTE__PALETTE_H_INCLUDED #define PALETTE__PALETTE_H_INCLUDED +#include +#include + #include "fs/vfs.h" +#include "fs/vfile.h" + +struct directory; struct palette_entry { uint8_t r, g, b; diff --git a/src/palette/palfs.c b/src/palette/palfs.c index a6abdee..bd38dd5 100644 --- a/src/palette/palfs.c +++ b/src/palette/palfs.c @@ -8,19 +8,18 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // -#include -#include +#include "palette/palfs.h" + #include #include +#include +#include #include "fs/vfs.h" #include "common.h" #include "stringlib.h" - #include "palette/palette.h" -#include "palette/palfs.h" - -#include "ui/dialog.h" +#include "fs/vfile.h" struct palette_dir { struct directory dir; diff --git a/src/palette/palfs.h b/src/palette/palfs.h index 047ca44..92267b7 100644 --- a/src/palette/palfs.h +++ b/src/palette/palfs.h @@ -11,6 +11,9 @@ #ifndef PALETTE__PALFS_H_INCLUDED #define PALETTE__PALFS_H_INCLUDED +struct directory; +struct directory_entry; + struct directory *PAL_OpenDirectory(struct directory *previous); struct directory *PAL_InnerDir(struct directory *dir); struct directory_entry *PAL_InnerEntry(struct directory *dir, diff --git a/src/sixel_display.c b/src/sixel_display.c index 1186c6c..ff56b49 100644 --- a/src/sixel_display.c +++ b/src/sixel_display.c @@ -10,18 +10,18 @@ #ifdef HAVE_LIBSIXEL +#include "sixel_display.h" + #include #include #include -#include #include #include #include - #include +#include #include "termfuncs.h" -#include "sixel_display.h" #include "stringlib.h" #define SEND_ATTRIBUTES_ESCAPE "\x1b[c" @@ -178,8 +178,6 @@ bool SIXEL_DisplayImage(const char *filename) #else -#include - bool SIXEL_CheckSupported(void) { return false; diff --git a/src/sixel_display.h b/src/sixel_display.h index 9736554..9fc5528 100644 --- a/src/sixel_display.h +++ b/src/sixel_display.h @@ -11,6 +11,8 @@ #ifndef SIXEL_DISPLAY_H_INCLUDED #define SIXEL_DISPLAY_H_INCLUDED +#include + bool SIXEL_CheckSupported(void); void SIXEL_ClearAndPrint(const char *msg, ...); bool SIXEL_DisplayImage(const char *filename); diff --git a/src/stringlib.c b/src/stringlib.c index e5ee66b..a5bcc06 100644 --- a/src/stringlib.c +++ b/src/stringlib.c @@ -8,6 +8,8 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "stringlib.h" + #include #include #include @@ -15,9 +17,9 @@ #include #include #include +#include #include "common.h" -#include "stringlib.h" #ifdef _WIN32 #define DIR_SEPARATOR "\\" diff --git a/src/stringlib.h b/src/stringlib.h index 3cf81ea..1b649a4 100644 --- a/src/stringlib.h +++ b/src/stringlib.h @@ -12,6 +12,7 @@ #define STRINGLIB_H_INCLUDED #include +#include char *StringDuplicate(const char *orig); int StringCopy(char *dest, const char *src, size_t dest_size); diff --git a/src/struct.c b/src/struct.c index d9e4ea7..fc9b9f1 100644 --- a/src/struct.c +++ b/src/struct.c @@ -8,13 +8,12 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "struct.h" + #include -#include #include #include -#include "struct.h" - #define arrlen(x) (sizeof(x) / sizeof(*(x))) // TODO: Byte swap diff --git a/src/struct.h b/src/struct.h index 790d67c..3a268af 100644 --- a/src/struct.h +++ b/src/struct.h @@ -11,6 +11,8 @@ #ifndef STRUCT_H_INCLUDED #define STRUCT_H_INCLUDED +#include + struct struct_field; struct struct_field_type { diff --git a/src/termfuncs.c b/src/termfuncs.c index c47c8eb..9963343 100644 --- a/src/termfuncs.c +++ b/src/termfuncs.c @@ -8,17 +8,21 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "termfuncs.h" + #include #include #include -#include #include #include #include +#include +#include #include "ui/colors.h" #include "common.h" -#include "termfuncs.h" + +struct timeval; #define CLEAR_SCREEN_ESCAPE "\x1b[H\x1b[2J" #define XTERM_RAISE_ESCAPE "\x1b[5t" /* xterm WindowOp to raise window */ diff --git a/src/termfuncs.h b/src/termfuncs.h index 37598c7..272c619 100644 --- a/src/termfuncs.h +++ b/src/termfuncs.h @@ -14,6 +14,10 @@ #include #include #include +#include +#include + +struct timeval; #define COLORX_DARKGREY (COLOR_BLACK + 8) #define COLORX_BRIGHTBLUE (COLOR_BLUE + 8) diff --git a/src/textures/actions.c b/src/textures/actions.c index 4c2a80e..aa12257 100644 --- a/src/textures/actions.c +++ b/src/textures/actions.c @@ -11,21 +11,24 @@ #include #include #include +#include +#include +#include #include "ui/actions_bar.h" #include "browser/actions.h" #include "browser/directory_pane.h" #include "browser/browser.h" -#include "common.h" #include "conv/error.h" #include "stringlib.h" #include "ui/dialog.h" #include "ui/title_bar.h" -#include "ui/ui.h" #include "view.h" - #include "textures/textures.h" #include "textures/internal.h" +#include "fs/vfile.h" +#include "fs/vfs.h" +#include "ui/list_pane.h" static bool CheckExistingTexture(struct textures *txs, const char *name) { diff --git a/src/textures/bundle.c b/src/textures/bundle.c index 8d6cb1f..3ff02f3 100644 --- a/src/textures/bundle.c +++ b/src/textures/bundle.c @@ -16,17 +16,16 @@ #include #include #include -#include #include +#include -#include "common.h" #include "conv/error.h" #include "fs/vfile.h" #include "fs/vfs.h" #include "ui/dialog.h" - #include "textures/textures.h" #include "textures/internal.h" +#include "fs/wad_file.h" void TX_FreeBundle(struct texture_bundle *b) { diff --git a/src/textures/config.c b/src/textures/config.c index 31ceb97..49c0bfc 100644 --- a/src/textures/config.c +++ b/src/textures/config.c @@ -17,12 +17,11 @@ #include #include #include +#include #include "common.h" #include "conv/error.h" #include "fs/vfile.h" -#include "fs/vfs.h" - #include "textures/textures.h" #define TEXTURE_CONFIG_HEADER "; deutex format texture lump configuration\n" diff --git a/src/textures/lump_dir.c b/src/textures/lump_dir.c index aa3a28e..789ecd6 100644 --- a/src/textures/lump_dir.c +++ b/src/textures/lump_dir.c @@ -10,17 +10,13 @@ // // Common code shared between texture and pnames directories. -#include -#include #include -#include #include +#include -#include "common.h" #include "fs/vfile.h" #include "fs/vfs.h" #include "stringlib.h" - #include "textures/textures.h" #include "textures/internal.h" diff --git a/src/textures/pnames.c b/src/textures/pnames.c index 91b44e7..d755c2a 100644 --- a/src/textures/pnames.c +++ b/src/textures/pnames.c @@ -10,16 +10,15 @@ #include #include -#include #include #include #include +#include +#include #include "common.h" #include "conv/error.h" #include "fs/vfile.h" -#include "fs/vfs.h" - #include "textures/textures.h" void TX_FreePnames(struct pnames *pnames) diff --git a/src/textures/pnames_dir.c b/src/textures/pnames_dir.c index 925bd00..be5a915 100644 --- a/src/textures/pnames_dir.c +++ b/src/textures/pnames_dir.c @@ -8,21 +8,18 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // -#include -#include #include #include #include +#include #include "common.h" #include "fs/vfile.h" #include "fs/vfs.h" -#include "stringlib.h" #include "ui/title_bar.h" -#include "ui/ui.h" - #include "textures/textures.h" #include "textures/internal.h" +#include "fs/wad_file.h" struct pnames_dir { struct lump_dir dir; diff --git a/src/textures/texture_dir.c b/src/textures/texture_dir.c index 7fa4ee2..60819b8 100644 --- a/src/textures/texture_dir.c +++ b/src/textures/texture_dir.c @@ -9,11 +9,10 @@ // #include -#include #include #include -#include #include +#include #include "common.h" #include "conv/error.h" @@ -21,10 +20,9 @@ #include "fs/vfs.h" #include "stringlib.h" #include "ui/title_bar.h" -#include "ui/ui.h" - #include "textures/textures.h" #include "textures/internal.h" +#include "fs/wad_file.h" // Implementation of a VFS directory that is backed by a textures list. // Currently incomplete. diff --git a/src/textures/textures.c b/src/textures/textures.c index 4bc8bbe..cbeb95e 100644 --- a/src/textures/textures.c +++ b/src/textures/textures.c @@ -8,19 +8,19 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "textures/textures.h" + #include #include #include #include #include #include +#include #include "common.h" #include "conv/error.h" #include "fs/vfile.h" -#include "fs/vfs.h" - -#include "textures/textures.h" static void SwapTexture(struct texture *t) { diff --git a/src/textures/textures.h b/src/textures/textures.h index b5d7fc5..0e03abd 100644 --- a/src/textures/textures.h +++ b/src/textures/textures.h @@ -11,6 +11,16 @@ #ifndef TEXTURES__TEXTURES_H_INCLUDED #define TEXTURES__TEXTURES_H_INCLUDED +#include +#include +#include + +#include "fs/vfile.h" + +struct directory; +struct directory_entry; +struct file_set; + typedef char pname[8]; struct pnames { diff --git a/src/ui/actions_bar.c b/src/ui/actions_bar.c index b33f1ac..cd3f819 100644 --- a/src/ui/actions_bar.c +++ b/src/ui/actions_bar.c @@ -8,16 +8,18 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "ui/actions_bar.h" + #include #include #include +#include +#include -#include "ui/actions_bar.h" #include "ui/colors.h" #include "common.h" -#include "stringlib.h" #include "ui/stack.h" -#include "ui/ui.h" +#include "ui/pane.h" struct actions_accel { const char *name; diff --git a/src/ui/actions_bar.h b/src/ui/actions_bar.h index 67a4b8f..9723ddd 100644 --- a/src/ui/actions_bar.h +++ b/src/ui/actions_bar.h @@ -11,6 +11,8 @@ #ifndef UI__ACTIONS_BAR_H_INCLUDED #define UI__ACTIONS_BAR_H_INCLUDED +#include + #define MAX_KEY_BINDINGS 30 struct action { diff --git a/src/ui/dialog.c b/src/ui/dialog.c index 1d49dbf..0aa58d2 100644 --- a/src/ui/dialog.c +++ b/src/ui/dialog.c @@ -8,20 +8,22 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "ui/dialog.h" + #include #include #include #include #include #include +#include #include "ui/colors.h" #include "common.h" -#include "ui/dialog.h" #include "ui/pane.h" -#include "ui/actions_bar.h" #include "ui/stack.h" #include "ui/ui.h" +#include "ui/text_input.h" struct nonblocking_window { struct pane pane; diff --git a/src/ui/list_pane.c b/src/ui/list_pane.c index 4999bad..a7342dd 100644 --- a/src/ui/list_pane.c +++ b/src/ui/list_pane.c @@ -8,16 +8,16 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "ui/list_pane.h" + #include #include #include #include -#include #include "ui/colors.h" #include "common.h" #include "ui/ui.h" -#include "ui/list_pane.h" #include "ui/stack.h" static unsigned int NumEntries(struct list_pane *lp) diff --git a/src/ui/list_pane.h b/src/ui/list_pane.h index b37e0b6..64a57cf 100644 --- a/src/ui/list_pane.h +++ b/src/ui/list_pane.h @@ -12,6 +12,9 @@ #define UI__LIST_PANE_H_INCLUDED #include +#include +#include + #include "ui/pane.h" #define LIST_PANE_END_MARKER INT_MAX diff --git a/src/ui/pane.c b/src/ui/pane.c index 60875cf..bae1701 100644 --- a/src/ui/pane.c +++ b/src/ui/pane.c @@ -8,15 +8,14 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "ui/pane.h" + #include -#include #include -#include #include "common.h" #include "ui/actions_bar.h" #include "ui/colors.h" -#include "ui/pane.h" #include "ui/stack.h" #include "ui/title_bar.h" #include "ui/ui.h" diff --git a/src/ui/pane.h b/src/ui/pane.h index 6b64a55..e0e552e 100644 --- a/src/ui/pane.h +++ b/src/ui/pane.h @@ -12,6 +12,7 @@ #define UI__PANE_H_INCLUDED #include +#include struct pane_stack; diff --git a/src/ui/stack.c b/src/ui/stack.c index 4badd23..ec7e84a 100644 --- a/src/ui/stack.c +++ b/src/ui/stack.c @@ -8,17 +8,15 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "ui/stack.h" + #include -#include #include -#include +#include #include "common.h" #include "ui/actions_bar.h" -#include "ui/colors.h" #include "ui/pane.h" -#include "ui/stack.h" -#include "ui/title_bar.h" #define MAX_SCREEN_PANES 10 diff --git a/src/ui/stack.h b/src/ui/stack.h index 182ef9b..1d4dc9e 100644 --- a/src/ui/stack.h +++ b/src/ui/stack.h @@ -11,7 +11,10 @@ #ifndef UI__STACK_H_INCLUDED #define UI__STACK_H_INCLUDED +#include + struct pane_stack; +struct action; struct pane_stack_state { int top_line, lines; diff --git a/src/ui/text_input.c b/src/ui/text_input.c index 4cde9ea..1d04c20 100644 --- a/src/ui/text_input.c +++ b/src/ui/text_input.c @@ -8,13 +8,13 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // -#include +#include "ui/text_input.h" + #include #include #include "ui/colors.h" #include "common.h" -#include "ui/text_input.h" void UI_TextInputInit(struct text_input_box *input, WINDOW *win, size_t max_chars) diff --git a/src/ui/text_input.h b/src/ui/text_input.h index 6b8e838..1dfbe75 100644 --- a/src/ui/text_input.h +++ b/src/ui/text_input.h @@ -12,6 +12,7 @@ #define UI__TEXT_INPUT_H_INCLUDED #include +#include struct text_input_box { WINDOW *win, *parent_win; diff --git a/src/ui/title_bar.c b/src/ui/title_bar.c index ef0af02..0692769 100644 --- a/src/ui/title_bar.c +++ b/src/ui/title_bar.c @@ -8,17 +8,18 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // -#include +#include "ui/title_bar.h" + #include #include #include +#include +#include +#include #include "ui/colors.h" -#include "common.h" #include "ui/pane.h" #include "ui/stack.h" -#include "ui/title_bar.h" -#include "ui/ui.h" #define MAX_NOTICE_LEN 100 #define NOTICE_TIME_SECS 2 diff --git a/src/ui/ui.c b/src/ui/ui.c index 52188fc..7ffd92b 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -8,15 +8,14 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "ui/ui.h" + #include -#include #include -#include +#include #include "ui/colors.h" #include "common.h" -#include "ui/pane.h" -#include "ui/ui.h" int UI_StringWidth(char *s) { diff --git a/src/ui/ui.h b/src/ui/ui.h index 5837a02..be930f0 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -11,6 +11,8 @@ #ifndef UI__UI_H_INCLUDED #define UI__UI_H_INCLUDED +#include + #include "ui/pane.h" #include "ui/text_input.h" diff --git a/src/view.c b/src/view.c index bb73510..611e12d 100644 --- a/src/view.c +++ b/src/view.c @@ -8,6 +8,8 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // +#include "view.h" + #include #include #include @@ -16,6 +18,10 @@ #include #include #include +#include +#include +#include +#include #include "browser/actions.h" #include "common.h" @@ -25,16 +31,15 @@ #include "conv/export.h" #include "conv/import.h" #include "lump_info.h" -#include "pager/pager.h" #include "pager/plaintext.h" #include "sixel_display.h" #include "stringlib.h" #include "termfuncs.h" #include "ui/title_bar.h" -#include "ui/ui.h" #include "fs/vfile.h" #include "fs/vfs.h" -#include "view.h" +#include "fs/wad_file.h" +#include "ui/pane.h" // The freedeskop.org xdg-utils package includes a program named xdg-open // that will open files according to the user's preferences. However, other diff --git a/src/view.h b/src/view.h index 591204e..b50f776 100644 --- a/src/view.h +++ b/src/view.h @@ -11,8 +11,13 @@ #ifndef VIEW_H_INCLUDED #define VIEW_H_INCLUDED +#include + #include "fs/vfs.h" +struct directory; +struct directory_entry; + enum open_result { OPEN_FAILED, OPEN_VIEWED, OPEN_EDITED }; enum open_result OpenFile(const char *filename, diff --git a/src/wadgadget.c b/src/wadgadget.c index 72a7871..aade7bc 100644 --- a/src/wadgadget.c +++ b/src/wadgadget.c @@ -13,13 +13,13 @@ #include #include #include +#include #include "common.h" -#include "browser/directory_pane.h" #include "browser/browser.h" #include "sixel_display.h" #include "termfuncs.h" -#include "ui/ui.h" +#include "ui/pane.h" #define RESPONSE_FILE_PATH "/tmp/wadgadget-paths.txt"