From e46117ea0640042cc8a1097f1fce31ff342ed3a9 Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Tue, 26 May 2020 15:02:41 +0200
Subject: [PATCH] Fixes DataLibrary not having correct const definitions.

---
 src/Battling/Library/BattleLibrary.cpp | 10 ++++-----
 src/Battling/Library/BattleLibrary.hpp | 12 +++++------
 src/Library/BaseLibrary.hpp            |  2 +-
 src/Library/DataLibrary.hpp            | 28 +++++++++++++++-----------
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/Battling/Library/BattleLibrary.cpp b/src/Battling/Library/BattleLibrary.cpp
index a3cdc42..cb02504 100644
--- a/src/Battling/Library/BattleLibrary.cpp
+++ b/src/Battling/Library/BattleLibrary.cpp
@@ -24,25 +24,25 @@ BattleLibrary::~BattleLibrary() {
     delete _miscLibrary;
 }
 
-const std::unique_ptr<CreatureLib::Library::LibrarySettings>& BattleLibrary::GetSettings() const noexcept {
+const std::unique_ptr<const CreatureLib::Library::LibrarySettings>& BattleLibrary::GetSettings() const noexcept {
     return _staticLib->GetSettings();
 }
 
 const BattleStatCalculator* BattleLibrary::GetStatCalculator() const noexcept { return _statCalculator; }
 
-const std::unique_ptr<CreatureLib::Library::SpeciesLibrary>& BattleLibrary::GetSpeciesLibrary() const noexcept {
+const std::unique_ptr<const CreatureLib::Library::SpeciesLibrary>& BattleLibrary::GetSpeciesLibrary() const noexcept {
     return _staticLib->GetSpeciesLibrary();
 }
 
-const std::unique_ptr<CreatureLib::Library::ItemLibrary>& BattleLibrary::GetItemLibrary() const noexcept {
+const std::unique_ptr<const CreatureLib::Library::ItemLibrary>& BattleLibrary::GetItemLibrary() const noexcept {
     return _staticLib->GetItemLibrary();
 }
 
-const std::unique_ptr<CreatureLib::Library::AttackLibrary>& BattleLibrary::GetAttackLibrary() const noexcept {
+const std::unique_ptr<const CreatureLib::Library::AttackLibrary>& BattleLibrary::GetAttackLibrary() const noexcept {
     return _staticLib->GetAttackLibrary();
 }
 
-const std::unique_ptr<CreatureLib::Library::TypeLibrary>& BattleLibrary::GetTypeLibrary() const noexcept {
+const std::unique_ptr<const CreatureLib::Library::TypeLibrary>& BattleLibrary::GetTypeLibrary() const noexcept {
     return _staticLib->GetTypeLibrary();
 }
 
diff --git a/src/Battling/Library/BattleLibrary.hpp b/src/Battling/Library/BattleLibrary.hpp
index 10a229d..d2c88a0 100644
--- a/src/Battling/Library/BattleLibrary.hpp
+++ b/src/Battling/Library/BattleLibrary.hpp
@@ -25,12 +25,12 @@ namespace CreatureLib::Battling {
         ~BattleLibrary();
         inline const Library::DataLibrary* GetStaticLib() const noexcept { return _staticLib; }
 
-        [[nodiscard]] const std::unique_ptr<Library::LibrarySettings>& GetSettings() const noexcept;
-        [[nodiscard]] const std::unique_ptr<Library::SpeciesLibrary>& GetSpeciesLibrary() const noexcept;
-        [[nodiscard]] const std::unique_ptr<Library::ItemLibrary>& GetItemLibrary() const noexcept;
-        [[nodiscard]] const std::unique_ptr<Library::AttackLibrary>& GetAttackLibrary() const noexcept;
-        [[nodiscard]] const std::unique_ptr<Library::TypeLibrary>& GetTypeLibrary() const noexcept;
-        [[nodiscard]] const std::unique_ptr<Library::GrowthRateLibrary>& GetGrowthRateLibrary() const noexcept {
+        [[nodiscard]] const std::unique_ptr<const Library::LibrarySettings>& GetSettings() const noexcept;
+        [[nodiscard]] const std::unique_ptr<const Library::SpeciesLibrary>& GetSpeciesLibrary() const noexcept;
+        [[nodiscard]] const std::unique_ptr<const Library::ItemLibrary>& GetItemLibrary() const noexcept;
+        [[nodiscard]] const std::unique_ptr<const Library::AttackLibrary>& GetAttackLibrary() const noexcept;
+        [[nodiscard]] const std::unique_ptr<const Library::TypeLibrary>& GetTypeLibrary() const noexcept;
+        [[nodiscard]] const std::unique_ptr<const Library::GrowthRateLibrary>& GetGrowthRateLibrary() const noexcept {
             return _staticLib->GetGrowthRates();
         }
 
diff --git a/src/Library/BaseLibrary.hpp b/src/Library/BaseLibrary.hpp
index 9338fa2..29be9c4 100644
--- a/src/Library/BaseLibrary.hpp
+++ b/src/Library/BaseLibrary.hpp
@@ -58,7 +58,7 @@ namespace CreatureLib::Library {
         [[nodiscard]] inline borrowed_ptr<const T> Get(const Arbutils::CaseInsensitiveConstString& name) const {
             return _values.Get(name.GetHash());
         }
-        [[nodiscard]] inline borrowed_ptr<const T> Get(uint32_t hashedKey) { return _values.Get(hashedKey); }
+        [[nodiscard]] inline borrowed_ptr<const T> Get(uint32_t hashedKey) const { return _values.Get(hashedKey); }
 
         [[nodiscard]] inline borrowed_ptr<const T> operator[](const Arbutils::CaseInsensitiveConstString& name) const {
             return Get(name);
diff --git a/src/Library/DataLibrary.hpp b/src/Library/DataLibrary.hpp
index 4fb7aa6..646fccd 100644
--- a/src/Library/DataLibrary.hpp
+++ b/src/Library/DataLibrary.hpp
@@ -14,12 +14,12 @@ namespace CreatureLib::Library {
  */
     class DataLibrary {
     private:
-        const std::unique_ptr<LibrarySettings> _settings;
-        const std::unique_ptr<SpeciesLibrary> _species;
-        const std::unique_ptr<AttackLibrary> _attacks;
-        const std::unique_ptr<ItemLibrary> _items;
-        const std::unique_ptr<GrowthRateLibrary> _growthRates;
-        const std::unique_ptr<TypeLibrary> _typeLibrary;
+        std::unique_ptr<const LibrarySettings> _settings;
+        std::unique_ptr<const SpeciesLibrary> _species;
+        std::unique_ptr<const AttackLibrary> _attacks;
+        std::unique_ptr<const ItemLibrary> _items;
+        std::unique_ptr<const GrowthRateLibrary> _growthRates;
+        std::unique_ptr<const TypeLibrary> _typeLibrary;
 
     public:
         DataLibrary(LibrarySettings* settings, CreatureLib::Library::SpeciesLibrary* species,
@@ -28,12 +28,16 @@ namespace CreatureLib::Library {
 
         virtual ~DataLibrary() {}
 
-        [[nodiscard]] const std::unique_ptr<LibrarySettings>& GetSettings() const noexcept { return _settings; }
-        [[nodiscard]] const std::unique_ptr<SpeciesLibrary>& GetSpeciesLibrary() const noexcept { return _species; }
-        [[nodiscard]] const std::unique_ptr<AttackLibrary>& GetAttackLibrary() const noexcept { return _attacks; }
-        [[nodiscard]] const std::unique_ptr<ItemLibrary>& GetItemLibrary() const noexcept { return _items; }
-        [[nodiscard]] const std::unique_ptr<GrowthRateLibrary>& GetGrowthRates() const noexcept { return _growthRates; }
-        [[nodiscard]] const std::unique_ptr<TypeLibrary>& GetTypeLibrary() const noexcept { return _typeLibrary; }
+        [[nodiscard]] const std::unique_ptr<const LibrarySettings>& GetSettings() const noexcept { return _settings; }
+        [[nodiscard]] const std::unique_ptr<const SpeciesLibrary>& GetSpeciesLibrary() const noexcept {
+            return _species;
+        }
+        [[nodiscard]] const std::unique_ptr<const AttackLibrary>& GetAttackLibrary() const noexcept { return _attacks; }
+        [[nodiscard]] const std::unique_ptr<const ItemLibrary>& GetItemLibrary() const noexcept { return _items; }
+        [[nodiscard]] const std::unique_ptr<const GrowthRateLibrary>& GetGrowthRates() const noexcept {
+            return _growthRates;
+        }
+        [[nodiscard]] const std::unique_ptr<const TypeLibrary>& GetTypeLibrary() const noexcept { return _typeLibrary; }
     };
 }