IWYU fixes

- `sys/select.h` for `fd_set` - FvwmConsole: `libs/defaults` for `FVWMCONSOLE_CONNECTION_TO_SECS` - `limits.h` for INT_MAX - `time.h` for `time()`; `difftime()` - `libs/log.h` for `fvwm_debug` Signed-off-by: Matt Jolly <[email protected]>
Kangie · Sep 17, 2024 · 676e465 · 676e465
1 parent a149d7b
commit 676e465
Show file tree

Hide file tree

Showing 33 changed files with 71 additions and 30 deletions.
diff --git a/bin/fvwm-root.c b/bin/fvwm-root.c
@@ -22,6 +22,7 @@
 #include "libs/Picture.h"
 #include "libs/Graphics.h"
 #include "libs/Fsvg.h"
+#include "libs/log.h"
 
 int save_colors = 0;
 Display *dpy;

diff --git a/fvwm/module_list.c b/fvwm/module_list.c
@@ -20,6 +20,9 @@
 #include <fcntl.h>
 #endif
 
+/* for time(); difftime() */
+#include <time.h>
+
 /* for F_CMD_ARGS */
 #include "fvwm/fvwm.h"
 #include "execcontext.h"

diff --git a/libs/FScreen.c b/libs/FScreen.c
@@ -15,22 +15,23 @@
 
 #include "config.h"
 
-#include <X11/extensions/Xrandr.h>
-#include <X11/extensions/randr.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
 #include <ctype.h>
-#include <errno.h>
 #include <err.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <X11/extensions/randr.h>
+#include <X11/extensions/Xrandr.h>
 
-#include "log.h"
 #include "defaults.h"
+#include "FEvent.h"
+#include "FScreen.h"
 #include "fvwmlib.h"
+#include "log.h"
 #include "Parse.h"
 #include "PictureBase.h"
-#include "FScreen.h"
-#include "FEvent.h"
 #include "queue.h"
 #include "strtonum.h"
 

diff --git a/libs/PictureUtils.c b/libs/PictureUtils.c
@@ -23,6 +23,7 @@
 #include <signal.h>
 #include <ctype.h>
 #include <math.h>
+#include <time.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xmd.h>

diff --git a/libs/fsm.h b/libs/fsm.h
@@ -5,7 +5,7 @@
 
 /* ---------------------------- included header files ---------------------- */
 #include "FSMlib.h"
-
+#include <sys/select.h>
 /* ---------------------------- global definitions ------------------------- */
 
 /* ---------------------------- global macros ------------------------------ */

diff --git a/modules/FvwmConsole/FvwmConsole.c b/modules/FvwmConsole/FvwmConsole.c
@@ -27,8 +27,10 @@
 #include "config.h"
 
 #include "FvwmConsole.h"
+#include "libs/defaults.h"
 #include "libs/fio.h"
 #include "libs/fvwmsignal.h"
+#include "libs/log.h"
 
 /* using ParseModuleArgs now */
 static ModuleArgs* module;

diff --git a/modules/FvwmConsole/FvwmConsoleC.c b/modules/FvwmConsole/FvwmConsoleC.c
@@ -19,6 +19,7 @@
 
 #include "FvwmConsole.h"
 #include "libs/fio.h"
+#include "libs/log.h"
 
 int  s;    /* socket handle */
 FILE *sp;

diff --git a/modules/FvwmConsole/getline.c b/modules/FvwmConsole/getline.c
@@ -16,6 +16,7 @@
 #include "config.h"
 
 #include "FvwmConsole.h"
+#include "libs/log.h"
 
 #ifdef HAVE_READLINE
 #include <readline/readline.h>

diff --git a/modules/FvwmEvent/FvwmEvent.c b/modules/FvwmEvent/FvwmEvent.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <time.h>
 
 #include "libs/Module.h"
 #include "libs/fvwmlib.h"

diff --git a/modules/FvwmIconMan/FvwmIconMan.c b/modules/FvwmIconMan/FvwmIconMan.c
@@ -24,6 +24,7 @@
 #include "xmanager.h"
 
 #include "libs/fvwmsignal.h"
+#include "libs/log.h"
 #include "libs/Module.h"
 #include "libs/FTips.h"
 #include "libs/FEvent.h"

diff --git a/modules/FvwmIconMan/debug.c b/modules/FvwmIconMan/debug.c
@@ -19,6 +19,7 @@
 #include <assert.h>
 
 #include "FvwmIconMan.h"
