From d3f1e65d8535c88de64f0e388ce4c909f443ea35 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Thu, 25 Jul 2024 08:22:48 +0200
Subject: ui: fix namespace

---
 app/include/turns/app/application.hpp              | 4 +---
 app/src/application.cpp                            | 4 ++--
 ui/include/turns/ui/init.hpp                       | 2 +-
 ui/include/turns/ui/widgets/fwd.hpp                | 4 ++--
 ui/include/turns/ui/widgets/participant_row.hpp    | 4 ++--
 ui/include/turns/ui/widgets/template_widget.hpp    | 4 ++--
 ui/include/turns/ui/widgets/turn_order_view.hpp    | 4 ++--
 ui/include/turns/ui/windows/fwd.hpp                | 2 +-
 ui/include/turns/ui/windows/participant_editor.hpp | 2 +-
 ui/include/turns/ui/windows/tracker.hpp            | 2 +-
 ui/src/init.cpp                                    | 2 +-
 ui/src/widgets/participant_row.cpp                 | 2 +-
 ui/src/widgets/turn_order_view.cpp                 | 2 +-
 ui/src/windows/participant_editor.cpp              | 2 +-
 ui/src/windows/tracker.cpp                         | 2 +-
 ui/tests/widgets/participant_row.cpp               | 2 +-
 ui/tests/windows/participant_editor.cpp            | 2 +-
 ui/tests/windows/tracker.cpp                       | 2 +-
 18 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/app/include/turns/app/application.hpp b/app/include/turns/app/application.hpp
index c8bc862..ce4ef92 100644
--- a/app/include/turns/app/application.hpp
+++ b/app/include/turns/app/application.hpp
@@ -27,11 +27,9 @@ namespace turns::app
     auto on_shutdown() -> void;
     auto on_startup() -> void;
 
-    auto register_derived_widgets() -> void;
-
     AdwApplication * m_adw;
     Glib::RefPtr<Gtk::Application> m_application;
-    windows::tracker * m_tracker;
+    ui::windows::tracker * m_tracker;
   };
 
 }  // namespace turns::app
diff --git a/app/src/application.cpp b/app/src/application.cpp
index 1635cec..083cf9b 100644
--- a/app/src/application.cpp
+++ b/app/src/application.cpp
@@ -18,7 +18,7 @@ namespace turns::app
     Gtk::init_gtkmm_internals();
     adw_init();
     core::register_types();
-    app::register_types();
+    ui::register_types();
     return std::shared_ptr<application>{new application{}};
   }
 
@@ -45,7 +45,7 @@ namespace turns::app
   auto application::on_activate() -> void
   {
     auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui");
-    m_tracker = Gtk::Builder::get_widget_derived<windows::tracker>(builder, "tracker");
+    m_tracker = Gtk::Builder::get_widget_derived<ui::windows::tracker>(builder, "tracker");
 
     m_application->add_window(*m_tracker);
     m_tracker->present();
diff --git a/ui/include/turns/ui/init.hpp b/ui/include/turns/ui/init.hpp
index 09a0f40..a1b1184 100644
--- a/ui/include/turns/ui/init.hpp
+++ b/ui/include/turns/ui/init.hpp
@@ -1,7 +1,7 @@
 #ifndef TURNS_UI_INIT_HPP
 #define TURNS_UI_INIT_HPP
 
-namespace turns::app
+namespace turns::ui
 {
 
   auto register_types() -> void;
diff --git a/ui/include/turns/ui/widgets/fwd.hpp b/ui/include/turns/ui/widgets/fwd.hpp
index cbb9cae..4d2ddb7 100644
--- a/ui/include/turns/ui/widgets/fwd.hpp
+++ b/ui/include/turns/ui/widgets/fwd.hpp
@@ -1,10 +1,10 @@
 #ifndef TURNS_UI_WIDGETS_FWD_HPP
 #define TURNS_UI_WIDGETS_FWD_HPP
 
-namespace turns::app::widgets
+namespace turns::ui::widgets
 {
   struct participant_row;
   struct turn_order_view;
-}  // namespace turns::app::windows
+}  // namespace turns::ui::windows
 
 #endif
\ No newline at end of file
diff --git a/ui/include/turns/ui/widgets/participant_row.hpp b/ui/include/turns/ui/widgets/participant_row.hpp
index 5564ef4..7e1f9c4 100644
--- a/ui/include/turns/ui/widgets/participant_row.hpp
+++ b/ui/include/turns/ui/widgets/participant_row.hpp
@@ -14,7 +14,7 @@
 
 #include <array>
 
-namespace turns::app::widgets
+namespace turns::ui::widgets
 {
   struct participant_row : template_widget<participant_row, Gtk::ListBoxRow>
   {
@@ -44,6 +44,6 @@ namespace turns::app::widgets
     Glib::Property<bool> m_delete_enabled;
     Glib::Property<bool> m_edit_enabled;
   };
-}  // namespace turns::app::widgets
+}  // namespace turns::ui::widgets
 
 #endif
