Skip to content

Commit

Permalink
Apply IWYU changes
Browse files Browse the repository at this point in the history
These are the changes made by running IWYU as described in
DEVELOPER_TOOLING.md.
  • Loading branch information
jbytheway committed Jan 26, 2019
1 parent 94c0396 commit b62a9a8
Show file tree
Hide file tree
Showing 414 changed files with 2,959 additions and 534 deletions.
9 changes: 9 additions & 0 deletions src/action.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#include "action.h"

#include <limits.h>
#include <algorithm>
#include <istream>
#include <iterator>
#include <memory>
#include <utility>

#include "cata_utility.h"
#include "debug.h"
Expand All @@ -22,6 +25,12 @@
#include "ui.h"
#include "vehicle.h"
#include "vpart_position.h"
#include "cursesdef.h"
#include "enums.h"
#include "item.h"
#include "ret_val.h"

class inventory;

void parse_keymap( std::istream &keymap_txt, std::map<char, action_id> &kmap,
std::set<action_id> &unbound_keymap );
Expand Down
1 change: 1 addition & 0 deletions src/active_item_cache.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "active_item_cache.h"

#include <algorithm>
#include <utility>

#include "debug.h"
#include "item.h"
Expand Down
3 changes: 1 addition & 2 deletions src/active_item_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
#include <unordered_map>

#include "enums.h"

class item;
#include "item.h"