+#include "libs/log.h"
 
 static FILE *console = NULL;
 

diff --git a/modules/FvwmIconMan/x.c b/modules/FvwmIconMan/x.c
@@ -27,6 +27,7 @@
 #include "libs/FEvent.h"
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
+#include "libs/log.h"
 #include "libs/XError.h"
 
 #define GRAB_EVENTS (ButtonPressMask|ButtonReleaseMask|ButtonMotionMask|\

diff --git a/modules/FvwmIconMan/xmanager.c b/modules/FvwmIconMan/xmanager.c
@@ -27,6 +27,7 @@
 #include "libs/Rectangles.h"
 #include "libs/Grab.h"
 #include "libs/Graphics.h"
+#include "libs/log.h"
 #include "libs/Strings.h"
 #include "libs/wild.h"
 

diff --git a/modules/FvwmIdent/FvwmIdent.c b/modules/FvwmIdent/FvwmIdent.c
@@ -53,6 +53,7 @@
 #include "libs/System.h"
 #include "libs/Target.h"
 #include "libs/XError.h"
+#include "libs/log.h"
 
 #include "FvwmIdent.h"
 

diff --git a/modules/FvwmPager/FvwmPager.c b/modules/FvwmPager/FvwmPager.c
@@ -32,13 +32,19 @@
 #include <sys/bsdtypes.h> /* Saul */
 #endif /* Saul */
 
-#include "libs/Module.h"
+#include "libs/Colorset.h"
 #include "libs/FEvent.h"
+#include "libs/Flocale.h"
+#include "libs/FRenderInit.h"
+#include "libs/FShape.h"
+#include "libs/fvwmlib.h"
 #include "libs/fvwmsignal.h"
 #include "libs/Grab.h"
+#include "libs/log.h"
+#include "libs/Module.h"
 #include "libs/Parse.h"
-#include "libs/Strings.h"
 #include "libs/Picture.h"
+#include "libs/Strings.h"
 #include "libs/System.h"
 
 #include "fvwm/fvwm.h"

diff --git a/modules/FvwmPager/messages.c b/modules/FvwmPager/messages.c
@@ -17,6 +17,7 @@
 #include <stdbool.h>
 #include "libs/FScreen.h"
 #include "libs/fvwmlib.h"
+#include "libs/log.h"
 #include "libs/Module.h"
 #include "libs/Parse.h"
 #include "fvwm/fvwm.h"

diff --git a/modules/FvwmRearrange/FvwmRearrange.c b/modules/FvwmRearrange/FvwmRearrange.c
@@ -41,11 +41,12 @@
 
 #include <X11/Xlib.h>
 
+#include "fvwm/fvwm.h"
 #include "libs/fvwmlib.h"
+#include "libs/log.h"
 #include "libs/Module.h"
-#include "fvwm/fvwm.h"
-#include "libs/vpacket.h"
 #include "libs/System.h"
