ui: flatten namespace hierarchy

8 files changed, 26 insertions, 33 deletions

diff --git a/ui/include/turns/ui/widgets/fwd.hpp b/ui/include/turns/ui/fwd.hpp
index 69f324d..69dc0b5 100644
--- a/ui/include/turns/ui/widgets/fwd.hpp
+++ b/ui/include/turns/ui/fwd.hpp
@@ -5,6 +5,8 @@ namespace turns::ui::widgets
 {
   struct participant_editor;
   struct participant_row;
+  struct preferences;
+  struct tracker;
   struct turn_order_view;
   struct preferences;
 }  // namespace turns::ui::widgets
diff --git a/ui/include/turns/ui/widgets/participant_editor.hpp b/ui/include/turns/ui/participant_editor.hpp
index 2fab47d..e2017fd 100644
--- a/ui/include/turns/ui/widgets/participant_editor.hpp
+++ b/ui/include/turns/ui/participant_editor.hpp
@@ -1,9 +1,9 @@
-#ifndef TURNS_UI_WIDGETS_PARTICIPANT_EDITOR_HPP
-#define TURNS_UI_WIDGETS_PARTICIPANT_EDITOR_HPP
+#ifndef TURNS_UI_PARTICIPANT_EDITOR_HPP
+#define TURNS_UI_PARTICIPANT_EDITOR_HPP
 
 #include "turns/core/disposition.hpp"
 #include "turns/core/fwd.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <sigc++/signal.h>
 
@@ -24,7 +24,7 @@
 
 #include <array>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
 
   struct ParticipantEditor : template_widget<ParticipantEditor, Adwaita::Dialog>
diff --git a/ui/include/turns/ui/widgets/participant_row.hpp b/ui/include/turns/ui/participant_row.hpp
index f33da34..dc72013 100644
--- a/ui/include/turns/ui/widgets/participant_row.hpp
+++ b/ui/include/turns/ui/participant_row.hpp
@@ -1,8 +1,8 @@
-#ifndef TURNS_UI_WIDGETS_PARTICIPANT_ROW_HPP
-#define TURNS_UI_WIDGETS_PARTICIPANT_ROW_HPP
+#ifndef TURNS_UI_PARTICIPANT_ROW_HPP
+#define TURNS_UI_PARTICIPANT_ROW_HPP
 
 #include "turns/core/fwd.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <glibmm/property.h>
 #include <glibmm/propertyproxy.h>
@@ -15,7 +15,7 @@
 
 #include <array>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   struct participant_row : template_widget<participant_row, Gtk::ListBoxRow>
   {
diff --git a/ui/include/turns/ui/widgets/preferences.hpp b/ui/include/turns/ui/preferences.hpp
index 2a56f0b..bf24274 100644
--- a/ui/include/turns/ui/widgets/preferences.hpp
+++ b/ui/include/turns/ui/preferences.hpp
@@ -1,7 +1,7 @@
-#ifndef TURNS_UI_WIDGETS_PREFERENCES_HPP
-#define TURNS_UI_WIDGETS_PREFERENCES_HPP
+#ifndef TURNS_UI_PREFERENCES_HPP
+#define TURNS_UI_PREFERENCES_HPP
 
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
@@ -16,7 +16,7 @@
 
 #include <array>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   struct preferences : template_widget<preferences, Adwaita::PreferencesPage>
   {
diff --git a/ui/include/turns/ui/widgets/template_widget.hpp b/ui/include/turns/ui/template_widget.hpp
index f04f331..7147560 100644
--- a/ui/include/turns/ui/widgets/template_widget.hpp
+++ b/ui/include/turns/ui/template_widget.hpp
@@ -1,5 +1,5 @@
-#ifndef TURNS_UI_WIDGETS_TEMPLATE_WIDGET_HPP
-#define TURNS_UI_WIDGETS_TEMPLATE_WIDGET_HPP
+#ifndef TURNS_UI_TEMPLATE_WIDGET_HPP
+#define TURNS_UI_TEMPLATE_WIDGET_HPP
 
 #include <glibmm/extraclassinit.h>
 #include <glibmm/ustring.h>
@@ -14,7 +14,7 @@
 #include <algorithm>
 #include <utility>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
 
   template<typename CustomWidgetType, typename BaseWidgetType>
diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/tracker.hpp
index 495f825..3bd631e 100644
--- a/ui/include/turns/ui/windows/tracker.hpp
+++ b/ui/include/turns/ui/tracker.hpp
@@ -1,8 +1,8 @@
-#ifndef TURNS_UI_WINDOWS_TRACKER_HPP
-#define TURNS_UI_WINDOWS_TRACKER_HPP
+#ifndef TURNS_UI_TRACKER_HPP
+#define TURNS_UI_TRACKER_HPP
 
 #include "turns/core/turn_order.hpp"
-#include "turns/ui/widgets/turn_order_view.hpp"
+#include "turns/ui/turn_order_view.hpp"
 
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
@@ -29,7 +29,7 @@
 #include <exception>
 #include <string>
 
-namespace turns::ui::windows
+namespace turns::ui
 {
 
   struct tracker : Adwaita::ApplicationWindow
@@ -73,7 +73,7 @@ namespace turns::ui::windows
     Gtk::Button * m_start;
     Adwaita::WindowTitle * m_title;
     Glib::RefPtr<core::turn_order> m_turn_order;
-    widgets::turn_order_view * m_turn_order_view;
+    turn_order_view * m_turn_order_view;
     Glib::RefPtr<Gio::Settings> m_settings{};
     Glib::PropertyProxy<Glib::ustring> m_subtitle;
 
diff --git a/ui/include/turns/ui/widgets/turn_order_view.hpp b/ui/include/turns/ui/turn_order_view.hpp
index a9a3654..12a51eb 100644
--- a/ui/include/turns/ui/widgets/turn_order_view.hpp
+++ b/ui/include/turns/ui/turn_order_view.hpp
@@ -1,9 +1,9 @@
-#ifndef TURNS_UI_WIDGETS_TURN_ORDER_VIEW_HPP
-#define TURNS_UI_WIDGETS_TURN_ORDER_VIEW_HPP
+#ifndef TURNS_UI_TURN_ORDER_VIEW_HPP
+#define TURNS_UI_TURN_ORDER_VIEW_HPP
 
 #include "turns/core/fwd.hpp"
 #include "turns/core/turn_order.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <glibmm/object.h>
 #include <glibmm/refptr.h>
@@ -15,7 +15,7 @@
 
 #include <array>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   struct turn_order_view : template_widget<turn_order_view, Gtk::Box>
   {
diff --git a/ui/include/turns/ui/windows/fwd.hpp b/ui/include/turns/ui/windows/fwd.hpp
deleted file mode 100644
index 14dbfd1..0000000
--- a/ui/include/turns/ui/windows/fwd.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef TURNS_UI_WINDOWS_FWD_HPP
-#define TURNS_UI_WINDOWS_FWD_HPP
-
-namespace turns::ui::windows
-{
-  struct tracker;
-}  // namespace turns::ui::windows
-
-#endif
\ No newline at end of file