Merge pull request #167 from OpenVicProject/country-definition

Renamed Country to CountryDefinition

1 files changed, 13 insertions, 12 deletions

diff --git a/src/openvic-simulation/pop/Culture.hpp b/src/openvic-simulation/pop/Culture.hpp
index 72ea3ee..9fe06de 100644
--- a/src/openvic-simulation/pop/Culture.hpp
+++ b/src/openvic-simulation/pop/Culture.hpp
@@ -5,8 +5,8 @@
 namespace OpenVic {
 
 	struct CultureManager;
-	struct Country;
-	struct CountryManager;
+	struct CountryDefinition;
+	struct CountryDefinitionManager;
 
 	struct GraphicalCultureType : HasIdentifier {
 		friend struct CultureManager;
@@ -25,11 +25,12 @@ namespace OpenVic {
 		std::string PROPERTY(leader);
 		GraphicalCultureType const& PROPERTY(unit_graphical_culture_type);
 		bool PROPERTY(is_overseas);
-		Country const* PROPERTY(union_country);
+		CountryDefinition const* PROPERTY(union_country);
 
 		CultureGroup(
 			std::string_view new_identifier, std::string_view new_leader,
-			GraphicalCultureType const& new_unit_graphical_culture_type, bool new_is_overseas, Country const* new_union_country
+			GraphicalCultureType const& new_unit_graphical_culture_type, bool new_is_overseas,
+			CountryDefinition const* new_union_country
 		);
 
 	public:
@@ -44,11 +45,11 @@ namespace OpenVic {
 		name_list_t PROPERTY(first_names);
 		name_list_t PROPERTY(last_names);
 		fixed_point_t PROPERTY(radicalism);
-		Country const* PROPERTY(primary_country);
+		CountryDefinition const* PROPERTY(primary_country);
 
 		Culture(
 			std::string_view new_identifier, colour_t new_colour, CultureGroup const& new_group, name_list_t&& new_first_names,
-			name_list_t&& new_last_names, fixed_point_t new_radicalism, Country const* new_primary_country
+			name_list_t&& new_last_names, fixed_point_t new_radicalism, CountryDefinition const* new_primary_country
 		);
 
 	public:
@@ -64,12 +65,12 @@ namespace OpenVic {
 		GraphicalCultureType const* PROPERTY(default_graphical_culture_type);
 
 		bool _load_culture_group(
-			CountryManager const& country_manager, size_t& total_expected_cultures,
+			CountryDefinitionManager const& country_definition_manager, size_t& total_expected_cultures,
 			std::string_view culture_group_key, ast::NodeCPtr culture_group_node
 		);
 		bool _load_culture(
-			CountryManager const& country_manager, CultureGroup const& culture_group, std::string_view culture_key,
-			ast::NodeCPtr node
+			CountryDefinitionManager const& country_definition_manager, CultureGroup const& culture_group,
+			std::string_view culture_key, ast::NodeCPtr node
 		);
 
 	public:
@@ -79,15 +80,15 @@ namespace OpenVic {
 
 		bool add_culture_group(
 			std::string_view identifier, std::string_view leader, GraphicalCultureType const* graphical_culture_type,
-			bool is_overseas, Country const* union_country
+			bool is_overseas, CountryDefinition const* union_country
 		);
 
 		bool add_culture(
 			std::string_view identifier, colour_t colour, CultureGroup const& group, name_list_t&& first_names,
-			name_list_t&& last_names, fixed_point_t radicalism, Country const* primary_country
+			name_list_t&& last_names, fixed_point_t radicalism, CountryDefinition const* primary_country
 		);
 
 		bool load_graphical_culture_type_file(ast::NodeCPtr root);
-		bool load_culture_file(CountryManager const& country_manager, ast::NodeCPtr root);
+		bool load_culture_file(CountryDefinitionManager const& country_definition_manager, ast::NodeCPtr root);
 	};
 }