lib: rescope enums

4 files changed, 24 insertions, 31 deletions

diff --git a/lib/tests/turns-participant.cpp b/lib/tests/turns-participant.cpp
index 1211e4b..f8ca2b3 100644
--- a/lib/tests/turns-participant.cpp
+++ b/lib/tests/turns-participant.cpp
@@ -1,7 +1,5 @@
 #include "turns-participant.h"
 
-#include "turns-disposition.h"
-
 #include <catch2/catch_approx.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
@@ -39,7 +37,7 @@ SCENARIO("Creating a participant", "[lib][object][lifetime]")
 
     THEN("it's disposition is neutral")
     {
-      REQUIRE(turns_participant_get_disposition(instance) == TURNS_DISPOSITION_NEUTRAL);
+      REQUIRE(turns_participant_get_disposition(instance) == TURNS_PARTICIPANT_DISPOSITION_NEUTRAL);
     }
 
     THEN("it's active state is false")
@@ -57,7 +55,7 @@ SCENARIO("Creating a participant", "[lib][object][lifetime]")
   {
     auto name = "Test Participant";
     auto priority = 12.4f;
-    auto disposition = TURNS_DISPOSITION_FRIENDLY;
+    auto disposition = TURNS_PARTICIPANT_DISPOSITION_FRIENDLY;
     g_autoptr(TurnsParticipant) instance = turns_participant_new_with(name, priority, disposition);
 
     THEN("it's name is set")
@@ -88,7 +86,7 @@ SCENARIO("Creating a participant", "[lib][object][lifetime]")
 
   GIVEN("A participant is constructed using turns_participant_new_with(nullptr, ...)")
   {
-    auto instance = turns_participant_new_with(nullptr, 10.0f, TURNS_DISPOSITION_HOSTILE);
+    auto instance = turns_participant_new_with(nullptr, 10.0f, TURNS_PARTICIPANT_DISPOSITION_HOSTILE);
 
     THEN("the instance is NULL")
     {
@@ -137,7 +135,7 @@ SCENARIO("Modifying a participant", "[lib][object][data]")
 
     WHEN("a new disposition is set")
     {
-      auto new_value = GENERATE(TURNS_DISPOSITION_FRIENDLY, TURNS_DISPOSITION_HOSTILE, TURNS_DISPOSITION_SECRET);
+      auto new_value = GENERATE(TURNS_PARTICIPANT_DISPOSITION_FRIENDLY, TURNS_PARTICIPANT_DISPOSITION_HOSTILE, TURNS_PARTICIPANT_DISPOSITION_SECRET);
 
       CHECK_FALSE(turns_participant_get_disposition(instance) == new_value);
       turns_participant_set_disposition(instance, new_value);
@@ -297,7 +295,7 @@ SCENARIO("Modifying a participant", "[lib][object][data]")
 
       WHEN("a new disposition is set using set_disposition")
       {
-        auto new_value = TURNS_DISPOSITION_HOSTILE;
+        auto new_value = TURNS_PARTICIPANT_DISPOSITION_HOSTILE;
 
         CHECK_FALSE(turns_participant_get_disposition(instance) == new_value);
         turns_participant_set_disposition(instance, new_value);
@@ -323,7 +321,7 @@ SCENARIO("Modifying a participant", "[lib][object][data]")
 
       WHEN("a new disposition is set using g_object_set")
       {
-        auto new_value = TURNS_DISPOSITION_HOSTILE;
+        auto new_value = TURNS_PARTICIPANT_DISPOSITION_HOSTILE;
 
         CHECK_FALSE(turns_participant_get_disposition(instance) == new_value);
         g_object_set(G_OBJECT(instance), "disposition", new_value, nullptr);
@@ -472,7 +470,7 @@ SCENARIO("Reading a participant", "[lib][object][data]")
   {
     auto name = "Test Participant";
     auto priority = 75.f;
-    auto disposition = TURNS_DISPOSITION_FRIENDLY;
+    auto disposition = TURNS_PARTICIPANT_DISPOSITION_FRIENDLY;
 
     g_autoptr(TurnsParticipant) instance = turns_participant_new_with(name, priority, disposition);
 
diff --git a/lib/tests/turns-turn-order.cpp b/lib/tests/turns-turn-order.cpp
index d0224ce..92427c1 100644
--- a/lib/tests/turns-turn-order.cpp
+++ b/lib/tests/turns-turn-order.cpp
@@ -7,7 +7,6 @@
 #include <gio/gio.h>
 #include <glib-object.h>
 #include <glibconfig.h>
-#include <turns-disposition.h>
 
 SCENARIO("Creating a turn order", "[lib][object][lifetime]")
 {
@@ -57,7 +56,7 @@ SCENARIO("Modifying a turn order", "[lib][object][data]")
 
     WHEN("a participant is added")
     {
-      g_autoptr(TurnsParticipant) participant = turns_participant_new_with("Test Participant", 10.0f, TURNS_DISPOSITION_FRIENDLY);
+      g_autoptr(TurnsParticipant) participant = turns_participant_new_with("Test Participant", 10.0f, TURNS_PARTICIPANT_DISPOSITION_FRIENDLY);
       turns_turn_order_add(instance, participant);
 
       THEN("its participant count is 1")
@@ -92,8 +91,8 @@ SCENARIO("Sorting a turn order")
   GIVEN("A turn order with two participants - A/10/H and B/20/N")
   {
     g_autoptr(TurnsTurnOrder) instance = turns_turn_order_new();
-    g_autoptr(TurnsParticipant) participant_a = turns_participant_new_with("A", 10, TURNS_DISPOSITION_HOSTILE);
-    g_autoptr(TurnsParticipant) participant_b = turns_participant_new_with("B", 20, TURNS_DISPOSITION_NEUTRAL);
+    g_autoptr(TurnsParticipant) participant_a = turns_participant_new_with("A", 10, TURNS_PARTICIPANT_DISPOSITION_HOSTILE);
+    g_autoptr(TurnsParticipant) participant_b = turns_participant_new_with("B", 20, TURNS_PARTICIPANT_DISPOSITION_NEUTRAL);
 
     turns_turn_order_add(instance, participant_a);
     turns_turn_order_add(instance, participant_b);
diff --git a/lib/tests/turnsmm/participant.cpp b/lib/tests/turnsmm/participant.cpp
index 6f02644..bcfa99c 100644
--- a/lib/tests/turnsmm/participant.cpp
+++ b/lib/tests/turnsmm/participant.cpp
@@ -1,7 +1,5 @@
 #include "turnsmm/participant.hpp"
 
-#include "turnsmm/enums.hpp"
-
 #include <catch2/catch_approx.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
@@ -29,7 +27,7 @@ SCENARIO("Creating a participant", "[lib][object][lifetime]")
 
     THEN("it's disposition is neutral")
     {
-      REQUIRE(instance.get_disposition() == Turns::Disposition::Neutral);
+      REQUIRE(instance.get_disposition() == Turns::Participant::Disposition::Neutral);
     }
 
     THEN("it's active state is false")
@@ -47,7 +45,7 @@ SCENARIO("Creating a participant", "[lib][object][lifetime]")
   {
     auto name = "Test Participant";
     auto priority = 12.4f;
-    auto disposition = Turns::Disposition::Friendly;
+    auto disposition = Turns::Participant::Disposition::Friendly;
     auto instance = Turns::Participant{name, priority, disposition};
 
     THEN("it's name is set")
@@ -92,7 +90,7 @@ SCENARIO("Creating a participant", "[lib][object][lifetime]")
 
     THEN("it's disposition is neutral")
     {
-      REQUIRE(instance->get_disposition() == Turns::Disposition::Neutral);
+      REQUIRE(instance->get_disposition() == Turns::Participant::Disposition::Neutral);
     }
 
     THEN("it's active state is false")
@@ -110,7 +108,7 @@ SCENARIO("Creating a participant", "[lib][object][lifetime]")
   {
     auto name = "Test Participant";
     auto priority = 12.4f;
-    auto disposition = Turns::Disposition::Friendly;
+    auto disposition = Turns::Participant::Disposition::Friendly;
     auto instance = Turns::Participant::create(name, priority, disposition);
 
     THEN("it's name is set")
@@ -180,7 +178,7 @@ SCENARIO("Modifying a participant", "[lib][object][data]")
 
     WHEN("a new disposition is set")
     {
-      auto new_value = GENERATE(Turns::Disposition::Friendly, Turns::Disposition::Hostile, Turns::Disposition::Secret);
+      auto new_value = GENERATE(Turns::Participant::Disposition::Friendly, Turns::Participant::Disposition::Hostile, Turns::Participant::Disposition::Secret);
 
       CHECK_FALSE(instance.get_disposition() == new_value);
       instance.set_disposition(new_value);
@@ -340,7 +338,7 @@ SCENARIO("Modifying a participant", "[lib][object][data]")
 
       WHEN("a new disposition is set using set_disposition")
       {
-        auto new_value = Turns::Disposition::Hostile;
+        auto new_value = Turns::Participant::Disposition::Hostile;
 
         CHECK_FALSE(instance.get_disposition() == new_value);
         instance.set_disposition(new_value);
@@ -366,7 +364,7 @@ SCENARIO("Modifying a participant", "[lib][object][data]")
 
       WHEN("a new disposition is set using Glib::Object::set_property")
       {
-        auto new_value = Turns::Disposition::Secret;
+        auto new_value = Turns::Participant::Disposition::Secret;
 
         CHECK_FALSE(instance.get_disposition() == new_value);
         instance.set_property("disposition", new_value);
diff --git a/lib/tests/turnsmm/turn-order.cpp b/lib/tests/turnsmm/turn-order.cpp
index fcb7727..ac3eb77 100644
--- a/lib/tests/turnsmm/turn-order.cpp
+++ b/lib/tests/turnsmm/turn-order.cpp
@@ -4,8 +4,6 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <turnsmm/enums.hpp>
-
 #include <cstddef>
 #include <tuple>
 
@@ -45,7 +43,7 @@ SCENARIO("Creating a turn order", "[lib][object][lifetime]")
 
     THEN("its sort mode is descending")
     {
-      REQUIRE(instance.get_sort_mode() == Turns::SortMode::Descending);
+      REQUIRE(instance.get_sort_mode() == Turns::TurnOrder::SortMode::Descending);
     }
   }
 }
@@ -59,7 +57,7 @@ SCENARIO("Modifying a turn order", "[lib][object][data]")
 
     WHEN("a participant is added")
     {
-      auto participant = Turns::Participant::create("Test Participant", 10.0f, Turns::Disposition::Friendly);
+      auto participant = Turns::Participant::create("Test Participant", 10.0f, Turns::Participant::Disposition::Friendly);
       instance.add(participant);
 
       THEN("its participant count is 1")
@@ -87,7 +85,7 @@ SCENARIO("Modifying a turn order", "[lib][object][data]")
 
       THEN("its sort mode is descending")
       {
-        REQUIRE(instance.get_sort_mode() == Turns::SortMode::Descending);
+        REQUIRE(instance.get_sort_mode() == Turns::TurnOrder::SortMode::Descending);
       }
     }
   }
@@ -98,8 +96,8 @@ SCENARIO("Sorting a turn order")
   GIVEN("A turn order with two participants - A/10/H and B/20/N")
   {
     auto instance = Turns::TurnOrder{};
-    auto participant_a = Turns::Participant::create("A", 10, Turns::Disposition::Hostile);
-    auto participant_b = Turns::Participant::create("B", 20, Turns::Disposition::Neutral);
+    auto participant_a = Turns::Participant::create("A", 10, Turns::Participant::Disposition::Hostile);
+    auto participant_b = Turns::Participant::create("B", 20, Turns::Participant::Disposition::Neutral);
 
     instance.add(participant_a);
     instance.add(participant_b);
@@ -157,7 +155,7 @@ SCENARIO("Sorting a turn order")
 
     WHEN("the sort mode is changed to ascending")
     {
-      instance.set_sort_mode(Turns::SortMode::Ascending);
+      instance.set_sort_mode(Turns::TurnOrder::SortMode::Ascending);
 
       THEN("A is the first and B the second element")
       {
@@ -180,7 +178,7 @@ SCENARIO("Sorting a turn order")
 
       AND_WHEN("the sort mode is changed to ascending")
       {
-        instance.set_sort_mode(Turns::SortMode::Ascending);
+        instance.set_sort_mode(Turns::TurnOrder::SortMode::Ascending);
 
         THEN("the signal is notified")
         {