Merge pull request #639 from OpenVicProject/rename_pop_folder_population

wvpm · web-flow · commit cbc69f7c0d98 · 2025-11-12T15:42:17.000+01:00
Rename pop folder population
diff --git a/src/openvic-simulation/DefinitionManager.hpp b/src/openvic-simulation/DefinitionManager.hpp
@@ -16,7 +16,7 @@
 #include "openvic-simulation/misc/SoundEffect.hpp"
 #include "openvic-simulation/modifier/ModifierManager.hpp"
 #include "openvic-simulation/politics/PoliticsManager.hpp"
-#include "openvic-simulation/pop/PopManager.hpp"
+#include "openvic-simulation/population/PopManager.hpp"
 #include "openvic-simulation/research/ResearchManager.hpp"
 #include "openvic-simulation/scripts/ScriptManager.hpp"
 #include "openvic-simulation/interface/UI.hpp"
diff --git a/src/openvic-simulation/InstanceManager.hpp b/src/openvic-simulation/InstanceManager.hpp
@@ -15,7 +15,7 @@
 #include "openvic-simulation/misc/GameAction.hpp"
 #include "openvic-simulation/misc/SimulationClock.hpp"
 #include "openvic-simulation/politics/PoliticsInstanceManager.hpp"
-#include "openvic-simulation/pop/PopDeps.hpp"
+#include "openvic-simulation/population/PopDeps.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/FlagStrings.hpp"
 #include "openvic-simulation/utility/ThreadPool.hpp"
diff --git a/src/openvic-simulation/country/CountryDefinition.cpp b/src/openvic-simulation/country/CountryDefinition.cpp
@@ -10,7 +10,7 @@
 #include "openvic-simulation/politics/Government.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
 #include "openvic-simulation/politics/PartyPolicy.hpp"
-#include "openvic-simulation/pop/Culture.hpp"
+#include "openvic-simulation/population/Culture.hpp"
 #include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
diff --git a/src/openvic-simulation/country/CountryInstance.cpp b/src/openvic-simulation/country/CountryInstance.cpp
@@ -30,9 +30,9 @@
 #include "openvic-simulation/politics/NationalValue.hpp"
 #include "openvic-simulation/politics/PartyPolicy.hpp"
 #include "openvic-simulation/politics/Reform.hpp"
-#include "openvic-simulation/pop/Culture.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
+#include "openvic-simulation/population/Culture.hpp"
+#include "openvic-simulation/population/Pop.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/research/Invention.hpp"
 #include "openvic-simulation/research/Technology.hpp"
 #include "openvic-simulation/types/ClampedValue.hpp"
diff --git a/src/openvic-simulation/country/CountryInstance.hpp b/src/openvic-simulation/country/CountryInstance.hpp
@@ -8,7 +8,7 @@
 #include "openvic-simulation/military/UnitBranchedGetterMacro.hpp"
 #include "openvic-simulation/modifier/ModifierSum.hpp"
 #include "openvic-simulation/politics/Rule.hpp"
-#include "openvic-simulation/pop/PopsAggregate.hpp"
+#include "openvic-simulation/population/PopsAggregate.hpp"
 #include "openvic-simulation/types/ClampedValue.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/fixed_point/Atomic.hpp"
diff --git a/src/openvic-simulation/country/CountryInstanceManager.cpp b/src/openvic-simulation/country/CountryInstanceManager.cpp
@@ -7,7 +7,7 @@
 #include "openvic-simulation/InstanceManager.hpp"
 #include "openvic-simulation/history/CountryHistory.hpp"
 #include "openvic-simulation/military/UnitInstanceGroup.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
+#include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/utility/ThreadPool.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/country/SharedCountryValues.cpp b/src/openvic-simulation/country/SharedCountryValues.cpp
@@ -2,8 +2,8 @@
 
 #include "openvic-simulation/defines/PopsDefines.hpp"
 #include "openvic-simulation/economy/GoodInstance.hpp"
-#include "openvic-simulation/pop/PopNeedsMacro.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
+#include "openvic-simulation/population/PopNeedsMacro.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/country/SharedCountryValues.hpp b/src/openvic-simulation/country/SharedCountryValues.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "openvic-simulation/pop/PopNeedsMacro.hpp"
+#include "openvic-simulation/population/PopNeedsMacro.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/reactive/MutableState.hpp"
diff --git a/src/openvic-simulation/economy/production/ArtisanalProducer.cpp b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
@@ -11,8 +11,8 @@
 #include "openvic-simulation/economy/trading/MarketInstance.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
-#include "openvic-simulation/pop/PopValuesFromProvince.hpp"
+#include "openvic-simulation/population/Pop.hpp"
+#include "openvic-simulation/population/PopValuesFromProvince.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/RandomGenerator.hpp"
 #include "openvic-simulation/utility/Typedefs.hpp"