\ No newline at end of file
diff --git a/ui/include/turns/ui/widgets/template_widget.hpp b/ui/include/turns/ui/widgets/template_widget.hpp
index 5643cb4..e53a0fe 100644
--- a/ui/include/turns/ui/widgets/template_widget.hpp
+++ b/ui/include/turns/ui/widgets/template_widget.hpp
@@ -11,7 +11,7 @@
 #include <algorithm>
 #include <utility>
 
-namespace turns::app::widgets
+namespace turns::ui::widgets
 {
 
   template<typename CustomWidgetType, typename BaseWidgetType>
@@ -59,6 +59,6 @@ namespace turns::app::widgets
     }
   };
 
-}  // namespace turns::app::widgets
+}  // namespace turns::ui::widgets
 
 #endif
\ No newline at end of file
diff --git a/ui/include/turns/ui/widgets/turn_order_view.hpp b/ui/include/turns/ui/widgets/turn_order_view.hpp
index c14d239..28657c3 100644
--- a/ui/include/turns/ui/widgets/turn_order_view.hpp
+++ b/ui/include/turns/ui/widgets/turn_order_view.hpp
@@ -14,7 +14,7 @@
 
 #include <array>
 
-namespace turns::app::widgets
+namespace turns::ui::widgets
 {
   struct turn_order_view : template_widget<turn_order_view, Gtk::Box>
   {
@@ -34,6 +34,6 @@ namespace turns::app::widgets
     Gtk::ProgressBar * m_progress;
     Gtk::ListBox * m_view;
   };
-}  // namespace turns::app::widgets
+}  // namespace turns::ui::widgets
 
 #endif
\ No newline at end of file
diff --git a/ui/include/turns/ui/windows/fwd.hpp b/ui/include/turns/ui/windows/fwd.hpp
index 95d9acd..b0eb69e 100644
--- a/ui/include/turns/ui/windows/fwd.hpp
+++ b/ui/include/turns/ui/windows/fwd.hpp
@@ -1,7 +1,7 @@
 #ifndef TURNS_UI_WINDOWS_FWD_HPP
 #define TURNS_UI_WINDOWS_FWD_HPP
 