// A struct used to uniquely identify an item within a submap or vehicle.
struct item_reference {
Expand Down
31 changes: 31 additions & 0 deletions src/activity_handlers.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
#include "activity_handlers.h"

#include <limits.h>
#include <stddef.h>
#include <algorithm>
#include <cmath>
#include <iterator>
#include <memory>
#include <ostream>
#include <set>
#include <stdexcept>
#include <string>
#include <utility>

#include "action.h"
#include "advanced_inv.h"
Expand Down Expand Up @@ -39,6 +48,28 @@
#include "vehicle.h"
#include "vpart_position.h"
#include "map_selector.h"
#include "bodypart.h"
#include "calendar.h"
#include "cata_utility.h"
#include "character.h"
#include "creature.h"
#include "damage.h"
#include "enums.h"
#include "int_id.h"
#include "item.h"
#include "item_location.h"
#include "item_stack.h"
#include "iuse.h"
#include "line.h"
#include "monster.h"
#include "optional.h"
#include "pimpl.h"
#include "pldata.h"
#include "ret_val.h"
#include "string_id.h"
#include "units.h"

class recipe;

#define dbg(x) DebugLog((DebugLevel)(x),D_GAME) << __FILE__ << ":" << __LINE__ << ": "

Expand Down
4 changes: 4 additions & 0 deletions src/activity_handlers.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@
#include <map>
#include <unordered_set>
#include <vector>
#include <list>

#include "player_activity.h"

class player;
class Character;
class item;
struct tripoint;

std::vector<tripoint> get_sorted_tiles_by_distance( const tripoint &abspos,
const std::unordered_set<tripoint> &tiles );
Expand Down
15 changes: 14 additions & 1 deletion src/activity_item_handling.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
#include "activity_handlers.h" // IWYU pragma: associated

#include <limits.h>
#include <stddef.h>
#include <algorithm>
#include <cassert>
#include <list>
#include <vector>
#include <iterator>
#include <memory>
#include <set>
#include <string>
#include <utility>

#include "action.h"
#include "clzones.h"
#include "creature.h"
#include "debug.h"
Expand Down Expand Up @@ -33,6 +39,13 @@
#include "vehicle.h"
#include "vpart_position.h"
#include "vpart_reference.h"
#include "calendar.h"
#include "character.h"
#include "game_constants.h"
#include "inventory.h"
#include "item_stack.h"
#include "line.h"
#include "units.h"

void cancel_aim_processing();

Expand Down
3 changes: 3 additions & 0 deletions src/activity_type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

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

#include "activity_handlers.h"
#include "assign.h"
Expand All @@ -10,6 +12,7 @@
#include "json.h"
#include "player.h"
#include "translations.h"
#include "player_activity.h"

// activity_type functions
static std::map< activity_id, activity_type > activity_type_all;
Expand Down
2 changes: 2 additions & 0 deletions src/activity_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#ifndef ACTIVITY_TYPE_H
#define ACTIVITY_TYPE_H

#include <string>

#include "string_id.h"

class activity_type;
Expand Down
6 changes: 6 additions & 0 deletions src/addiction.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
#include "addiction.h"

#include <algorithm>
#include <map>
#include <utility>

#include "morale_types.h"
#include "output.h"
#include "player.h"
#include "pldata.h"
#include "rng.h"
#include "translations.h"
#include "calendar.h"
#include "creature.h"

const efftype_id effect_hallu( "hallu" );
const efftype_id effect_shakes( "shakes" );
Expand Down
4 changes: 4 additions & 0 deletions src/addiction.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
#ifndef ADDICTION_H
#define ADDICTION_H

#include <string>

#include "string_id.h"

class addiction;
class player;

enum add_type : int;
class morale_type_data;

using morale_type = string_id<morale_type_data>;

constexpr int MIN_ADDICTION_LEVEL = 3; // Minimum intensity before effects are seen
Expand Down
16 changes: 15 additions & 1 deletion src/advanced_inv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@
#include "vehicle.h"
#include "vpart_position.h"
#include "vpart_reference.h"
#include "calendar.h"
#include "color.h"
#include "game_constants.h"
#include "int_id.h"
#include "inventory.h"
#include "item.h"
#include "line.h"
#include "optional.h"
#include "pldata.h"
#include "string_id.h"

#ifdef __ANDROID__
#include <SDL_keyboard.h>
Expand All @@ -36,9 +46,13 @@
#include <cstring>
#include <map>
#include <set>
#include <sstream>
#include <string>
#include <vector>
#include <initializer_list>
#include <iterator>
#include <memory>
#include <unordered_map>
#include <utility>

enum aim_exit {
exit_none = 0,
Expand Down
2 changes: 2 additions & 0 deletions src/advanced_inv.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#ifndef ADVANCED_INV_H
#define ADVANCED_INV_H

#include <ctype.h>
#include <stddef.h>
#include <array>
#include <functional>
#include <list>
Expand Down
1 change: 1 addition & 0 deletions src/ammo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "item.h"
#include "json.h"
#include "translations.h"
#include "string_id.h"

namespace
{
Expand Down
1 change: 1 addition & 0 deletions src/ammo.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#define AMMO_H

#include <string>
#include <utility>

class JsonObject;

Expand Down
5 changes: 5 additions & 0 deletions src/anatomy.cpp
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
#include "anatomy.h"

#include <stddef.h>
#include <array>
#include <cmath>
#include <numeric>
#include <set>

#include "cata_utility.h"
#include "generic_factory.h"
#include "messages.h"
#include "output.h"
#include "rng.h"
#include "weighted_list.h"
#include "debug.h"
#include "int_id.h"
#include "json.h"

anatomy_id human_anatomy( "human_anatomy" );

Expand Down
3 changes: 3 additions & 0 deletions src/anatomy.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
#define ANATOMY_H

#include <vector>
#include <string>

#include "bodypart.h"
#include "string_id.h"

class anatomy;
class JsonObject;

using anatomy_id = string_id<anatomy>;

/**
Expand Down
11 changes: 11 additions & 0 deletions src/animation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
#include "player.h"
#include "popup.h"
#include "weather.h"
#include "creature.h"
#include "cursesdef.h"
#include "enums.h"
#include "game_constants.h"
#include "posix_time.h"
#include "translations.h"

#ifdef TILES
#include <memory>
Expand All @@ -19,6 +25,11 @@ extern std::unique_ptr<cata_tiles> tilecontext; // obtained from sdltiles.cpp
#endif

#include <algorithm>
#include <list>
#include <map>
#include <string>
#include <utility>
#include <vector>

bool is_valid_in_w_terrain( int x, int y ); // see game.cpp

Expand Down
2 changes: 2 additions & 0 deletions src/armor_layers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <algorithm>
#include <string>
#include <vector>
#include <iterator>

#include "cata_utility.h"
#include "catacharset.h" // used for utf8_width()
Expand All @@ -14,6 +15,7 @@
#include "output.h"
#include "string_formatter.h"
#include "translations.h"
#include "debug.h"

namespace
{
Expand Down
14 changes: 13 additions & 1 deletion src/artifact.cpp
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
#include "artifact.h"

#include <stdlib.h>
#include <array>
#include <cmath>
#include <sstream>
#include <algorithm>
#include <map>
#include <memory>
#include <set>
#include <unordered_map>
#include <vector>

#include "cata_utility.h"
#include "item_factory.h"
#include "json.h"
#include "rng.h"
#include "string_formatter.h"
#include "translations.h"
#include "bodypart.h"
#include "color.h"
#include "damage.h"
#include "iuse.h"
#include "optional.h"
#include "units.h"

template<typename V, typename B>
inline units::quantity<V, B> rng( const units::quantity<V, B> &min,
Expand Down
1 change: 1 addition & 0 deletions src/artifact.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

class JsonObject;
class JsonOut;
class item;

enum art_effect_active : int {
AEA_NULL = 0,
Expand Down
9 changes: 8 additions & 1 deletion src/auto_pickup.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#include "auto_pickup.h"

#include <stddef.h>
#include <algorithm>
#include <sstream>
#include <functional>
#include <map>
#include <memory>
#include <utility>

#include "cata_utility.h"
#include "debug.h"
Expand All @@ -17,9 +22,11 @@
#include "path_info.h"
#include "player.h"
#include "string_formatter.h"
#include "string_id.h"
#include "string_input_popup.h"
#include "translations.h"
#include "color.h"
#include "cursesdef.h"
#include "item.h"

auto_pickup &get_auto_pickup()
{
Expand Down
Loading

0 comments on commit b62a9a8

Please sign in to comment.