diff --git a/src/openvic-simulation/economy/production/Employee.cpp b/src/openvic-simulation/economy/production/Employee.cpp
@@ -1,7 +1,7 @@
 #include "Employee.hpp"
 
 #include "openvic-simulation/country/CountryInstance.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
+#include "openvic-simulation/population/Pop.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/economy/production/ProductionType.cpp b/src/openvic-simulation/economy/production/ProductionType.cpp
@@ -5,8 +5,8 @@
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/misc/GameRulesManager.hpp"
-#include "openvic-simulation/pop/PopManager.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
+#include "openvic-simulation/population/PopManager.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/utility/ErrorMacros.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp b/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp
@@ -9,8 +9,8 @@
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/map/State.hpp"
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
+#include "openvic-simulation/population/Pop.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/PopSize.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
diff --git a/src/openvic-simulation/history/ProvinceHistory.hpp b/src/openvic-simulation/history/ProvinceHistory.hpp
@@ -4,7 +4,7 @@
 
 #include "openvic-simulation/economy/BuildingType.hpp"
 #include "openvic-simulation/history/HistoryMap.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
+#include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/types/BuildingLevel.hpp"
 #include "openvic-simulation/types/ColonyStatus.hpp"
 #include "openvic-simulation/types/Date.hpp"
diff --git a/src/openvic-simulation/map/MapInstance.cpp b/src/openvic-simulation/map/MapInstance.cpp
@@ -5,7 +5,7 @@
 
 #include "openvic-simulation/history/ProvinceHistory.hpp"
 #include "openvic-simulation/map/MapDefinition.hpp"
-#include "openvic-simulation/pop/PopValuesFromProvince.hpp"
+#include "openvic-simulation/population/PopValuesFromProvince.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 #include "openvic-simulation/utility/ThreadPool.hpp"
 
diff --git a/src/openvic-simulation/map/MapInstance.hpp b/src/openvic-simulation/map/MapInstance.hpp
@@ -4,7 +4,7 @@
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/map/State.hpp"
 #include "openvic-simulation/pathfinding/AStarPathing.hpp"
-#include "openvic-simulation/pop/PopValuesFromProvince.hpp"
+#include "openvic-simulation/population/PopValuesFromProvince.hpp"
 #include "openvic-simulation/types/Date.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/map/Mapmode.cpp b/src/openvic-simulation/map/Mapmode.cpp
@@ -6,8 +6,8 @@
 #include "openvic-simulation/map/MapInstance.hpp"
 #include "openvic-simulation/map/ProvinceDefinition.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
-#include "openvic-simulation/pop/Culture.hpp"
-#include "openvic-simulation/pop/Religion.hpp"
+#include "openvic-simulation/population/Culture.hpp"
+#include "openvic-simulation/population/Religion.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
 #include "openvic-simulation/types/PopSize.hpp"
 
diff --git a/src/openvic-simulation/map/ProvinceInstance.hpp b/src/openvic-simulation/map/ProvinceInstance.hpp
@@ -6,8 +6,8 @@
 #include "openvic-simulation/economy/production/ResourceGatheringOperation.hpp"
 #include "openvic-simulation/military/UnitBranchedGetterMacro.hpp"
 #include "openvic-simulation/modifier/ModifierSum.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
-#include "openvic-simulation/pop/PopsAggregate.hpp"
+#include "openvic-simulation/population/Pop.hpp"
+#include "openvic-simulation/population/PopsAggregate.hpp"
 #include "openvic-simulation/types/ColonyStatus.hpp"
 #include "openvic-simulation/types/FlagStrings.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
diff --git a/src/openvic-simulation/map/State.cpp b/src/openvic-simulation/map/State.cpp
@@ -5,8 +5,8 @@
 #include "openvic-simulation/map/MapInstance.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/map/Region.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
+#include "openvic-simulation/population/Pop.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/StringUtils.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
diff --git a/src/openvic-simulation/map/State.hpp b/src/openvic-simulation/map/State.hpp
@@ -4,7 +4,7 @@
 
 #include <fmt/base.h>
 
-#include "openvic-simulation/pop/PopsAggregate.hpp"
+#include "openvic-simulation/population/PopsAggregate.hpp"
 #include "openvic-simulation/types/ColonyStatus.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
diff --git a/src/openvic-simulation/military/UnitInstanceGroup.cpp b/src/openvic-simulation/military/UnitInstanceGroup.cpp
@@ -8,7 +8,7 @@
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/military/Deployment.hpp"
 #include "openvic-simulation/military/LeaderTrait.hpp"
-#include "openvic-simulation/pop/Culture.hpp"
+#include "openvic-simulation/population/Culture.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 #include "openvic-simulation/utility/FormatValidate.hpp"
diff --git a/src/openvic-simulation/modifier/ModifierEffectCache.cpp b/src/openvic-simulation/modifier/ModifierEffectCache.cpp
@@ -5,7 +5,7 @@
 #include "openvic-simulation/map/TerrainType.hpp"
 #include "openvic-simulation/military/UnitType.hpp"
 #include "openvic-simulation/politics/Rebel.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/research/Technology.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/politics/NationalFocus.cpp b/src/openvic-simulation/politics/NationalFocus.cpp
