Skip to content

Commit

Permalink
Run IWYU
Browse files Browse the repository at this point in the history
* Change _ctype.h and __locale to cctype and clocale

* Change _wctype.h to cwctype in game.cpp

* Change __functional_base to functional

* Remove libcxx internal headers

* Remove UNIX system headers

* Fix clang-tidy error with -nostdinc++
  • Loading branch information
BrettDong committed Feb 6, 2021
1 parent 5146b8f commit 9fdb7ef
Show file tree
Hide file tree
Showing 620 changed files with 1,937 additions and 1,606 deletions.
1 change: 1 addition & 0 deletions src/achievement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <cstdlib>
#include <set>
#include <string>
#include <tuple>
#include <utility>

Expand Down
7 changes: 2 additions & 5 deletions src/achievement.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
#ifndef CATA_SRC_ACHIEVEMENT_H
#define CATA_SRC_ACHIEVEMENT_H

#include <algorithm>
#include <array>
#include <functional>
#include <list>
#include <iosfwd>
#include <memory>
#include <string>
#include <new>
#include <unordered_map>
#include <unordered_set>
#include <vector>

#include "calendar.h"
#include "cata_variant.h"
#include "enum_traits.h"
#include "event_subscriber.h"
#include "optional.h"
#include "string_id.h"
#include "translations.h"
#include "type_id.h"

Expand Down
4 changes: 3 additions & 1 deletion src/action.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
#include <istream>
#include <iterator>
#include <memory>
#include <new>
#include <string>
#include <utility>

#include "avatar.h"
#include "cached_options.h"
#include "cata_utility.h"
#include "character.h"
#include "colony.h"
#include "creature.h"
#include "debug.h"
#include "flag.h"
#include "game.h"
#include "iexamine.h"
#include "input.h"
#include "inventory.h"
#include "item.h"
Expand Down
6 changes: 3 additions & 3 deletions src/action.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
#define CATA_SRC_ACTION_H

#include <functional>
#include <iosfwd>
#include <map>
#include <set>
#include <string>
#include <vector>

namespace cata
{
template<typename T>
class optional;
} // namespace cata
struct tripoint;
struct point;
struct input_event;
struct point;
struct tripoint;

