Update deprecated headers

.clang-tidy

@@ -29,7 +29,6 @@ readability-*,\
 -cert-msc51-cpp,\
 -misc-non-private-member-variables-in-classes,\
 -modernize-avoid-c-arrays,\
--modernize-deprecated-headers,\
 -modernize-pass-by-value,\
 -modernize-return-braced-init-list,\
 -modernize-use-auto,\

src/avatar.cpp

@@ -1,7 +1,7 @@
 #include "avatar.h"
 
-#include <limits.h>
-#include <stdlib.h>
+#include <climits>
+#include <cstdlib>
 #include <algorithm>
 #include <list>
 #include <map>

src/avatar.h

@@ -2,7 +2,7 @@
 #ifndef AVATAR_H
 #define AVATAR_H
 
-#include <stddef.h>
+#include <cstddef>
 #include <iosfwd>
 #include <string>
 #include <unordered_set>

src/avatar_action.cpp

@@ -1,6 +1,6 @@
 #include "avatar_action.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <algorithm>
 #include <functional>
 #include <memory>
@@ -1018,9 +1018,7 @@ void avatar_action::plthrow( avatar &you, item_location loc,
     }
     // you must wield the item to throw it
     if( !you.is_wielding( *orig ) ) {
-        if( you.wield( *orig ) ) {
-            orig = &you.weapon;
-        } else {
+        if( !you.wield( *orig ) ) {
             return;
         }
     }

src/avatar_action.h

@@ -2,7 +2,7 @@
 #ifndef AVATAR_ACTION_H
 #define AVATAR_ACTION_H
 
-#include <limits.h>
+#include <climits>
 
 #include "optional.h"
 #include "point.h"

src/behavior.cpp

@@ -1,6 +1,6 @@
 #include "behavior.h"
 
-#include <assert.h>
+#include <cassert>
 #include <list>
 #include <set>
 #include <unordered_map>

src/character.cpp

@@ -1,6 +1,6 @@
 #include "character.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <climits>
 #include <cstdlib>
 #include <algorithm>

src/clzones.h

@@ -2,7 +2,7 @@
 #ifndef CLZONES_H
 #define CLZONES_H
 
-#include <stddef.h>
+#include <cstddef>
 #include <map>
 #include <unordered_map>
 #include <unordered_set>

src/construction_category.h

@@ -2,7 +2,7 @@
 #ifndef CONSTRUCTION_CATEGORY_H
 #define CONSTRUCTION_CATEGORY_H
 
-#include <stddef.h>
+#include <cstddef>
 #include <string>
 #include <vector>
 

src/craft_command.cpp

@@ -1,6 +1,6 @@
 #include "craft_command.h"
 
-#include <limits.h>
+#include <climits>
 #include <cstdlib>
 #include <algorithm>
 #include <limits>

src/debug_menu.cpp

@@ -1,8 +1,8 @@
 #include "debug_menu.h"
 
 // IWYU pragma: no_include <cxxabi.h>
-#include <limits.h>
-#include <stdint.h>
+#include <climits>
+#include <cstdint>
 #include <algorithm>
 #include <chrono>
 #include <vector>
@@ -67,7 +67,7 @@
 #include "artifact.h"
 #include "vpart_position.h"
 #include "rng.h"
-#include "signal.h"
+#include <csignal>
 #include "magic.h"
 #include "bodypart.h"
 #include "calendar.h"

src/faction.cpp

@@ -1,6 +1,6 @@
 #include "faction.h"
 
-#include <assert.h>
+#include <cassert>
 #include <cstdlib>
 #include <bitset>
 #include <map>

src/field_type.h

@@ -2,8 +2,8 @@
 #ifndef FIELD_TYPE_H
 #define FIELD_TYPE_H
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <algorithm>
 #include <vector>
 #include <memory>

src/game.cpp

@@ -1,7 +1,7 @@
 #include "game.h"
 
-#include <wctype.h>
-#include <assert.h>
+#include <cwctype>
+#include <cassert>
 #include <cstdio>
 #include <algorithm>
 #include <chrono>

src/game_inventory.cpp

@@ -1,6 +1,6 @@
 #include "game_inventory.h"
 
-#include <math.h>
+#include <cmath>
 #include <climits>
 #include <cstddef>
 #include <functional>

src/handle_liquid.cpp

@@ -1,7 +1,7 @@
 #include "handle_liquid.h"
 
-#include <limits.h>
-#include <stddef.h>
+#include <climits>
+#include <cstddef>
 #include <algorithm>
 #include <functional>
 #include <iterator>

src/inventory_ui.h

@@ -2,7 +2,7 @@
 #ifndef INVENTORY_UI_H
 #define INVENTORY_UI_H
 
-#include <assert.h>
+#include <cassert>
 #include <climits>
 #include <cstddef>
 #include <functional>

src/item.h

@@ -2,7 +2,7 @@
 #ifndef ITEM_H
 #define ITEM_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <climits>
 #include <list>
 #include <map>

src/magic.cpp

@@ -1,6 +1,6 @@
 #include "magic.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <set>
 #include <algorithm>
 #include <array>

src/magic.h

@@ -2,7 +2,7 @@
 #ifndef MAGIC_H
 #define MAGIC_H
 
-#include <stddef.h>
+#include <cstddef>
 #include <map>
 #include <set>
 #include <string>

src/magic_spell_effect.cpp

@@ -1,6 +1,6 @@
-#include <limits.h>
-#include <math.h>
-#include <stdlib.h>
+#include <climits>
+#include <cmath>
+#include <cstdlib>
 #include <set>
 #include <algorithm>
 #include <array>

src/magic_teleporter_list.cpp

@@ -1,6 +1,6 @@
 #include "magic_teleporter_list.h"
 
-#include <stddef.h>
+#include <cstddef>
 #include <map>
 #include <algorithm>
 #include <memory>

src/main.cpp

@@ -19,7 +19,7 @@
 #if defined(_WIN32)
 #include "platform_win.h"
 #else
-#include <signal.h>
+#include <csignal>
 #endif
 #include "color.h"
 #include "crash.h"

src/map.h

@@ -268,10 +268,7 @@ class map
         bool check_seen_cache( const tripoint &p ) const {
             std::bitset<MAPSIZE_X *MAPSIZE_Y> &memory_seen_cache =
                 get_cache( p.z ).map_memory_seen_cache;
-            if( !memory_seen_cache[ static_cast<size_t>( p.x + p.y * MAPSIZE_Y ) ] ) {
-                return true;
-            }
-            return false;
+            return !memory_seen_cache[ static_cast<size_t>( p.x + p.y * MAPSIZE_Y ) ];
         }
         bool check_and_set_seen_cache( const tripoint &p ) const {
             std::bitset<MAPSIZE_X *MAPSIZE_Y> &memory_seen_cache =

src/map_extras.h

@@ -2,7 +2,7 @@
 #ifndef MAP_EXTRAS_H
 #define MAP_EXTRAS_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <unordered_map>
 

src/mapgen.cpp

@@ -1,6 +1,6 @@
 #include "mapgen.h"
 
-#include <assert.h>
+#include <cassert>
 #include <cstdlib>
 #include <algorithm>
 #include <list>

src/monattack.cpp

@@ -1,6 +1,6 @@
 #include "monattack.h"
 
-#include <assert.h>
+#include <cassert>
 #include <climits>
 #include <cstdlib>
 #include <algorithm>

src/npctrade.cpp

@@ -1,6 +1,6 @@
 #include "npctrade.h"
 
-#include <limits.h>
+#include <climits>
 #include <cstdlib>
 #include <algorithm>
 #include <string>

src/npctrade.h

@@ -2,7 +2,7 @@
 #ifndef NPCTRADE_H
 #define NPCTRADE_H
 
-#include <stddef.h>
+#include <cstddef>
 #include <vector>
 #include <string>
 #include <utility>

src/output.cpp

@@ -1,6 +1,6 @@
 #include "output.h"
 
-#include <errno.h>
+#include <cerrno>
 #include <cctype>
 #include <cstdio>
 #include <algorithm>

src/pixel_minimap.cpp

@@ -23,13 +23,13 @@
 
 #include <algorithm>
 #include <array>
-#include <assert.h>
+#include <cassert>
 #include <bitset>
 #include <cmath>
 #include <iterator>
 #include <memory>
 #include <set>
-#include <stdlib.h>
+#include <cstdlib>
 #include <utility>
 #include <vector>
 

src/requirements.cpp

@@ -1,6 +1,6 @@
 #include "requirements.h"
 
-#include <limits.h>
+#include <climits>
 #include <cstdlib>
 #include <algorithm>
 #include <limits>

src/rng.cpp

@@ -1,6 +1,6 @@
 #include "rng.h"
 
-#include <math.h>
+#include <cmath>
 #include <chrono>
 #include <utility>
 

src/savegame_json.cpp

@@ -5,7 +5,7 @@
 #include "npc_favor.h" // IWYU pragma: associated
 #include "pldata.h" // IWYU pragma: associated
 
-#include <limits.h>
+#include <climits>
 #include <cctype>
 #include <cstddef>
 #include <algorithm>

src/sdl_utils.cpp

@@ -2,7 +2,7 @@
 
 #include "sdl_utils.h"
 
-#include <stddef.h>
+#include <cstddef>
 #include <array>
 
 #include "color.h"

src/sdltiles.cpp

@@ -3,7 +3,7 @@
 #include "sdltiles.h" // IWYU pragma: associated
 #include "cursesdef.h" // IWYU pragma: associated
 
-#include <stdint.h>
+#include <cstdint>
 #include <climits>
 #include <algorithm>
 #include <cassert>

src/string_input_popup.h

@@ -2,7 +2,7 @@
 #ifndef STRING_INPUT_POPUP_H
 #define STRING_INPUT_POPUP_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <cstddef>
 #include <functional>
 #include <map>

src/ui.cpp

@@ -1,6 +1,6 @@
 #include "ui.h"
 
-#include <assert.h>
+#include <cassert>
 #include <cctype>
 #include <climits>
 #include <cstdlib>

tests/bionics_test.cpp

@@ -1,5 +1,5 @@
-#include <limits.h>
-#include <stddef.h>
+#include <climits>
+#include <cstddef>
 #include <list>
 #include <memory>
 #include <string>

tests/colony_test.cpp

@@ -1,4 +1,4 @@
-#include <stddef.h>
+#include <cstddef>
 #include <algorithm> // std::find
 #include <functional> // std::greater
 #include <utility> // std::move

tests/comestible_tests.cpp

@@ -1,4 +1,4 @@
-#include <stdio.h>
+#include <cstdio>
 #include <algorithm>
 #include <list>
 #include <map>

tests/crafting_test.cpp

@@ -1,4 +1,4 @@
-#include <limits.h>
+#include <climits>
 #include <sstream>
 #include <algorithm>
 #include <list>

tests/creature_test.cpp

@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <cstdlib>
 #include <map>
 #include <utility>