From 6c9be129ddd327634ca557fd079c0aa1a51df067 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Mon, 19 Aug 2024 10:17:31 +0200 Subject: core: rename key namespace to settings::key --- core/include/turns/core/settings.hpp | 2 +- ui/src/widgets/preferences.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/include/turns/core/settings.hpp b/core/include/turns/core/settings.hpp index 3e21a47..ca7bae3 100644 --- a/core/include/turns/core/settings.hpp +++ b/core/include/turns/core/settings.hpp @@ -7,7 +7,7 @@ namespace turns::core { - namespace key + namespace settings::key { auto constexpr disposition_friendly_color = "disposition-friendly-color"; auto constexpr disposition_hostile_color = "disposition-hostile-color"; diff --git a/ui/src/widgets/preferences.cpp b/ui/src/widgets/preferences.cpp index 621576e..6960dcc 100644 --- a/ui/src/widgets/preferences.cpp +++ b/ui/src/widgets/preferences.cpp @@ -47,14 +47,14 @@ namespace turns::ui::widgets return; } - bind_reset(core::key::disposition_friendly_color, m_friendly_reset_button); - bind_setting(core::key::disposition_friendly_color, m_friendly_color_button); - bind_reset(core::key::disposition_hostile_color, m_hostile_reset_button); - bind_setting(core::key::disposition_hostile_color, m_hostile_color_button); - bind_reset(core::key::disposition_secret_color, m_secret_reset_button); - bind_setting(core::key::disposition_secret_color, m_secret_color_button); + bind_reset(core::settings::key::disposition_friendly_color, m_friendly_reset_button); + bind_setting(core::settings::key::disposition_friendly_color, m_friendly_color_button); + bind_reset(core::settings::key::disposition_hostile_color, m_hostile_reset_button); + bind_setting(core::settings::key::disposition_hostile_color, m_hostile_color_button); + bind_reset(core::settings::key::disposition_secret_color, m_secret_reset_button); + bind_setting(core::settings::key::disposition_secret_color, m_secret_color_button); - m_settings->bind(core::key::skip_defeated, m_skip_defeated->property_active()); + m_settings->bind(core::settings::key::skip_defeated, m_skip_defeated->property_active()); } auto preferences::bind_reset(Glib::ustring const & key, Gtk::Button * button) -> void -- cgit v1.2.3