Merge pull request #91 from OpenVicProject/registry-macro

Improved identifier registry macro

2 files changed, 1 insertions, 7 deletions

diff --git a/src/openvic-simulation/history/Bookmark.cpp b/src/openvic-simulation/history/Bookmark.cpp
index e9543be..2927950 100644
--- a/src/openvic-simulation/history/Bookmark.cpp
+++ b/src/openvic-simulation/history/Bookmark.cpp
@@ -16,8 +16,6 @@ Bookmark::Bookmark(
 ) : HasIdentifier { std::to_string(new_index) }, name { new_name }, description { new_description }, date { new_date },
 	initial_camera_x { new_initial_camera_x }, initial_camera_y { new_initial_camera_y } {}
 
-BookmarkManager::BookmarkManager() : bookmarks { "bookmarks" } {}
-
 bool BookmarkManager::add_bookmark(
 	std::string_view name, std::string_view description, Date date, uint32_t initial_camera_x, uint32_t initial_camera_y
 ) {
diff --git a/src/openvic-simulation/history/Bookmark.hpp b/src/openvic-simulation/history/Bookmark.hpp
index 18375fb..7401105 100644
--- a/src/openvic-simulation/history/Bookmark.hpp
+++ b/src/openvic-simulation/history/Bookmark.hpp
@@ -30,17 +30,13 @@ namespace OpenVic {
 
 	struct BookmarkManager {
 	private:
-		IdentifierRegistry<Bookmark> bookmarks;
+		IdentifierRegistry<Bookmark> IDENTIFIER_REGISTRY(bookmark);
 
 	public:
-		BookmarkManager();
-
 		bool add_bookmark(
 			std::string_view name, std::string_view description, Date date, uint32_t initial_camera_x,
 			uint32_t initial_camera_y
 		);
-		IDENTIFIER_REGISTRY_ACCESSORS(bookmark)
-
 		bool load_bookmark_file(ast::NodeCPtr root);
 	};
 }