core: uppercase Disposition values

8 files changed, 29 insertions, 29 deletions

diff --git a/core/include/turns/core/disposition.hpp b/core/include/turns/core/disposition.hpp
index 89a2cb0..cd00836 100644
--- a/core/include/turns/core/disposition.hpp
+++ b/core/include/turns/core/disposition.hpp
@@ -12,10 +12,10 @@ namespace turns::core
 {
   enum struct Disposition : std::uint8_t
   {
-    neutral,
-    friendly,
-    hostile,
-    secret,
+    Neutral,
+    Friendly,
+    Hostile,
+    Secret,
 
     ///! End marker
     END
diff --git a/core/include/turns/core/participant.hpp b/core/include/turns/core/participant.hpp
index 0edc421..e6d9008 100644
--- a/core/include/turns/core/participant.hpp
+++ b/core/include/turns/core/participant.hpp
@@ -45,7 +45,7 @@ namespace turns::core
     auto serialize() -> nlohmann::json;
 
   private:
-    Glib::Property<core::Disposition> m_disposition{*this, "disposition", core::Disposition::neutral};
+    Glib::Property<core::Disposition> m_disposition{*this, "disposition", core::Disposition::Neutral};
     Glib::Property<bool> m_is_active{*this, "is-active", false};
     Glib::Property<bool> m_is_defeated{*this, "is-defeated", false};
     Glib::Property<Glib::ustring> m_name{*this, "name", ""};
diff --git a/core/src/disposition.cpp b/core/src/disposition.cpp
index 4a1a496..894baed 100644
--- a/core/src/disposition.cpp
+++ b/core/src/disposition.cpp
@@ -15,13 +15,13 @@ namespace turns::core
   {
     switch (value)
     {
-    case Disposition::neutral:
+    case Disposition::Neutral:
       return _("Neutral");
-    case Disposition::friendly:
+    case Disposition::Friendly:
       return _("Friendly");
-    case Disposition::hostile:
+    case Disposition::Hostile:
       return _("Hostile");
-    case Disposition::secret:
+    case Disposition::Secret:
       return _("Secret");
     default:
       return _("Unknown disposition value");
@@ -36,10 +36,10 @@ namespace Glib
   {
     auto static is_initialized = std::atomic_flag{false};
     auto static const values = std::array{
-        GEnumValue{static_cast<int>(turns::core::Disposition::neutral),  "TURNS_DISPOSITION_NEUTRAL",  "neutral" },
-        GEnumValue{static_cast<int>(turns::core::Disposition::friendly), "TURNS_DISPOSITION_FRIENDLY", "friendly"},
-        GEnumValue{static_cast<int>(turns::core::Disposition::hostile),  "TURNS_DISPOSITION_HOSTILE",  "hostile" },
-        GEnumValue{static_cast<int>(turns::core::Disposition::secret),   "TURNS_DISPOSITION_SECRET",   "secret"  },
+        GEnumValue{static_cast<int>(turns::core::Disposition::Neutral),  "TURNS_DISPOSITION_NEUTRAL",  "neutral" },
+        GEnumValue{static_cast<int>(turns::core::Disposition::Friendly), "TURNS_DISPOSITION_FRIENDLY", "friendly"},
+        GEnumValue{static_cast<int>(turns::core::Disposition::Hostile),  "TURNS_DISPOSITION_HOSTILE",  "hostile" },
+        GEnumValue{static_cast<int>(turns::core::Disposition::Secret),   "TURNS_DISPOSITION_SECRET",   "secret"  },
         GEnumValue{0,                                                    nullptr,                      nullptr   },
     };
     if (!is_initialized.test_and_set())
diff --git a/core/src/participant.cpp b/core/src/participant.cpp
index 242b1b2..ff2c2fb 100644
--- a/core/src/participant.cpp
+++ b/core/src/participant.cpp
@@ -22,7 +22,7 @@ namespace turns::core
 
   auto Participant::create(nlohmann::json const & serialized) -> Glib::RefPtr<Participant>
   {
-    auto disposition = serialized.value("disposition", Disposition::neutral);
+    auto disposition = serialized.value("disposition", Disposition::Neutral);
     auto priority = serialized.value("priority", 0.0f);
     auto name = serialized.value("name", std::string{});
 
diff --git a/core/tests/disposition.cpp b/core/tests/disposition.cpp
index dfab1f7..fadf476 100644
--- a/core/tests/disposition.cpp
+++ b/core/tests/disposition.cpp
@@ -16,10 +16,10 @@ namespace turns::core::tests
 
   TEST_CASE("to_presentation_name returns the correct string for the current language", "[disposition]")
   {
-    auto [value, name] = GENERATE(std::pair{Disposition::neutral, Glib::ustring{_("Neutral")}},
-                                  std::pair{Disposition::friendly, Glib::ustring{_("Friendly")}},
-                                  std::pair{Disposition::hostile, Glib::ustring{_("Hostile")}},
-                                  std::pair{Disposition::secret, Glib::ustring{_("Secret")}},
+    auto [value, name] = GENERATE(std::pair{Disposition::Neutral, Glib::ustring{_("Neutral")}},
+                                  std::pair{Disposition::Friendly, Glib::ustring{_("Friendly")}},
+                                  std::pair{Disposition::Hostile, Glib::ustring{_("Hostile")}},
+                                  std::pair{Disposition::Secret, Glib::ustring{_("Secret")}},
                                   std::pair{static_cast<Disposition>(std::numeric_limits<std::underlying_type_t<Disposition>>::max()),
                                             Glib::ustring{_("Unknown disposition value")}});
 
diff --git a/core/tests/participant.cpp b/core/tests/participant.cpp
index b3ae5e9..b417e36 100644
--- a/core/tests/participant.cpp
+++ b/core/tests/participant.cpp
@@ -16,7 +16,7 @@ namespace turns::core::tests
   {
     auto constexpr name = "Participant #1";
     auto constexpr priority = 17;
-    auto constexpr disposition = Disposition::friendly;
+    auto constexpr disposition = Disposition::Friendly;
 
     auto json = nlohmann::json::parse(R"(
     {
@@ -33,7 +33,7 @@ namespace turns::core::tests
       auto instance = Participant{};
       REQUIRE(instance.property_name() == "");
       REQUIRE(instance.property_priority() == 0);
-      REQUIRE(instance.property_disposition() == Disposition::neutral);
+      REQUIRE(instance.property_disposition() == Disposition::Neutral);
       REQUIRE(!instance.property_is_active());
       REQUIRE(!instance.property_is_defeated());
     }
@@ -73,7 +73,7 @@ namespace turns::core::tests
   {
     auto constexpr name = "Participant #2";
     auto constexpr priority = 10;
-    auto constexpr disposition = Disposition::hostile;
+    auto constexpr disposition = Disposition::Hostile;
 
     auto instance = Participant{name, priority, disposition};
 
@@ -152,7 +152,7 @@ namespace turns::core::tests
   {
     auto constexpr constructed_name = "Vana Thistletop";
     auto constexpr constructed_priority = 17;
-    auto constexpr constructed_disposition = Disposition::friendly;
+    auto constexpr constructed_disposition = Disposition::Friendly;
     auto instance = Participant{constructed_name, constructed_priority, constructed_disposition};
 
     SECTION("can be created")
@@ -175,8 +175,8 @@ namespace turns::core::tests
 
       SECTION("allowing to set it")
       {
-        instance.property_disposition() = Disposition::hostile;
-        REQUIRE(instance.property_disposition() == Disposition::hostile);
+        instance.property_disposition() = Disposition::Hostile;
+        REQUIRE(instance.property_disposition() == Disposition::Hostile);
       }
     }
 
@@ -250,7 +250,7 @@ namespace turns::core::tests
 
   TEST_CASE("Serializing a participant")
   {
-    auto instance = Participant::create("Participant #0", 17.2, Disposition::friendly);
+    auto instance = Participant::create("Participant #0", 17.2, Disposition::Friendly);
     auto serialized = instance->serialize();
 
     SECTION("the active state is serialized correctly")
@@ -260,7 +260,7 @@ namespace turns::core::tests
 
     SECTION("the disposition is serialized correctly")
     {
-      REQUIRE(serialized.at("disposition") == Disposition::friendly);
+      REQUIRE(serialized.at("disposition") == Disposition::Friendly);
     }
 
     SECTION("the name is serialized correctly")
@@ -293,7 +293,7 @@ namespace turns::core::tests
 
     SECTION("the disposition is de-serialized correctly")
     {
-      REQUIRE(instance->property_disposition() == Disposition::hostile);
+      REQUIRE(instance->property_disposition() == Disposition::Hostile);
     }
 
     SECTION("the name is de-serialized correctly")
diff --git a/core/tests/turn_order.cpp b/core/tests/turn_order.cpp
index a7af8d0..ceed924 100644
--- a/core/tests/turn_order.cpp
+++ b/core/tests/turn_order.cpp
@@ -61,7 +61,7 @@ namespace turns::core::tests
 
     GIVEN("a participant has been added to a turn_order")
     {
-      instance->add("Participant #0", 0, Disposition::neutral);
+      instance->add("Participant #0", 0, Disposition::Neutral);
 
       THEN("get_n_items() returns 1")
       {
diff --git a/core/tests/turn_order_bugs.cpp b/core/tests/turn_order_bugs.cpp
index 2e8937c..a79e9b4 100644
--- a/core/tests/turn_order_bugs.cpp
+++ b/core/tests/turn_order_bugs.cpp
@@ -19,7 +19,7 @@ namespace turns::core::tests
     {
       auto instance = turn_order::create();
 
-      instance->add("A", 0, Disposition::neutral);
+      instance->add("A", 0, Disposition::Neutral);
 
       WHEN("it is started and then stepped forward, backward, forward")
       {