1 files changed, 17 insertions, 21 deletions

diff --git a/gui/include/tracker.hpp b/gui/include/tracker.hpp
index d639aee..2360f5d 100644
--- a/gui/include/tracker.hpp
+++ b/gui/include/tracker.hpp
@@ -3,24 +3,25 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-#ifndef TURNS_UI_TRACKER_HPP
-#define TURNS_UI_TRACKER_HPP
+#ifndef TURNS_GUI_TRACKER_HPP
+#define TURNS_GUI_TRACKER_HPP
 
-#include "turns/core/turn_order_model.hpp"
-#include "turns/ui/template_widget.hpp"
-#include "turns/ui/turn_order_view.hpp"
+#include "template_widget.hpp"
+#include "turn_order_view.hpp"
 
-#include <glibmm/propertyproxy.h>
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <glibmm/variant.h>
+#include <turnsmm/turn-order.hpp>
 
+#include <adwaitamm/application.hpp>
+#include <adwaitamm/applicationwindow.hpp>
+#include <adwaitamm/toastoverlay.hpp>
+#include <adwaitamm/windowtitle.hpp>
 #include <giomm/asyncresult.h>
 #include <giomm/file.h>
 #include <giomm/settings.h>
-
-#include <gtkmm/applicationwindow.h>
-#include <gtkmm/builder.h>
+#include <glibmm/propertyproxy.h>
+#include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
+#include <glibmm/variant.h>
 #include <gtkmm/button.h>
 #include <gtkmm/cssprovider.h>
 #include <gtkmm/filedialog.h>
@@ -28,16 +29,11 @@
 #include <gtkmm/stack.h>
 #include <gtkmm/widget.h>
 
-#include <adwaitamm/application.hpp>
-#include <adwaitamm/applicationwindow.hpp>
-#include <adwaitamm/toastoverlay.hpp>
-#include <adwaitamm/windowtitle.hpp>
-
 #include <array>
 #include <exception>
 #include <string>
 
-namespace turns::ui
+namespace Turns::gui
 {
 
   struct Tracker : template_widget<Tracker, Adwaita::ApplicationWindow>
@@ -59,7 +55,7 @@ namespace turns::ui
     friend auto register_types() -> void;
     Tracker();
 
-  /** Setup */
+    /** Setup */
     auto setup_actions() -> void;
     auto setup_colors() -> void;
 
@@ -92,7 +88,7 @@ namespace turns::ui
     Gtk::Stack * m_stack;
     Gtk::Button * m_start;
     Adwaita::WindowTitle * m_title;
-    Glib::RefPtr<core::TurnOderModel> m_turn_order;
+    Glib::RefPtr<TurnOrder> m_turn_order;
     TurnOrderView * m_turn_order_view;
     Glib::RefPtr<Gio::Settings> m_settings{};
     Glib::PropertyProxy<Glib::ustring> m_subtitle;
@@ -104,6 +100,6 @@ namespace turns::ui
     Glib::RefPtr<Gtk::CssProvider> m_css{};
   };
 
-}  // namespace turns::ui
+}  // namespace Turns::gui
 
 #endif
\ No newline at end of file