From f61df0b33ea2a2de064f1fa2a9cde191b790a5ba Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Mon, 19 May 2025 16:28:02 +0200
Subject: lib: rescope enums

---
 lib/src/turns-participant.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'lib/src/turns-participant.cpp')

diff --git a/lib/src/turns-participant.cpp b/lib/src/turns-participant.cpp
index 49f29ff..1e03c8b 100644
--- a/lib/src/turns-participant.cpp
+++ b/lib/src/turns-participant.cpp
@@ -1,6 +1,5 @@
 #include "turns-participant.h"
 
-#include "turns-disposition.h"
 #include "turns-enums.h"
 
 #include <glib-object.h>
@@ -19,7 +18,7 @@ struct _TurnsParticipant
 
   gboolean active;
   gboolean defeated;
-  TurnsDisposition disposition;
+  TurnsParticipantDisposition disposition;
   gchar * name;
   gfloat priority;
 };
@@ -87,7 +86,7 @@ namespace
     case property::Priority:
       return turns_participant_set_priority(participant, g_value_get_float(value));
     case property::Disposition:
-      return turns_participant_set_disposition(participant, static_cast<TurnsDisposition>(g_value_get_enum(value)));
+      return turns_participant_set_disposition(participant, static_cast<TurnsParticipantDisposition>(g_value_get_enum(value)));
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID(self, id, specification);
     }
@@ -140,8 +139,8 @@ static void turns_participant_class_init(TurnsParticipantClass * klass)
       g_param_spec_enum("disposition",
                         "Disposition",
                         "Disposition of the participant toward the players",
-                        turns_disposition_get_type(),
-                        TURNS_DISPOSITION_NEUTRAL,
+                        turns_participant_disposition_get_type(),
+                        TURNS_PARTICIPANT_DISPOSITION_NEUTRAL,
                         static_cast<GParamFlags>(G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY));
 
   g_object_class_install_properties(object_class, static_cast<guint>(property::N_PROPERTIES), properties.data());
@@ -157,7 +156,7 @@ TurnsParticipant * turns_participant_new()
   return static_cast<TurnsParticipant *>(g_object_new(TURNS_TYPE_PARTICIPANT, nullptr));
 }
 
-TurnsParticipant * turns_participant_new_with(gchar const * name, gfloat priority, TurnsDisposition disposition)
+TurnsParticipant * turns_participant_new_with(gchar const * name, gfloat priority, TurnsParticipantDisposition disposition)
 {
   g_return_val_if_fail(name != nullptr, nullptr);
 
@@ -177,9 +176,9 @@ gboolean turns_participant_get_defeated(TurnsParticipant const * self)
   return self->defeated;
 }
 
-TurnsDisposition turns_participant_get_disposition(TurnsParticipant const * self)
+TurnsParticipantDisposition turns_participant_get_disposition(TurnsParticipant const * self)
 {
-  g_return_val_if_fail(TURNS_IS_PARTICIPANT(const_cast<TurnsParticipant *>(self)), TurnsDisposition::TURNS_DISPOSITION_NEUTRAL);
+  g_return_val_if_fail(TURNS_IS_PARTICIPANT(const_cast<TurnsParticipant *>(self)), TurnsParticipantDisposition::TURNS_PARTICIPANT_DISPOSITION_NEUTRAL);
   return self->disposition;
 }
 
@@ -221,7 +220,7 @@ void turns_participant_set_defeated(TurnsParticipant * self, gboolean value)
   g_object_notify_by_pspec(G_OBJECT(self), properties[static_cast<std::size_t>(property::Defeated)]);
 }
 
-void turns_participant_set_disposition(TurnsParticipant * self, TurnsDisposition value)
+void turns_participant_set_disposition(TurnsParticipant * self, TurnsParticipantDisposition value)
 {
   g_return_if_fail(TURNS_IS_PARTICIPANT(self));
 
-- 
cgit v1.2.3