app: move model back to tracker window

2 files changed, 6 insertions, 12 deletions

diff --git a/app/include/turns/app/widgets/turn_order_view.hpp b/app/include/turns/app/widgets/turn_order_view.hpp
index 022b51c..7b7556f 100644
--- a/app/include/turns/app/widgets/turn_order_view.hpp
+++ b/app/include/turns/app/widgets/turn_order_view.hpp
@@ -9,9 +9,7 @@
 #include <array>
 
 #include <glibmm/object.h>
-#include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
 #include <gtkmm/listbox.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/widget.h>
@@ -20,19 +18,19 @@ namespace turns::app::widgets
 {
   struct turn_order_view : template_widget<turn_order_view, Gtk::ScrolledWindow>
   {
+    using model_type = domain::turn_order;
+
     auto constexpr inline static children = std::array{
         "view",
     };
 
-    turn_order_view();
-
-    auto get_model() const noexcept -> Glib::RefPtr<domain::turn_order>;
+    explicit turn_order_view(Glib::RefPtr<model_type> model = {});
 
   private:
     auto handle_active_participant_changed() -> void;
     auto handle_create_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget *;
 
-    Glib::RefPtr<domain::turn_order> m_model;
+    Glib::RefPtr<model_type> m_model;
     Gtk::ListBox * m_view;
   };
 }  // namespace turns::app::widgets
diff --git a/app/include/turns/app/windows/tracker.hpp b/app/include/turns/app/windows/tracker.hpp
index 4b1f89b..e1349f8 100644
--- a/app/include/turns/app/windows/tracker.hpp
+++ b/app/include/turns/app/windows/tracker.hpp
@@ -5,18 +5,13 @@
 #include "turns/domain/turn_order.hpp"
 
 #include <adwaita.h>
-#include <giomm/simpleaction.h>
-#include <glibmm/binding.h>
-#include <glibmm/object.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glibmm/variant.h>
 #include <gtkmm/applicationwindow.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
-#include <gtkmm/listbox.h>
 #include <gtkmm/revealer.h>
-#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/stack.h>
 #include <gtkmm/widget.h>
 
@@ -41,7 +36,8 @@ namespace turns::app::windows
     Gtk::Stack * m_stack;
     Gtk::Button * m_start;
     AdwWindowTitle * m_title;
-    widgets::turn_order_view * m_turn_order;
+    Glib::RefPtr<domain::turn_order> m_turn_order;
+    widgets::turn_order_view * m_turn_order_view;
     Glib::PropertyProxy<Glib::ustring> m_subtitle;
   };