From 03647d2249f72b6545628bb844685f87c4581062 Mon Sep 17 00:00:00 2001
From: hop311 <hop3114@gmail.com>
Date: Fri, 19 Jul 2024 19:02:25 +0100
Subject: Cleanup: inheritance, const movable variables, code formatting

---
 src/openvic-simulation/types/Colour.hpp             | 2 +-
 src/openvic-simulation/types/HasIdentifier.hpp      | 6 +++++-
 src/openvic-simulation/types/IdentifierRegistry.hpp | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/src/openvic-simulation/types/Colour.hpp b/src/openvic-simulation/types/Colour.hpp
index b1888f2..991493b 100644
--- a/src/openvic-simulation/types/Colour.hpp
+++ b/src/openvic-simulation/types/Colour.hpp
@@ -321,7 +321,7 @@ namespace OpenVic {
 			return _array_access_helper<value_type>(*this, index);
 		}
 
-		constexpr const value_type& operator[](std::size_t index) const {
+		constexpr value_type const& operator[](std::size_t index) const {
 			return _array_access_helper<const value_type>(*this, index);
 		}
 
diff --git a/src/openvic-simulation/types/HasIdentifier.hpp b/src/openvic-simulation/types/HasIdentifier.hpp
index 941eae9..925d58b 100644
--- a/src/openvic-simulation/types/HasIdentifier.hpp
+++ b/src/openvic-simulation/types/HasIdentifier.hpp
@@ -27,7 +27,8 @@ namespace OpenVic {
 	 * can be entered into an IdentifierRegistry instance.
 	 */
 	class HasIdentifier {
-		const std::string PROPERTY(identifier);
+		/* Not const so it can be moved rather than needing to be copied. */
+		std::string PROPERTY(identifier);
 
 	protected:
 		HasIdentifier(std::string_view new_identifier): identifier { new_identifier } {
@@ -67,6 +68,9 @@ namespace OpenVic {
 		_HasColour& operator=(_HasColour&&) = delete;
 	};
 
+	using HasColour = _HasColour<colour_t>;
+	using HasAlphaColour = _HasColour<colour_argb_t>;
+
 	/*
 	 * Base class for objects with a unique string identifier and associated colour information.
 	 */
diff --git a/src/openvic-simulation/types/IdentifierRegistry.hpp b/src/openvic-simulation/types/IdentifierRegistry.hpp
index fe83a43..a73ebcc 100644
--- a/src/openvic-simulation/types/IdentifierRegistry.hpp
+++ b/src/openvic-simulation/types/IdentifierRegistry.hpp
@@ -173,7 +173,7 @@ namespace OpenVic {
 		static constexpr bool storage_type_reservable = Reservable<storage_type>;
 
 	private:
-		const std::string PROPERTY(name);
+		std::string PROPERTY(name);
 		const bool log_lock;
 		storage_type PROPERTY_REF(items);
 		bool PROPERTY_CUSTOM_PREFIX(locked, is);
-- 
cgit v1.2.3-56-ga3b1