summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorFelix Morgner <felix.morgner@gmail.com>2025-04-30 11:01:48 +0200
committerFelix Morgner <felix.morgner@gmail.com>2025-04-30 11:01:48 +0200
commit3e68879c7901384913c03bd587b248a3fd79d9ff (patch)
tree3aa3395d6c84b064c60ad19f5d274a5d2bd575d4 /core/src
parentf729c62bf23061e33a362ef1322d8fed8ae632b1 (diff)
downloadturns-3e68879c7901384913c03bd587b248a3fd79d9ff.tar.xz
turns-3e68879c7901384913c03bd587b248a3fd79d9ff.zip
core: rename participant to Participant
Diffstat (limited to 'core/src')
-rw-r--r--core/src/init.cpp2
-rw-r--r--core/src/participant.cpp19
-rw-r--r--core/src/turn_order.cpp6
3 files changed, 13 insertions, 14 deletions
diff --git a/core/src/init.cpp b/core/src/init.cpp
index 258aceb..3991248 100644
--- a/core/src/init.cpp
+++ b/core/src/init.cpp
@@ -8,7 +8,7 @@ namespace turns::core
auto register_types() -> void
{
- static_cast<void>(participant{});
+ static_cast<void>(Participant{});
static_cast<void>(turn_order{});
}
diff --git a/core/src/participant.cpp b/core/src/participant.cpp
index 9b0ec51..d4b3835 100644
--- a/core/src/participant.cpp
+++ b/core/src/participant.cpp
@@ -12,16 +12,15 @@
#include <compare>
#include <string>
-#include <typeinfo>
namespace turns::core
{
- auto participant::create(Glib::ustring name, float priority, core::disposition disposition) -> Glib::RefPtr<participant>
+ auto Participant::create(Glib::ustring name, float priority, core::disposition disposition) -> Glib::RefPtr<Participant>
{
- return Glib::make_refptr_for_instance(new participant{name, priority, disposition});
+ return Glib::make_refptr_for_instance(new Participant{name, priority, disposition});
}
- auto participant::create(nlohmann::json const & serialized) -> Glib::RefPtr<participant>
+ auto Participant::create(nlohmann::json const & serialized) -> Glib::RefPtr<Participant>
{
auto disposition = serialized.value("disposition", disposition::neutral);
auto priority = serialized.value("priority", 0.0f);
@@ -35,26 +34,26 @@ namespace turns::core
return instance;
}
- participant::participant()
- : Glib::ObjectBase{typeid(participant)}
+ Participant::Participant()
+ : Glib::ObjectBase{"TurnsParticipant"}
, Glib::Object{}
{
}
- participant::participant(Glib::ustring name, float priority, core::disposition disposition)
- : participant()
+ Participant::Participant(Glib::ustring name, float priority, core::disposition disposition)
+ : Participant()
{
m_name = name;
m_priority = priority;
m_disposition = disposition;
}
- auto participant::operator<=>(participant const & other) const noexcept -> std::partial_ordering
+ auto Participant::operator<=>(Participant const & other) const noexcept -> std::partial_ordering
{
return m_priority <=> other.m_priority;
}
- auto participant::serialize() -> nlohmann::json
+ auto Participant::serialize() -> nlohmann::json
{
return nlohmann::json{
{"disposition", m_disposition},
diff --git a/core/src/turn_order.cpp b/core/src/turn_order.cpp
index d43ac7f..ef7bde6 100644
--- a/core/src/turn_order.cpp
+++ b/core/src/turn_order.cpp
@@ -102,7 +102,7 @@ namespace turns::core
auto turn_order::add(Glib::ustring const & name, float priority, disposition disposition) -> void
{
- auto entry = participant::create(name, priority, disposition);
+ auto entry = Participant::create(name, priority, disposition);
entry->property_priority().signal_changed().connect(sigc::bind(sigc::mem_fun(*this, &turn_order::handle_priority_changed), entry));
auto position = std::distance(m_data.cbegin(), insert(entry));
items_changed(position, 0, 1);
@@ -220,7 +220,7 @@ namespace turns::core
m_data.clear();
auto participants = from.value("participants", std::vector<nlohmann::json>{});
auto factory = [](auto s) {
- return participant::create(s);
+ return Participant::create(s);
};
auto inserter = std::bind(&turn_order::insert, this, _1);
std::ranges::for_each(participants | std::views::transform(factory), inserter);
@@ -256,7 +256,7 @@ namespace turns::core
auto turn_order::get_item_type_vfunc() -> GType
{
- return participant::get_type();
+ return Participant::get_type();
}
auto turn_order::get_n_items_vfunc() -> unsigned