/**
* Enumerates all discrete actions that can be performed by player
Expand Down
2 changes: 1 addition & 1 deletion src/active_item_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef CATA_SRC_ACTIVE_ITEM_CACHE_H
#define CATA_SRC_ACTIVE_ITEM_CACHE_H

#include <iosfwd>
#include <cstddef>
#include <list>
#include <unordered_map>
#include <vector>
Expand Down
25 changes: 22 additions & 3 deletions src/activity_actor.cpp
Original file line number Diff line number Diff line change
@@ -1,30 +1,41 @@
#include "activity_actor.h"
#include "activity_actor_definitions.h"

#include <algorithm>
#include <array>
#include <cmath>
#include <cstddef>
#include <cstdint>
#include <functional>
#include <list>
#include <map>
#include <new>
#include <string>
#include <type_traits>
#include <utility>
#include <vector>

#include "action.h"
#include "activity_actor_definitions.h"
#include "activity_handlers.h" // put_into_vehicle_or_drop and drop_on_map
#include "advanced_inv.h"
#include "avatar.h"
#include "avatar_action.h"
#include "bodypart.h"
#include "calendar.h"
#include "character.h"
#include "coordinates.h"
#include "craft_command.h"
#include "debug.h"
#include "enums.h"
#include "event.h"
#include "event_bus.h"
#include "flag.h"
#include "flat_set.h"
#include "game.h"
#include "game_constants.h"
#include "gates.h"
#include "gun_mode.h"
#include "handle_liquid.h"
#include "iexamine.h"
#include "int_id.h"
#include "item.h"
#include "item_contents.h"
#include "item_group.h"
Expand All @@ -35,24 +46,32 @@
#include "map.h"
#include "map_iterator.h"
#include "mapdata.h"
#include "memory_fast.h"
#include "messages.h"
#include "monster.h"
#include "morale_types.h"
#include "mtype.h"
#include "npc.h"
#include "optional.h"
#include "options.h"
#include "output.h"
#include "pickup.h"
#include "pimpl.h"
#include "player.h"
#include "player_activity.h"
#include "point.h"
#include "ranged.h"
#include "recipe.h"
#include "requirements.h"
#include "ret_val.h"
#include "rng.h"
#include "sounds.h"
#include "string_formatter.h"
#include "timed_event.h"
#include "translations.h"
#include "ui.h"
#include "uistate.h"
#include "units.h"
#include "value_ptr.h"
#include "vehicle.h"
#include "vpart_position.h"
Expand Down
2 changes: 1 addition & 1 deletion src/activity_actor.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#ifndef CATA_SRC_ACTIVITY_ACTOR_H
#define CATA_SRC_ACTIVITY_ACTOR_H

#include <iosfwd>
#include <memory>
#include <string>
#include <unordered_map>

#include "activity_type.h"
Expand Down
10 changes: 3 additions & 7 deletions src/activity_handlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <algorithm>
#include <climits>
#include <cmath>
#include <cstddef>
#include <cstdlib>
#include <iterator>
#include <memory>
#include <ostream>
Expand Down Expand Up @@ -31,24 +31,22 @@
#include "color.h"
#include "construction.h"
#include "coordinates.h"
#include "craft_command.h"
#include "creature.h"
#include "damage.h"
#include "debug.h"
#include "effect_source.h"
#include "enums.h"
#include "event.h"
#include "event_bus.h"
#include "fault.h"
#include "field_type.h"
#include "flag.h"
#include "flat_set.h"
#include "game.h"
#include "game_constants.h"
#include "game_inventory.h"
#include "handle_liquid.h"
#include "harvest.h"
#include "iexamine.h"
#include "int_id.h"
#include "inventory.h"
#include "item.h"
#include "item_contents.h"
Expand All @@ -66,6 +64,7 @@
#include "map_selector.h"
#include "mapdata.h"
#include "martialarts.h"
#include "memory_fast.h"
#include "messages.h"
#include "mongroup.h"
#include "monster.h"
Expand All @@ -82,20 +81,17 @@
#include "point.h"
#include "proficiency.h"
#include "ranged.h"
#include "recipe.h"
#include "requirements.h"
#include "ret_val.h"
#include "rng.h"
#include "skill.h"
#include "sounds.h"
#include "string_formatter.h"
#include "string_id.h"
#include "text_snippets.h"
#include "translations.h"
#include "type_id.h"
#include "ui.h"
#include "units.h"
#include "units_fwd.h"
#include "value_ptr.h"
#include "veh_interact.h"
#include "vehicle.h"
Expand Down
1 change: 1 addition & 0 deletions src/activity_handlers.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <functional>
#include <list>
#include <map>
#include <new>
#include <unordered_set>
#include <vector>

Expand Down
16 changes: 6 additions & 10 deletions src/activity_item_handling.cpp
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
#include "activity_handlers.h" // IWYU pragma: associated

#include <algorithm>
#include <cmath>
#include <cstddef>
#include <cstdlib>
#include <iosfwd>
#include <list>
#include <memory>
#include <set>
#include <string>
#include <tuple>
#include <type_traits>
#include <utility>
#include <vector>

#include "activity_handlers.h" // IWYU pragma: associated
#include "activity_type.h"
#include "avatar.h"
#include "calendar.h"
#include "cata_assert.h"
#include "character.h"
#include "clzones.h"
#include "colony.h"
Expand All @@ -25,15 +28,13 @@
#include "field_type.h"
#include "fire.h"
#include "flag.h"
#include "flat_set.h"
#include "game.h"
#include "game_constants.h"
#include "iexamine.h"
#include "int_id.h"
#include "inventory.h"
#include "item.h"
#include "item_contents.h"
#include "item_location.h"
#include "item_pocket.h"
#include "itype.h"
#include "iuse.h"
#include "line.h"
Expand All @@ -42,11 +43,9 @@
#include "map_selector.h"
#include "mapdata.h"
#include "messages.h"
#include "monster.h"
#include "mtype.h"
#include "npc.h"
#include "optional.h"
#include "output.h"
#include "pickup.h"
#include "player.h"
#include "player_activity.h"
Expand All @@ -55,13 +54,10 @@
#include "ret_val.h"
#include "rng.h"
#include "stomach.h"
#include "string_formatter.h"
#include "string_id.h"
#include "temp_crafting_inventory.h"
#include "translations.h"
#include "trap.h"
#include "units.h"
#include "units_fwd.h"
#include "value_ptr.h"
#include "veh_type.h"
#include "vehicle.h"
Expand Down
3 changes: 1 addition & 2 deletions src/activity_type.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "activity_type.h"

#include <algorithm>
#include <functional>
#include <map>
#include <string>
#include <unordered_map>
#include <utility>

Expand All @@ -12,7 +12,6 @@
#include "debug.h"
#include "enum_conversions.h"
#include "json.h"
#include "player.h"
#include "sounds.h"
#include "string_formatter.h"
#include "translations.h"
Expand Down
4 changes: 2 additions & 2 deletions src/activity_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
#ifndef CATA_SRC_ACTIVITY_TYPE_H
#define CATA_SRC_ACTIVITY_TYPE_H

#include <string>
#include <iosfwd>

#include "game_constants.h"
#include "string_id.h"
#include "translations.h"

class activity_type;
class JsonObject;
class activity_type;
class player;
class player_activity;

Expand Down
1 change: 1 addition & 0 deletions src/addiction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <algorithm>
#include <cstdlib>
#include <map>
#include <string>
#include <utility>

#include "calendar.h"
Expand Down
3 changes: 1 addition & 2 deletions src/addiction.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
#ifndef CATA_SRC_ADDICTION_H
#define CATA_SRC_ADDICTION_H

#include <string>
#include <iosfwd>

#include "pldata.h"
#include "type_id.h"

class Character;
class addiction;

// Minimum intensity before effects are seen
constexpr int MIN_ADDICTION_LEVEL = 3;
Expand Down
Loading

0 comments on commit 9fdb7ef

Please sign in to comment.