Merge pull request #67 from OpenVicProject/format

Formating

1 files changed, 12 insertions, 10 deletions

diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp
index 7261831..4abb2a9 100644
--- a/src/openvic-simulation/pop/Pop.hpp
+++ b/src/openvic-simulation/pop/Pop.hpp
@@ -52,11 +52,7 @@ namespace OpenVic {
 		using rebel_units_t = decimal_map_t<Unit const*>;
 
 	private:
-		const enum class strata_t {
-			POOR,
-			MIDDLE,
-			RICH
-		} strata;
+		const enum class strata_t { POOR, MIDDLE, RICH } strata;
 		const sprite_t sprite;
 		const Good::good_map_t life_needs, everyday_needs, luxury_needs;
 		const rebel_units_t rebel_units;
@@ -65,10 +61,12 @@ namespace OpenVic {
 
 		// TODO - country and province migration targets, promote_to targets, ideologies and issues
 
-		PopType(std::string_view new_identifier, colour_t new_colour, strata_t new_strata, sprite_t new_sprite,
+		PopType(
+			std::string_view new_identifier, colour_t new_colour, strata_t new_strata, sprite_t new_sprite,
 			Good::good_map_t&& new_life_needs, Good::good_map_t&& new_everyday_needs, Good::good_map_t&& new_luxury_needs,
 			rebel_units_t&& new_rebel_units, Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size,
-			bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan, bool new_is_slave);
+			bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan, bool new_is_slave
+		);
 
 	public:
 		PopType(PopType&&) = default;
@@ -102,13 +100,17 @@ namespace OpenVic {
 		REF_GETTERS(culture_manager)
 		REF_GETTERS(religion_manager)
 
-		bool add_pop_type(std::string_view identifier, colour_t new_colour, PopType::strata_t strata, PopType::sprite_t sprite,
+		bool add_pop_type(
+			std::string_view identifier, colour_t new_colour, PopType::strata_t strata, PopType::sprite_t sprite,
 			Good::good_map_t&& life_needs, Good::good_map_t&& everyday_needs, Good::good_map_t&& luxury_needs,
 			PopType::rebel_units_t&& rebel_units, Pop::pop_size_t max_size, Pop::pop_size_t merge_max_size,
-			bool state_capital_only, bool demote_migrant, bool is_artisan, bool is_slave);
+			bool state_capital_only, bool demote_migrant, bool is_artisan, bool is_slave
+		);
 		IDENTIFIER_REGISTRY_ACCESSORS(pop_type)
 
-		bool load_pop_type_file(std::string_view filestem, UnitManager const& unit_manager, GoodManager const& good_manager, ast::NodeCPtr root);
+		bool load_pop_type_file(
+			std::string_view filestem, UnitManager const& unit_manager, GoodManager const& good_manager, ast::NodeCPtr root
+		);
 		bool load_pop_into_province(Province& province, std::string_view pop_type_identifier, ast::NodeCPtr pop_node) const;
 	};
 }