@@ -3,7 +3,7 @@
 #include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/modifier/ModifierManager.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
-#include "openvic-simulation/pop/PopManager.hpp"
+#include "openvic-simulation/population/PopManager.hpp"
 #include "openvic-simulation/utility/FormatValidate.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/population/Culture.cpp b/src/openvic-simulation/population/Culture.cpp
diff --git a/src/openvic-simulation/population/Culture.hpp b/src/openvic-simulation/population/Culture.hpp
diff --git a/src/openvic-simulation/population/Pop.cpp b/src/openvic-simulation/population/Pop.cpp
@@ -23,11 +23,11 @@
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
 #include "openvic-simulation/politics/IssueManager.hpp"
-#include "openvic-simulation/pop/Culture.hpp"
-#include "openvic-simulation/pop/PopNeedsMacro.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
-#include "openvic-simulation/pop/PopValuesFromProvince.hpp"
-#include "openvic-simulation/pop/Religion.hpp"
+#include "openvic-simulation/population/Culture.hpp"
+#include "openvic-simulation/population/PopNeedsMacro.hpp"
+#include "openvic-simulation/population/PopType.hpp"
+#include "openvic-simulation/population/PopValuesFromProvince.hpp"
+#include "openvic-simulation/population/Religion.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
diff --git a/src/openvic-simulation/population/Pop.hpp b/src/openvic-simulation/population/Pop.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "openvic-simulation/economy/production/ArtisanalProducer.hpp"
-#include "openvic-simulation/pop/PopNeedsMacro.hpp"
+#include "openvic-simulation/population/PopNeedsMacro.hpp"
 #include "openvic-simulation/types/fixed_point/Atomic.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
diff --git a/src/openvic-simulation/population/PopDeps.hpp b/src/openvic-simulation/population/PopDeps.hpp
diff --git a/src/openvic-simulation/population/PopManager.cpp b/src/openvic-simulation/population/PopManager.cpp
@@ -6,7 +6,7 @@
 #include "openvic-simulation/politics/Ideology.hpp"
 #include "openvic-simulation/politics/IssueManager.hpp"
 #include "openvic-simulation/politics/Rebel.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
+#include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/military/UnitType.hpp"
 #include "openvic-simulation/modifier/ModifierManager.hpp"
 #include "openvic-simulation/utility/FormatValidate.hpp"
diff --git a/src/openvic-simulation/population/PopManager.hpp b/src/openvic-simulation/population/PopManager.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "openvic-simulation/pop/Culture.hpp"
-#include "openvic-simulation/pop/Religion.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
+#include "openvic-simulation/population/Culture.hpp"
+#include "openvic-simulation/population/Religion.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 
 namespace OpenVic {
 	struct GoodDefinitionManager;
diff --git a/src/openvic-simulation/population/PopNeedsMacro.hpp b/src/openvic-simulation/population/PopNeedsMacro.hpp
diff --git a/src/openvic-simulation/population/PopType.cpp b/src/openvic-simulation/population/PopType.cpp
diff --git a/src/openvic-simulation/population/PopType.hpp b/src/openvic-simulation/population/PopType.hpp
diff --git a/src/openvic-simulation/population/PopValuesFromProvince.cpp b/src/openvic-simulation/population/PopValuesFromProvince.cpp
@@ -9,7 +9,7 @@
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/misc/GameRulesManager.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/population/PopValuesFromProvince.hpp b/src/openvic-simulation/population/PopValuesFromProvince.hpp
diff --git a/src/openvic-simulation/population/PopsAggregate.cpp b/src/openvic-simulation/population/PopsAggregate.cpp
@@ -3,8 +3,8 @@
 #include "openvic-simulation/country/CountryDefinition.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
-#include "openvic-simulation/pop/PopType.hpp"
+#include "openvic-simulation/population/Pop.hpp"
+#include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
 
diff --git a/src/openvic-simulation/population/PopsAggregate.hpp b/src/openvic-simulation/population/PopsAggregate.hpp
diff --git a/src/openvic-simulation/population/Religion.cpp b/src/openvic-simulation/population/Religion.cpp
diff --git a/src/openvic-simulation/population/Religion.hpp b/src/openvic-simulation/population/Religion.hpp
diff --git a/src/openvic-simulation/utility/ThreadPool.hpp b/src/openvic-simulation/utility/ThreadPool.hpp
@@ -5,7 +5,7 @@
 #include <mutex>
 #include <thread>
 
-#include "openvic-simulation/pop/PopValuesFromProvince.hpp"
+#include "openvic-simulation/population/PopValuesFromProvince.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 #include "openvic-simulation/utility/ForwardableSpan.hpp"
