From 2d76e0766f0d65ffd8c9eb19eaec705445f91af0 Mon Sep 17 00:00:00 2001
From: zaaarf <zaaarf@proton.me>
Date: Fri, 1 Dec 2023 20:03:03 +0100
Subject: feat: replaced REF_GETTERS with PROPERTY_REF, added
 PROPERTY_CUSTOM_PREFIX

---
 src/openvic-simulation/history/DiplomaticHistory.hpp |  8 ++++----
 src/openvic-simulation/history/HistoryManager.hpp    | 14 ++++----------
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'src/openvic-simulation/history')

diff --git a/src/openvic-simulation/history/DiplomaticHistory.hpp b/src/openvic-simulation/history/DiplomaticHistory.hpp
index 3ed253f..4d620b5 100644
--- a/src/openvic-simulation/history/DiplomaticHistory.hpp
+++ b/src/openvic-simulation/history/DiplomaticHistory.hpp
@@ -19,7 +19,7 @@ namespace OpenVic {
 			friend struct DiplomaticHistoryManager;
 
 		private:
-			Date PROPERTY_CUSTOM_NAME(added, get_date_added);
+			Date PROPERTY_CUSTOM_PREFIX(added, get_date);
 			Country const* PROPERTY(actor);
 			Country const* PROPERTY(receiver);
 			WargoalType const* PROPERTY(wargoal);
@@ -34,8 +34,8 @@ namespace OpenVic {
 
 		private:
 			Country const* PROPERTY(country);
-			Date PROPERTY_CUSTOM_NAME(joined, get_date_joined);
-			std::optional<Date> PROPERTY_CUSTOM_NAME(exited, get_date_exited);
+			Date PROPERTY_CUSTOM_PREFIX(joined, get_date);
+			std::optional<Date> PROPERTY_CUSTOM_PREFIX(exited, get_date);
 
 			war_participant_t(Country const* new_country, Date new_joined, std::optional<Date> new_exited);
 		};
@@ -73,7 +73,7 @@ namespace OpenVic {
 	private:
 		Country const* PROPERTY(overlord);
 		Country const* PROPERTY(subject);
-		const type_t PROPERTY_CUSTOM_NAME(type, get_subject_type);
+		const type_t PROPERTY_CUSTOM_PREFIX(type, get_subject);
 		const Date start;
 		const Date end;
 
diff --git a/src/openvic-simulation/history/HistoryManager.hpp b/src/openvic-simulation/history/HistoryManager.hpp
index a7fc668..35aebbf 100644
--- a/src/openvic-simulation/history/HistoryManager.hpp
+++ b/src/openvic-simulation/history/HistoryManager.hpp
@@ -9,15 +9,9 @@
 namespace OpenVic {
 	struct HistoryManager {
 	private:
-		BookmarkManager bookmark_manager;
-		CountryHistoryManager country_manager;
-		ProvinceHistoryManager province_manager;
-		DiplomaticHistoryManager diplomacy_manager;
-
-	public:
-		REF_GETTERS(bookmark_manager)
-		REF_GETTERS(country_manager)
-		REF_GETTERS(province_manager)
-		REF_GETTERS(diplomacy_manager)
+		BookmarkManager PROPERTY_REF(bookmark_manager);
+		CountryHistoryManager PROPERTY_REF(country_manager);
+		ProvinceHistoryManager PROPERTY_REF(province_manager);
+		DiplomaticHistoryManager PROPERTY_REF(diplomacy_manager);
 	};
 }
-- 
cgit v1.2.3-56-ga3b1