summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/include/turns/ui/participant_editor.hpp6
-rw-r--r--ui/src/participant_editor.cpp14
-rw-r--r--ui/src/participant_row.cpp8
-rw-r--r--ui/tests/participant_editor.cpp12
-rw-r--r--ui/tests/participant_row.cpp2
5 files changed, 21 insertions, 21 deletions
diff --git a/ui/include/turns/ui/participant_editor.hpp b/ui/include/turns/ui/participant_editor.hpp
index 4e6bdf4..0fbc504 100644
--- a/ui/include/turns/ui/participant_editor.hpp
+++ b/ui/include/turns/ui/participant_editor.hpp
@@ -32,7 +32,7 @@ namespace turns::ui
struct ParticipantEditor : template_widget<ParticipantEditor, Adwaita::Dialog>
{
- using SignalFinishedType = sigc::signal<void(Glib::ustring, float, core::disposition)>;
+ using SignalFinishedType = sigc::signal<void(Glib::ustring, float, core::Disposition)>;
auto constexpr inline static children = std::array{
"disposition",
@@ -43,12 +43,12 @@ namespace turns::ui
explicit ParticipantEditor(Glib::RefPtr<core::Participant> participant);
- [[nodiscard]] auto get_disposition() const -> core::disposition;
+ [[nodiscard]] auto get_disposition() const -> core::Disposition;
[[nodiscard]] auto get_name() const -> Glib::ustring;
[[nodiscard]] auto get_participant() const -> Glib::RefPtr<core::Participant>;
[[nodiscard]] auto get_priority() const -> double;
- auto set_disposition(core::disposition value) -> void;
+ auto set_disposition(core::Disposition value) -> void;
auto set_name(Glib::ustring const & value) -> void;
auto set_participant(Glib::RefPtr<core::Participant> const & value) -> void;
auto set_priority(double value) -> void;
diff --git a/ui/src/participant_editor.cpp b/ui/src/participant_editor.cpp
index 09feb7e..8c83559 100644
--- a/ui/src/participant_editor.cpp
+++ b/ui/src/participant_editor.cpp
@@ -51,9 +51,9 @@ namespace turns::ui
{
m_finish->signal_clicked().connect(sigc::mem_fun(*this, &ParticipantEditor::handle_finish_clicked));
- for (auto n : std::views::iota(std::uint8_t{}, static_cast<std::uint8_t>(core::disposition::END)))
+ for (auto n : std::views::iota(std::uint8_t{}, static_cast<std::uint8_t>(core::Disposition::END)))
{
- m_disposition_model->append(presentation_name_for(core::disposition{n}));
+ m_disposition_model->append(presentation_name_for(core::Disposition{n}));
}
m_disposition_factory->signal_bind().connect(sigc::mem_fun(*this, &ParticipantEditor::handle_item_bind));
@@ -67,9 +67,9 @@ namespace turns::ui
set_participant(participant);
}
- auto ParticipantEditor::get_disposition() const -> core::disposition
+ auto ParticipantEditor::get_disposition() const -> core::Disposition
{
- return static_cast<core::disposition>(m_disposition->get_selected());
+ return static_cast<core::Disposition>(m_disposition->get_selected());
}
auto ParticipantEditor::get_name() const -> Glib::ustring
@@ -87,7 +87,7 @@ namespace turns::ui
return m_priority->get_value();
}
- auto ParticipantEditor::set_disposition(core::disposition value) -> void
+ auto ParticipantEditor::set_disposition(core::Disposition value) -> void
{
m_disposition->set_selected(static_cast<unsigned>(value));
}
@@ -124,7 +124,7 @@ namespace turns::ui
auto ParticipantEditor::handle_finish_clicked() -> void
{
- m_signal_finished.emit(m_name->get_text(), m_priority->get_value(), static_cast<core::disposition>(m_disposition->get_selected()));
+ m_signal_finished.emit(m_name->get_text(), m_priority->get_value(), static_cast<core::Disposition>(m_disposition->get_selected()));
close();
}
@@ -155,7 +155,7 @@ namespace turns::ui
m_disposition->property_selected(),
Glib::Binding::Flags::BIDIRECTIONAL | Glib::Binding::Flags::SYNC_CREATE,
[](auto value) { return static_cast<unsigned>(value); },
- [](auto value) { return static_cast<core::disposition>(value); });
+ [](auto value) { return static_cast<core::Disposition>(value); });
}
}
diff --git a/ui/src/participant_row.cpp b/ui/src/participant_row.cpp
index 782182d..3fc5739 100644
--- a/ui/src/participant_row.cpp
+++ b/ui/src/participant_row.cpp
@@ -31,15 +31,15 @@ namespace turns::ui
auto constexpr static TYPE_NAME = "ParticipantRow";
auto constexpr static TEMPLATE = "/ch/arknet/Turns/participant_row.ui";
- auto css_class_for(core::disposition value) -> Glib::ustring
+ auto css_class_for(core::Disposition value) -> Glib::ustring
{
switch (value)
{
- case core::disposition::friendly:
+ case core::Disposition::friendly:
return "disposition-friendly";
- case core::disposition::hostile:
+ case core::Disposition::hostile:
return "disposition-hostile";
- case core::disposition::secret:
+ case core::Disposition::secret:
return "disposition-secret";
default:
return "";
diff --git a/ui/tests/participant_editor.cpp b/ui/tests/participant_editor.cpp
index b2398de..a9ceb44 100644
--- a/ui/tests/participant_editor.cpp
+++ b/ui/tests/participant_editor.cpp
@@ -31,7 +31,7 @@ namespace turns::ui::tests
auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8");
setlocale(LC_ALL, locale);
- auto participant = core::Participant::create("Frederick Thumblewackle", 7.2, core::disposition::friendly);
+ auto participant = core::Participant::create("Frederick Thumblewackle", 7.2, core::Disposition::friendly);
auto instance = std::make_shared<ParticipantEditor>(nullptr);
auto window = Gtk::Window{};
@@ -62,7 +62,7 @@ namespace turns::ui::tests
SECTION("has neutral disposition")
{
- REQUIRE(instance->get_disposition() == core::disposition::neutral);
+ REQUIRE(instance->get_disposition() == core::Disposition::neutral);
}
SECTION("has a null participant")
@@ -95,9 +95,9 @@ namespace turns::ui::tests
THEN("changes to the disposition propagate to the participant")
{
- CHECK(participant->get_disposition() != core::disposition::secret);
- instance->set_disposition(core::disposition::secret);
- REQUIRE(participant->get_disposition() == core::disposition::secret);
+ CHECK(participant->get_disposition() != core::Disposition::secret);
+ instance->set_disposition(core::Disposition::secret);
+ REQUIRE(participant->get_disposition() == core::Disposition::secret);
}
}
@@ -112,7 +112,7 @@ namespace turns::ui::tests
auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8");
setlocale(LC_ALL, locale);
- auto participant = core::Participant::create("Qibi Babblebranch", 12, core::disposition::neutral);
+ auto participant = core::Participant::create("Qibi Babblebranch", 12, core::Disposition::neutral);
auto instance = std::make_shared<ParticipantEditor>(participant);
auto window = Gtk::Window{};
diff --git a/ui/tests/participant_row.cpp b/ui/tests/participant_row.cpp
index 6e5319f..c02b3f0 100644
--- a/ui/tests/participant_row.cpp
+++ b/ui/tests/participant_row.cpp
@@ -23,7 +23,7 @@ namespace turns::ui::tests
SECTION("can be created with a participant")
{
- REQUIRE(std::make_shared<ParticipantRow>(core::Participant::create("Tazmyla Fireforge", 13, core::disposition::secret)));
+ REQUIRE(std::make_shared<ParticipantRow>(core::Participant::create("Tazmyla Fireforge", 13, core::Disposition::secret)));
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-17 18:04:54 +0000