+#include "libs/vpacket.h"
 
 typedef struct window_item {
 	Window frame;

diff --git a/modules/FvwmScript/FvwmScript.c b/modules/FvwmScript/FvwmScript.c
@@ -22,25 +22,26 @@
 #include "config.h"
 
 #include "types.h"
-#include "libs/fvwmlib.h"
-#include "libs/FScreen.h"
-#include "libs/FShape.h"
-#include "libs/FEvent.h"
-#include "libs/fvwmsignal.h"
-#include "libs/Picture.h"
-#include "libs/PictureGraphics.h"
-#include "libs/FRender.h"
-#include "libs/FRenderInit.h"
-#include "libs/FGettext.h"
 #include "libs/Bindings.h"
 #include "libs/charmap.h"
-#include "libs/wcontext.h"
 #include "libs/ColorUtils.h"
+#include "libs/Cursor.h"
+#include "libs/FEvent.h"
+#include "libs/FGettext.h"
+#include "libs/FRender.h"
+#include "libs/FRenderInit.h"
+#include "libs/FScreen.h"
+#include "libs/FShape.h"
+#include "libs/fvwmlib.h"
+#include "libs/fvwmsignal.h"
 #include "libs/Graphics.h"
+#include "libs/log.h"
 #include "libs/Parse.h"
+#include "libs/Picture.h"
+#include "libs/PictureGraphics.h"
 #include "libs/Strings.h"
+#include "libs/wcontext.h"
 #include "libs/XError.h"
-#include "libs/Cursor.h"
 
 #ifdef MEMDEBUG                 /* For debugging */
 #include <unchecked.h>

diff --git a/modules/FvwmScript/Instructions.c b/modules/FvwmScript/Instructions.c
@@ -15,6 +15,8 @@
 
 #include "config.h"
 
+#include <time.h>
+
 #include "types.h"
 #include "libs/fvwmsignal.h"
 #include "libs/ftime.h"
@@ -27,6 +29,7 @@
 #include "libs/Module.h"
 #include "libs/ColorUtils.h"
 #include "libs/Strings.h"
+#include "libs/log.h"
 #ifdef HAVE_GETPWUID
 #  include <pwd.h>
 #endif

diff --git a/modules/FvwmScript/Widgets/CheckBox.c b/modules/FvwmScript/Widgets/CheckBox.c
@@ -19,6 +19,7 @@
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 /*

diff --git a/modules/FvwmScript/Widgets/HScrollBar.c b/modules/FvwmScript/Widgets/HScrollBar.c
@@ -19,6 +19,7 @@
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 /*

diff --git a/modules/FvwmScript/Widgets/ItemDraw.c b/modules/FvwmScript/Widgets/ItemDraw.c
@@ -19,6 +19,7 @@
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 /* left, center and right offsets */

diff --git a/modules/FvwmScript/Widgets/List.c b/modules/FvwmScript/Widgets/List.c
@@ -19,6 +19,7 @@
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 #define BdWidth 2               /* Border width */

diff --git a/modules/FvwmScript/Widgets/Menu.c b/modules/FvwmScript/Widgets/Menu.c
@@ -19,6 +19,7 @@
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 /* left, center and right offsets for title 0 (not very useful here) */

diff --git a/modules/FvwmScript/Widgets/PopupMenu.c b/modules/FvwmScript/Widgets/PopupMenu.c
@@ -20,6 +20,7 @@
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 /*

diff --git a/modules/FvwmScript/Widgets/PushButton.c b/modules/FvwmScript/Widgets/PushButton.c
@@ -19,6 +19,7 @@
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 /* left, center and right offsets */

diff --git a/modules/FvwmScript/Widgets/RadioButton.c b/modules/FvwmScript/Widgets/RadioButton.c
@@ -19,6 +19,7 @@
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 /*

diff --git a/modules/FvwmScript/Widgets/Swallow.c b/modules/FvwmScript/Widgets/Swallow.c
@@ -17,9 +17,11 @@
 
 #include "libs/fvwmlib.h"
 #include "libs/ColorUtils.h"
+#include "libs/log.h"
 #include "libs/Strings.h"
 #include "Tools.h"
 
+
 extern int fd[2];
 
 /*

diff --git a/modules/FvwmScript/Widgets/TextField.c b/modules/FvwmScript/Widgets/TextField.c
@@ -19,6 +19,7 @@
 #include "libs/ColorUtils.h"
 #include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 /*

diff --git a/modules/FvwmScript/Widgets/VScrollBar.c b/modules/FvwmScript/Widgets/VScrollBar.c
@@ -15,10 +15,11 @@
 
 #include "config.h"
 
-#include "libs/fvwmlib.h"
 #include "libs/ColorUtils.h"
-#include "libs/Graphics.h"
 #include "libs/FEvent.h"
+#include "libs/fvwmlib.h"
+#include "libs/Graphics.h"
+#include "libs/log.h"
 #include "Tools.h"
 
 /*

diff --git a/modules/FvwmScript/Widgets/Widget.c b/modules/FvwmScript/Widgets/Widget.c
@@ -19,6 +19,7 @@
 
 #include "config.h"
 
+#include "libs/log.h"
 #include "Tools.h"
 
 extern void InitPushButton(struct XObj *xobj);

diff --git a/modules/FvwmScript/script.c b/modules/FvwmScript/script.c
@@ -300,6 +300,7 @@
 #include "config.h"
 #include "types.h"
 #include "libs/FGettext.h"
+#include "libs/log.h"
 
 #define MAX_VARS 5120
 extern int numligne;
@@ -3418,5 +3419,3 @@ yyparse ()
 
 
 #line 864 "script.y"
-
-
diff --git a/modules/FvwmScript/script.y b/modules/FvwmScript/script.y
@@ -15,6 +15,7 @@
 #include "config.h"
 #include "types.h"
 #include "libs/FGettext.h"
+#include "libs/log.h"
 
 #define MAX_VARS 5120
 extern int numligne;