Modernize deprecated headers

Source/DiabloUI/diabloui.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <array>
 #include <cstddef>
 #include <SDL.h>

Source/DiabloUI/fonts.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL_ttf.h>
-#include <stdint.h>
+#include <cstdint>
 
 #include "DiabloUI/art.h"
 

Source/DiabloUI/scrollbar.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "DiabloUI/art.h"
 #include "DiabloUI/ui_item.h"

Source/DiabloUI/ttf_render_wrapped.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL_ttf.h>
-#include <stdint.h>
+#include <cstdint>
 
 namespace devilution {
 

Source/automap.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 #include "gendung.h"

Source/control.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 #include "spelldat.h"

Source/controls/axis_direction.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace devilution {
 

Source/controls/controller_buttons.h

@@ -1,7 +1,7 @@
 #pragma once
 // Unifies joystick, gamepad, and keyboard controller APIs.
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace devilution {
 

Source/controls/game_controls.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <stdint.h>
 #include <cstdint>
 #include <SDL.h>
 

Source/controls/menu_controls.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <SDL.h>
-#include <stdint.h>
+#include <cstdint>
 
 namespace devilution {
 

Source/controls/plrctrls.h

@@ -1,7 +1,7 @@
 #pragma once
 // Controller actions implementation
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace devilution {
 

Source/cursor.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "miniwin/miniwin.h"
 

Source/dead.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 

Source/diablo.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #ifdef _DEBUG
 #include "monstdat.h"

Source/dvlnet/packet.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <memory>
 #include <array>

Source/effects.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "sound.h"
 

Source/encrypt.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "miniwin/miniwin.h"
 

Source/engine.h

@@ -16,7 +16,7 @@
 #include <cstddef>
 #include <cstdlib>
 #include <SDL.h>
-#include <stdint.h>
+#include <cstdint>
 
 #ifdef USE_SDL1
 #include "utils/sdl2_to_1_2_backports.h"

Source/error.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 

Source/gendung.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 #include "scrollrt.h"

Source/gmenu.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 

Source/interfac.cpp

@@ -4,7 +4,7 @@
  * Implementation of load screens.
  */
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "control.h"
 #include "DiabloUI/art_draw.h"

Source/interfac.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "utils/ui_fwd.h"
 

Source/inv.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "items.h"
 #include "palette.h"

Source/itemdat.h

@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include <stdbool.h>
-#include <stdint.h>
+
+#include <cstdint>
 
 #include "objdat.h"
 #include "spelldat.h"

Source/items.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 #include "itemdat.h"

Source/miniwin/miniwin.h

@@ -1,14 +1,14 @@
 #pragma once
 
-#include <stdint.h>
-
-#include <ctype.h>
-#include <math.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdint>
+
+#include <cctype>
+#include <cmath>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 
 namespace devilution {
 

Source/misdat.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "effects.h"
 

Source/missiles.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "miniwin/miniwin.h"
 #include "engine.h"

Source/monstdat.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace devilution {
 

Source/monster.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 #include "miniwin/miniwin.h"

Source/mpqapi.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "miniwin/miniwin.h"
 

Source/msg.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "quests.h"
 #include "objects.h"

Source/multi.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "msg.h"
 

Source/objdat.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "gendung.h"
 

Source/objects.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "objdat.h"
 #include "textdat.h"

Source/options.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "pack.h"
 

Source/pack.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "player.h"
 #include "inv.h"

Source/platform/ctr/keyboard.cpp

@@ -1,5 +1,5 @@
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "platform/ctr/keyboard.h"
 

Source/platform/ctr/system.cpp

@@ -1,5 +1,5 @@
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <3ds.h>
 #include "platform/ctr/system.h"
 

Source/platform/switch/keyboard.cpp

@@ -1,6 +1,4 @@
-#include <string.h>
-#include <stdbool.h>
-
+#include <cstring>
 #include <switch.h>
 #include <SDL.h>
 #include "platform/switch/keyboard.h"

Source/platform/switch/network.cpp

@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <switch.h>
 #include "platform/switch/network.h"

Source/platform/vita/keyboard.cpp

@@ -1,5 +1,4 @@
-#include <string.h>
-#include <stdbool.h>
+#include <cstring>
 
 #include <SDL.h>
 #include <psp2/types.h>

Source/player.cpp

@@ -4,7 +4,7 @@
  * Implementation of player functionality, leveling, actions, creation, loading, etc.
  */
 #include <algorithm>
-#include <stdint.h>
+#include <cstdint>
 
 #include "control.h"
 #include "cursor.h"

Source/player.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "diablo.h"
 #include "engine.h"

Source/plrmsg.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "SDL.h"
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 

Source/quests.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 #include "gendung.h"

Source/scrollrt.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "engine.h"
 #include "miniwin/miniwin.h"

Source/sha.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace devilution {
 

Source/sound.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "miniwin/miniwin.h"
 #include "utils/soundsample.h"

Source/spelldat.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "effects.h"
 

Source/storm/storm.h

@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <limits>
 #include <string>
-#include <stdint.h>
+#include <cstdint>
 
 #include "appfat.h"
 #include "multi.h"

Source/sync.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "miniwin/miniwin.h"
 

Source/themes.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "gendung.h"
 #include "objdat.h"

Source/tmsg.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "miniwin/miniwin.h"
 

Source/towners.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "items.h"
 #include "player.h"

Source/utils/sdl2_to_1_2_backports.h

@@ -2,11 +2,11 @@
 
 #include <SDL.h>
 #include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
+#include <cerrno>
+#include <cstdio>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <math.h>
+#include <cmath>
 #include <cstddef>
 
 #include "utils/console.h"

Source/utils/stubs.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
 
 #define UNIMPLEMENTED()                                                         \
 	do {                                                                        \

test/pack_test.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdint.h>
+#include <cstdint>
 
 #include "pack.h"
 

test/writehero_test.cpp

@@ -2,7 +2,7 @@
 #include <fstream>
 #include <gtest/gtest.h>
 #include <vector>
-#include <stdint.h>
+#include <cstdint>
 
 #include "loadsave.h"
 #include "pack.h"