-namespace turns::app::windows
+namespace turns::ui::windows
 {
   struct participant_editor;
   struct tracker;
diff --git a/ui/include/turns/ui/windows/participant_editor.hpp b/ui/include/turns/ui/windows/participant_editor.hpp
index 1fa42bb..281e0c0 100644
--- a/ui/include/turns/ui/windows/participant_editor.hpp
+++ b/ui/include/turns/ui/windows/participant_editor.hpp
@@ -17,7 +17,7 @@
 
 #include <adwaita.h>
 
-namespace turns::app::windows
+namespace turns::ui::windows
 {
 
   struct participant_editor : Gtk::Widget
diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp
index 04174e6..b6b7c86 100644
--- a/ui/include/turns/ui/windows/tracker.hpp
+++ b/ui/include/turns/ui/windows/tracker.hpp
@@ -17,7 +17,7 @@
 
 #include <adwaita.h>
 
-namespace turns::app::windows
+namespace turns::ui::windows
 {
 
   struct tracker : Gtk::ApplicationWindow
diff --git a/ui/src/init.cpp b/ui/src/init.cpp
index f10521a..e1b8cc3 100644
--- a/ui/src/init.cpp
+++ b/ui/src/init.cpp
@@ -3,7 +3,7 @@
 #include "turns/ui/widgets/participant_row.hpp"
 #include "turns/ui/widgets/turn_order_view.hpp"
 
-namespace turns::app
+namespace turns::ui
 {
 
   auto register_types() -> void
diff --git a/ui/src/widgets/participant_row.cpp b/ui/src/widgets/participant_row.cpp
index 3e058b2..29e9100 100644
--- a/ui/src/widgets/participant_row.cpp
+++ b/ui/src/widgets/participant_row.cpp
@@ -12,7 +12,7 @@
 #include <algorithm>
 #include <format>
 
-namespace turns::app::widgets
+namespace turns::ui::widgets
 {
   namespace
   {
diff --git a/ui/src/widgets/turn_order_view.cpp b/ui/src/widgets/turn_order_view.cpp
index 78d7c43..66042da 100644
--- a/ui/src/widgets/turn_order_view.cpp
+++ b/ui/src/widgets/turn_order_view.cpp
@@ -10,7 +10,7 @@
 
 #include <memory>
 
-namespace turns::app::widgets
+namespace turns::ui::widgets
 {
   namespace
   {
diff --git a/ui/src/windows/participant_editor.cpp b/ui/src/windows/participant_editor.cpp
index ec31c68..63c09c4 100644
--- a/ui/src/windows/participant_editor.cpp
+++ b/ui/src/windows/participant_editor.cpp
@@ -13,7 +13,7 @@
 
 #include <ranges>
 
-namespace turns::app::windows
+namespace turns::ui::windows
 {
 
   participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<core::participant> obj)
diff --git a/ui/src/windows/tracker.cpp b/ui/src/windows/tracker.cpp
index b3e03d1..9069608 100644
--- a/ui/src/windows/tracker.cpp
+++ b/ui/src/windows/tracker.cpp
@@ -15,7 +15,7 @@
 #include <format>
 #include <utility>
 
-namespace turns::app::windows
+namespace turns::ui::windows
 {
 
   namespace
diff --git a/ui/tests/widgets/participant_row.cpp b/ui/tests/widgets/participant_row.cpp
index f2af510..d3440d0 100644
--- a/ui/tests/widgets/participant_row.cpp
+++ b/ui/tests/widgets/participant_row.cpp
@@ -5,7 +5,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-namespace turns::app::widgets::tests
+namespace turns::ui::widgets::tests
 {
 
   TEST_CASE("A freshly constructed participant row")
diff --git a/ui/tests/windows/participant_editor.cpp b/ui/tests/windows/participant_editor.cpp
index 99a4ded..cd0a61c 100644
--- a/ui/tests/windows/participant_editor.cpp
+++ b/ui/tests/windows/participant_editor.cpp
@@ -16,7 +16,7 @@
 
 #include <adwaita.h>
 
-namespace turns::app::windows::tests
+namespace turns::ui::windows::tests
 {
 
   TEST_CASE("A freshly constructed participant editor without a participant", "[windows]")
diff --git a/ui/tests/windows/tracker.cpp b/ui/tests/windows/tracker.cpp
index 3ec5658..d61f868 100644
--- a/ui/tests/windows/tracker.cpp
+++ b/ui/tests/windows/tracker.cpp
@@ -15,7 +15,7 @@
 
 #include <adwaita.h>
 
-namespace turns::app::windows::tests
+namespace turns::ui::windows::tests
 {
 
   TEST_CASE("A freshly constructed tracker window", "[windows]")
-- 
cgit v1.2.3