Update includes based on IWYU

htop-dev · Dec 26, 2023 · e56089e · e56089e
1 parent 20bd784
commit e56089e
Show file tree

Hide file tree

Showing 67 changed files with 113 additions and 83 deletions.
diff --git a/Action.c b/Action.c
@@ -9,9 +9,11 @@ in the source distribution for its full text.
 
 #include "Action.h"
 
+#include <assert.h>
 #include <pwd.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "CRT.h"
 #include "CategoriesPanel.h"
@@ -27,13 +29,16 @@ in the source distribution for its full text.
 #include "MainPanel.h"
 #include "OpenFilesScreen.h"
 #include "Process.h"
-#include "ProcessTable.h"
 #include "ProcessLocksScreen.h"
 #include "ProvideCurses.h"
+#include "Row.h"
+#include "RowField.h"
 #include "Scheduling.h"
 #include "ScreenManager.h"
 #include "SignalsPanel.h"
+#include "Table.h"
 #include "TraceScreen.h"
+#include "UsersTable.h"
 #include "Vector.h"
 #include "XUtils.h"
 

diff --git a/Action.h b/Action.h
@@ -18,7 +18,6 @@ in the source distribution for its full text.
 #include "Panel.h"
 #include "Process.h"
 #include "Settings.h"
-#include "UsersTable.h"
 
 
 typedef enum {

diff --git a/Affinity.c b/Affinity.c
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 
 #include "Affinity.h"
 
+#include <assert.h>
 #include <stdlib.h>
 
 #include "Process.h"

diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c
@@ -23,6 +23,7 @@ in the source distribution for its full text.
 #include "Platform.h"
 #include "Process.h"
 #include "ProvideCurses.h"
+#include "RowField.h"
 #include "XUtils.h"
 
 

diff --git a/AvailableColumnsPanel.h b/AvailableColumnsPanel.h
@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "Hashtable.h"
 #include "Panel.h"
-#include "Settings.h"
 
 
 typedef struct AvailableColumnsPanel_ {

diff --git a/AvailableMetersPanel.c b/AvailableMetersPanel.c
@@ -25,6 +25,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "Platform.h"
 #include "ProvideCurses.h"
+#include "Settings.h"
 #include "XUtils.h"
 
 

diff --git a/CPUMeter.c b/CPUMeter.c
@@ -9,14 +9,16 @@ in the source distribution for its full text.
 
 #include "CPUMeter.h"
 
+#include <stdbool.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
-#include "ProcessTable.h"
 #include "RichString.h"
 #include "Settings.h"
 #include "XUtils.h"

diff --git a/CategoriesPanel.c b/CategoriesPanel.c
@@ -13,7 +13,6 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "AvailableColumnsPanel.h"
 #include "AvailableMetersPanel.h"
 #include "ColorsPanel.h"
 #include "DisplayOptionsPanel.h"
@@ -28,6 +27,7 @@ in the source distribution for its full text.
 #include "ProvideCurses.h"
 #include "ScreensPanel.h"
 #include "ScreenTabsPanel.h"
+#include "Settings.h"
 #include "Vector.h"
 #include "XUtils.h"
 

diff --git a/ClockMeter.c b/ClockMeter.c
@@ -13,8 +13,8 @@ in the source distribution for its full text.
 #include <sys/time.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
-#include "ProcessTable.h"
 
 
 static const int ClockMeter_attributes[] = {

diff --git a/ColorsPanel.c b/ColorsPanel.c
@@ -13,7 +13,6 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "FunctionBar.h"
-#include "Macros.h"
 #include "Object.h"
 #include "OptionItem.h"
 #include "ProvideCurses.h"

diff --git a/ColumnsPanel.c b/ColumnsPanel.c
@@ -21,6 +21,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "Process.h"
 #include "ProvideCurses.h"
+#include "RowField.h"
 #include "XUtils.h"
 
 

diff --git a/ColumnsPanel.h b/ColumnsPanel.h
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include <stdbool.h>
 
+#include "Hashtable.h"
 #include "Panel.h"
 #include "Settings.h"
 

diff --git a/CommandLine.c b/CommandLine.c
@@ -29,15 +29,16 @@ in the source distribution for its full text.
 #include "Hashtable.h"
 #include "Header.h"
 #include "IncSet.h"
+#include "Machine.h"
 #include "MainPanel.h"
 #include "MetersPanel.h"
 #include "Panel.h"
 #include "Platform.h"
 #include "Process.h"
 #include "ProcessTable.h"
-#include "ProvideCurses.h"
 #include "ScreenManager.h"
 #include "Settings.h"
+#include "Table.h"
 #include "UsersTable.h"
 #include "XUtils.h"
 

diff --git a/DateMeter.c b/DateMeter.c
@@ -13,8 +13,8 @@ in the source distribution for its full text.
 #include <sys/time.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
-#include "ProcessTable.h"
 
 
 static const int DateMeter_attributes[] = {

diff --git a/DateTimeMeter.c b/DateTimeMeter.c
@@ -13,8 +13,8 @@ in the source distribution for its full text.
 #include <sys/time.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
-#include "ProcessTable.h"
 
 
 static const int DateTimeMeter_attributes[] = {

diff --git a/DiskIOMeter.c b/DiskIOMeter.c
@@ -10,15 +10,14 @@ in the source distribution for its full text.
 #include "DiskIOMeter.h"
 
 #include <stdbool.h>
-#include <stdio.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Macros.h"
-#include "Meter.h"
 #include "Object.h"
 #include "Platform.h"
-#include "ProcessTable.h"
 #include "RichString.h"
+#include "Row.h"
 #include "XUtils.h"
 
 

diff --git a/DiskIOMeter.h b/DiskIOMeter.h
@@ -7,6 +7,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include <stdint.h>
+
 #include "Meter.h"
 
 

diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c
@@ -11,6 +11,7 @@ in the source distribution for its full text.
 
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "CRT.h"
 #include "FunctionBar.h"

diff --git a/DynamicColumn.c b/DynamicColumn.c
@@ -12,6 +12,7 @@ in the source distribution for its full text.
 #include "DynamicColumn.h"
 
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "Platform.h"
 #include "RichString.h"

diff --git a/DynamicMeter.c b/DynamicMeter.c
@@ -15,10 +15,11 @@ in the source distribution for its full text.
 #include <string.h>
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
 #include "Platform.h"
-#include "ProcessTable.h"
 #include "RichString.h"
+#include "Settings.h"
 #include "XUtils.h"
 
 

diff --git a/DynamicScreen.c b/DynamicScreen.c
@@ -12,6 +12,7 @@ in the source distribution for its full text.
 
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "Hashtable.h"
 #include "Platform.h"

diff --git a/DynamicScreen.h b/DynamicScreen.h
@@ -11,7 +11,6 @@ in the source distribution for its full text.
 
 #include "Hashtable.h"
 #include "Panel.h"
-#include "Settings.h"
 
 
 typedef struct DynamicScreen_ {

diff --git a/FileDescriptorMeter.c b/FileDescriptorMeter.c
@@ -10,8 +10,6 @@ in the source distribution for its full text.
 #include "FileDescriptorMeter.h"
 
 #include <math.h>
-#include <stdbool.h>
-#include <string.h>
 
 #include "CRT.h"
 #include "Macros.h"

diff --git a/Header.c b/Header.c
@@ -24,6 +24,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "Platform.h"
 #include "ProvideCurses.h"
+#include "Settings.h"
 #include "XUtils.h"
 
 

diff --git a/Header.h b/Header.h
@@ -7,6 +7,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include <stddef.h>
+
 #include "HeaderLayout.h"
 #include "Machine.h"
 #include "Meter.h"

diff --git a/ListItem.h b/ListItem.h
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include <stdbool.h>
 
 #include "Object.h"
+#include "RichString.h"
 
 
 typedef struct ListItem_ {

diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
@@ -10,9 +10,9 @@ in the source distribution for its full text.
 #include "LoadAverageMeter.h"
 
 #include "CRT.h"
+#include "Machine.h"
 #include "Object.h"
 #include "Platform.h"
-#include "ProcessTable.h"
 #include "RichString.h"
 #include "XUtils.h"
 

diff --git a/Machine.c b/Machine.c
@@ -11,11 +11,9 @@ in the source distribution for its full text.
 #include "Machine.h"
 
 #include <stdlib.h>
-#include <string.h>
+#include <unistd.h>
 
-#include "CRT.h"
-#include "Hashtable.h"
-#include "Macros.h"
+#include "Object.h"
 #include "Platform.h"
 #include "Row.h"
 #include "XUtils.h"

diff --git a/Machine.h b/Machine.h
@@ -16,12 +16,10 @@ in the source distribution for its full text.
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include "Hashtable.h"
 #include "Panel.h"
 #include "Settings.h"
 #include "Table.h"
 #include "UsersTable.h"
-#include "Vector.h"
 
 #ifdef HAVE_LIBHWLOC
 #include <hwloc.h>

diff --git a/Macros.h b/Macros.h
@@ -10,6 +10,8 @@ in the source distribution for its full text.
 #include <assert.h> // IWYU pragma: keep
 #include <math.h>
 #include <stdbool.h>
+#include <string.h> // IWYU pragma: keep
+
 
 #ifndef MINIMUM
 #define MINIMUM(a, b)                  ((a) < (b) ? (a) : (b))

diff --git a/MainPanel.c b/MainPanel.c
@@ -12,12 +12,15 @@ in the source distribution for its full text.
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <sys/types.h>
 
 #include "CRT.h"
 #include "FunctionBar.h"
+#include "Machine.h"
 #include "Platform.h"
 #include "ProvideCurses.h"
 #include "Row.h"
+#include "RowField.h"
 #include "Settings.h"
 #include "Table.h"
 #include "XUtils.h"

diff --git a/MainPanel.h b/MainPanel.h
@@ -11,9 +11,9 @@ in the source distribution for its full text.
 #include "config.h" // IWYU pragma: keep
 
 #include <stdbool.h>
-#include <sys/types.h>
 
 #include "Action.h"
+#include "FunctionBar.h"
 #include "IncSet.h"
 #include "Object.h"
 #include "Panel.h"

diff --git a/MemoryMeter.c b/MemoryMeter.c
@@ -7,6 +7,7 @@ in the source distribution for its full text.
 
 #include "MemoryMeter.h"
 
+#include <assert.h>
 #include <math.h>
 #include <stddef.h>
 

diff --git a/MemorySwapMeter.c b/MemorySwapMeter.c
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include "MemorySwapMeter.h"
 
 #include <assert.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
 

diff --git a/Meter.c b/Meter.c
@@ -10,9 +10,7 @@ in the source distribution for its full text.
 #include "Meter.h"
 
 #include <assert.h>
-#include <limits.h>
 #include <math.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -21,6 +19,7 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "ProvideCurses.h"
 #include "RichString.h"
+#include "Row.h"
 #include "Settings.h"
 #include "XUtils.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,8 @@ Released under the GNU GPLv2+, see the COPYING file @@
     in the source distribution for its full text.
     */
+    #include <stdint.h>
     #include "Meter.h"
@@ Expand Down @@