turns: clean up includes and headers

5 files changed, 5 insertions, 15 deletions

diff --git a/app/include/turns/app/application.hpp b/app/include/turns/app/application.hpp
index fcaddfb..67217f0 100644
--- a/app/include/turns/app/application.hpp
+++ b/app/include/turns/app/application.hpp
@@ -9,8 +9,6 @@
 
 #include <adwaita.h>
 
-#include <memory>
-
 namespace turns::app
 {
 
diff --git a/app/include/turns/app/widgets/participant_row.hpp b/app/include/turns/app/widgets/participant_row.hpp
index 5d9bf80..88360db 100644
--- a/app/include/turns/app/widgets/participant_row.hpp
+++ b/app/include/turns/app/widgets/participant_row.hpp
@@ -2,12 +2,10 @@
 #define TURNS_APP_WIDGETS_PARTICIPANT_ROW_HPP
 
 #include "turns/app/widgets/template_widget.hpp"
-#include "turns/core/participant.hpp"
+#include "turns/core/fwd.hpp"
 
-#include <glibmm/binding.h>
 #include <glibmm/property.h>
 #include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
 
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
diff --git a/app/include/turns/app/widgets/template_widget.hpp b/app/include/turns/app/widgets/template_widget.hpp
index 070a856..5643cb4 100644
--- a/app/include/turns/app/widgets/template_widget.hpp
+++ b/app/include/turns/app/widgets/template_widget.hpp
@@ -2,7 +2,6 @@
 #define TURNS_APP_WIDGETS_TEMPLATE_WIDGET_HPP
 
 #include <glibmm/extraclassinit.h>
-#include <glibmm/objectbase.h>
 #include <glibmm/ustring.h>
 
 #include <gtkmm/widget.h>
diff --git a/app/include/turns/app/widgets/turn_order_view.hpp b/app/include/turns/app/widgets/turn_order_view.hpp
index c467ff6..88dcde1 100644
--- a/app/include/turns/app/widgets/turn_order_view.hpp
+++ b/app/include/turns/app/widgets/turn_order_view.hpp
@@ -2,9 +2,7 @@
 #define TURNS_APP_WIDGETS_TURN_ORDER_VIEW_HPP
 
 #include "turns/app/widgets/template_widget.hpp"
-#include "turns/core/disposition.hpp"
-#include "turns/core/participant.hpp"
-#include "turns/core/turn_order.hpp"
+#include "turns/core/fwd.hpp"
 
 #include <glibmm/object.h>
 #include <glibmm/refptr.h>
diff --git a/app/include/turns/app/windows/participant_editor.hpp b/app/include/turns/app/windows/participant_editor.hpp
index ec1768f..1fa42bb 100644
--- a/app/include/turns/app/windows/participant_editor.hpp
+++ b/app/include/turns/app/windows/participant_editor.hpp
@@ -1,11 +1,12 @@
 #ifndef TURNS_APP_WINDOWS_PARTICIPANT_EDITOR_HPP
 #define TURNS_APP_WINDOWS_PARTICIPANT_EDITOR_HPP
 
-#include "turns/core/participant.hpp"
+#include "turns/core/fwd.hpp"
 
 #include <sigc++/signal.h>
 
 #include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
 
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
@@ -16,16 +17,12 @@
 
 #include <adwaita.h>
 
-#include <utility>
-
 namespace turns::app::windows
 {
 
   struct participant_editor : Gtk::Widget
   {
-    using signal_finished_type = sigc::signal<void(decltype(std::declval<core::participant const>().name().get_value()),
-                                                   decltype(std::declval<core::participant const>().priority().get_value()),
-                                                   decltype(std::declval<core::participant const>().disposition().get_value()))>;
+    using signal_finished_type = sigc::signal<void (Glib::ustring, float, core::disposition)>;
 
     participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<core::participant> obj = {});