From 6a6d0be0c659c28946c70a4774966ea9169acb25 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Wed, 24 Jul 2024 11:18:46 +0200
Subject: turns: update header sorting rules and reformat code

---
 app/include/turns/app/application.hpp                |  8 +++++---
 app/include/turns/app/widgets/participant_row.hpp    |  5 +++--
 app/include/turns/app/widgets/template_widget.hpp    | 10 ++++++----
 app/include/turns/app/widgets/turn_order_view.hpp    |  5 +++--
 app/include/turns/app/windows/participant_editor.hpp |  8 +++++---
 app/include/turns/app/windows/tracker.hpp            |  6 ++++--
 app/src/application.cpp                              |  5 +++--
 app/src/main.cpp                                     |  3 ++-
 app/src/widgets/participant_row.cpp                  | 16 ++++++++--------
 app/src/widgets/turn_order_view.cpp                  |  1 -
 app/src/windows/participant_editor.cpp               |  5 +++--
 app/src/windows/tracker.cpp                          | 10 ++++++----
 app/tests/widgets/participant_row.cpp                |  4 ++--
 app/tests/windows/participant_editor.cpp             | 14 ++++++++------
 app/tests/windows/tracker.cpp                        |  8 +++++---
 15 files changed, 63 insertions(+), 45 deletions(-)

(limited to 'app')

diff --git a/app/include/turns/app/application.hpp b/app/include/turns/app/application.hpp
index 680c3af..fcaddfb 100644
--- a/app/include/turns/app/application.hpp
+++ b/app/include/turns/app/application.hpp
@@ -3,12 +3,14 @@
 
 #include "turns/app/windows/tracker.hpp"
 
-#include <memory>
-
-#include <adwaita.h>
 #include <glibmm/refptr.h>
+
 #include <gtkmm/application.h>
 
+#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 d5c896a..5d9bf80 100644
--- a/app/include/turns/app/widgets/participant_row.hpp
+++ b/app/include/turns/app/widgets/participant_row.hpp
@@ -4,17 +4,18 @@
 #include "turns/app/widgets/template_widget.hpp"
 #include "turns/core/participant.hpp"
 
-#include <array>
-
 #include <glibmm/binding.h>
 #include <glibmm/property.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
+
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
 #include <gtkmm/listboxrow.h>
 #include <gtkmm/togglebutton.h>
 
+#include <array>
+
 namespace turns::app::widgets
 {
   struct participant_row : template_widget<participant_row, Gtk::ListBoxRow>
diff --git a/app/include/turns/app/widgets/template_widget.hpp b/app/include/turns/app/widgets/template_widget.hpp
index 62b82e7..070a856 100644
--- a/app/include/turns/app/widgets/template_widget.hpp
+++ b/app/include/turns/app/widgets/template_widget.hpp
@@ -1,15 +1,17 @@
 #ifndef TURNS_APP_WIDGETS_TEMPLATE_WIDGET_HPP
 #define TURNS_APP_WIDGETS_TEMPLATE_WIDGET_HPP
 
-#include <algorithm>
-#include <utility>
-
 #include <glibmm/extraclassinit.h>
 #include <glibmm/objectbase.h>
 #include <glibmm/ustring.h>
-#include <gtk/gtk.h>
+
 #include <gtkmm/widget.h>
 
+#include <gtk/gtk.h>
+
+#include <algorithm>
+#include <utility>
+
 namespace turns::app::widgets
 {
 
diff --git a/app/include/turns/app/widgets/turn_order_view.hpp b/app/include/turns/app/widgets/turn_order_view.hpp
index cb996f8..c467ff6 100644
--- a/app/include/turns/app/widgets/turn_order_view.hpp
+++ b/app/include/turns/app/widgets/turn_order_view.hpp
@@ -6,14 +6,15 @@
 #include "turns/core/participant.hpp"
 #include "turns/core/turn_order.hpp"
 
-#include <array>
-
 #include <glibmm/object.h>
 #include <glibmm/refptr.h>
+
 #include <gtkmm/listbox.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/widget.h>
 
+#include <array>
+
 namespace turns::app::widgets
 {
   struct turn_order_view : template_widget<turn_order_view, Gtk::ScrolledWindow>
diff --git a/app/include/turns/app/windows/participant_editor.hpp b/app/include/turns/app/windows/participant_editor.hpp
index 1ca3e43..ec1768f 100644
--- a/app/include/turns/app/windows/participant_editor.hpp
+++ b/app/include/turns/app/windows/participant_editor.hpp
@@ -3,10 +3,10 @@
 
 #include "turns/core/participant.hpp"
 
-#include <utility>
+#include <sigc++/signal.h>
 
-#include <adwaita.h>
 #include <glibmm/refptr.h>
+
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/listitem.h>
@@ -14,7 +14,9 @@
 #include <gtkmm/stringlist.h>
 #include <gtkmm/widget.h>
 
-#include <sigc++/signal.h>
+#include <adwaita.h>
+
+#include <utility>
 
 namespace turns::app::windows
 {
diff --git a/app/include/turns/app/windows/tracker.hpp b/app/include/turns/app/windows/tracker.hpp
index b9dea52..bf3531a 100644
--- a/app/include/turns/app/windows/tracker.hpp
+++ b/app/include/turns/app/windows/tracker.hpp
@@ -4,10 +4,10 @@
 #include "turns/app/widgets/turn_order_view.hpp"
 #include "turns/core/turn_order.hpp"
 
-#include <adwaita.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>
@@ -15,6 +15,8 @@
 #include <gtkmm/stack.h>
 #include <gtkmm/widget.h>
 
+#include <adwaita.h>
+
 namespace turns::app::windows
 {
 
@@ -27,7 +29,7 @@ namespace turns::app::windows
     auto handle_delete_participant(Glib::VariantBase param) -> void;
     auto handle_edit_participant(Glib::VariantBase param) -> void;
     auto handle_stop() -> void;
-    
+
     auto setup_actions() -> void;
 
     AdwApplicationWindow * m_adw;
diff --git a/app/src/application.cpp b/app/src/application.cpp
index bf49a6e..f8156aa 100644
--- a/app/src/application.cpp
+++ b/app/src/application.cpp
@@ -3,13 +3,14 @@
 #include "turns/app/widgets/turn_order_view.hpp"
 #include "turns/app/windows/tracker.hpp"
 
+#include <sigc++/functors/functors.h>
+
 #include <glibmm/wrap.h>
+
 #include <gtkmm/builder.h>
 #include <gtkmm/init.h>
 #include <gtkmm/window.h>
 
-#include <sigc++/functors/functors.h>
-
 namespace turns::app
 {
 
diff --git a/app/src/main.cpp b/app/src/main.cpp
index d81f34f..6a8a3d1 100644
--- a/app/src/main.cpp
+++ b/app/src/main.cpp
@@ -1,8 +1,9 @@
 #include "turns/app/application.hpp"
 
-#include <adwaita.h>
 #include <glibmm/i18n.h>
 
+#include <adwaita.h>
+
 auto main(int argc, char * argv[]) -> int
 {
   setlocale(LC_ALL, "");
diff --git a/app/src/widgets/participant_row.cpp b/app/src/widgets/participant_row.cpp
index 6a274d5..81d9e31 100644
--- a/app/src/widgets/participant_row.cpp
+++ b/app/src/widgets/participant_row.cpp
@@ -2,15 +2,16 @@
 
 #include "turns/lang/messages.hpp"
 
-#include <algorithm>
-#include <format>
-#include <vector>
-
 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>
 #include <glibmm/variant.h>
+
 #include <gtkmm/stringlist.h>
 
+#include <algorithm>
+#include <format>
+#include <vector>
+
 namespace turns::app::widgets
 {
   namespace
@@ -75,10 +76,9 @@ namespace turns::app::widgets
     {
       Glib::Binding::bind_property(participant->name(), m_title->property_label(), Glib::Binding::Flags::SYNC_CREATE);
 
-      Glib::Binding::bind_property(participant->priority(),
-                                   m_subtitle->property_label(),
-                                   Glib::Binding::Flags::SYNC_CREATE,
-                                   [](auto n) { return std::vformat(_(lang::priority_number), std::make_format_args(n)); });
+      Glib::Binding::bind_property(participant->priority(), m_subtitle->property_label(), Glib::Binding::Flags::SYNC_CREATE, [](auto n) {
+        return std::vformat(_(lang::priority_number), std::make_format_args(n));
+      });
 
       Glib::Binding::bind_property(participant->disposition(),
                                    m_toggle_defeated->property_css_classes(),
diff --git a/app/src/widgets/turn_order_view.cpp b/app/src/widgets/turn_order_view.cpp
index 172b6a2..82ef4e5 100644
--- a/app/src/widgets/turn_order_view.cpp
+++ b/app/src/widgets/turn_order_view.cpp
@@ -29,7 +29,6 @@ namespace turns::app::widgets
     }
   }
 
-
   auto turn_order_view::handle_create_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget *
   {
     auto participant = std::dynamic_pointer_cast<core::participant>(item);
diff --git a/app/src/windows/participant_editor.cpp b/app/src/windows/participant_editor.cpp
index b31ad77..af75537 100644
--- a/app/src/windows/participant_editor.cpp
+++ b/app/src/windows/participant_editor.cpp
@@ -3,14 +3,15 @@
 #include "turns/core/disposition.hpp"
 #include "turns/lang/messages.hpp"
 
-#include <ranges>
-
 #include <glibmm/i18n.h>
+
 #include <gtkmm/editable.h>
 #include <gtkmm/label.h>
 #include <gtkmm/listboxrow.h>
 #include <gtkmm/stringobject.h>
 
+#include <ranges>
+
 namespace turns::app::windows
 {
 
diff --git a/app/src/windows/tracker.cpp b/app/src/windows/tracker.cpp
index 7c4d2cd..8c5d02c 100644
--- a/app/src/windows/tracker.cpp
+++ b/app/src/windows/tracker.cpp
@@ -4,13 +4,15 @@
 #include "turns/app/windows/participant_editor.hpp"
 #include "turns/lang/messages.hpp"
 
-#include <format>
-#include <ranges>
-
-#include <adwaita.h>
 #include <glibmm/i18n.h>
+
 #include <gtkmm/stringobject.h>
 
+#include <adwaita.h>
+
+#include <format>
+#include <ranges>
+
 namespace turns::app::windows
 {
 
diff --git a/app/tests/widgets/participant_row.cpp b/app/tests/widgets/participant_row.cpp
index ebf1762..3098dbc 100644
--- a/app/tests/widgets/participant_row.cpp
+++ b/app/tests/widgets/participant_row.cpp
@@ -7,11 +7,11 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 
+#include <gtkmm/widget.h>
+
 #include <algorithm>
 #include <string>
 
-#include <gtkmm/widget.h>
-
 namespace turns::app::widgets::tests
 {
 
diff --git a/app/tests/windows/participant_editor.cpp b/app/tests/windows/participant_editor.cpp
index 670e56f..4dc2935 100644
--- a/app/tests/windows/participant_editor.cpp
+++ b/app/tests/windows/participant_editor.cpp
@@ -1,23 +1,25 @@
 #include "turns/app/windows/participant_editor.hpp"
 
-#include "turns/core/participant.hpp"
 #include "turns/core/disposition.hpp"
+#include "turns/core/participant.hpp"
 #include "turns/lang/messages.hpp"
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 
-#include <string>
-
-#include <adwaita.h>
 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>
+
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/listboxrow.h>
 #include <gtkmm/widget.h>
 #include <gtkmm/window.h>
 
+#include <adwaita.h>
+
+#include <string>
+
 namespace turns::app::windows::tests
 {
 
@@ -61,7 +63,7 @@ namespace turns::app::windows::tests
 
     SECTION("allows binding to the finished signal")
     {
-      REQUIRE((instance->signal_finished().connect([](auto, auto, auto){})).connected());
+      REQUIRE((instance->signal_finished().connect([](auto, auto, auto) {})).connected());
     }
   }
 
@@ -106,7 +108,7 @@ namespace turns::app::windows::tests
 
     SECTION("allows binding to the finished signal")
     {
-      REQUIRE((instance->signal_finished().connect([](auto, auto, auto){})).connected());
+      REQUIRE((instance->signal_finished().connect([](auto, auto, auto) {})).connected());
     }
   }
 
diff --git a/app/tests/windows/tracker.cpp b/app/tests/windows/tracker.cpp
index c522bd4..842dd76 100644
--- a/app/tests/windows/tracker.cpp
+++ b/app/tests/windows/tracker.cpp
@@ -5,17 +5,19 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 
-#include <string>
-
-#include <adwaita.h>
 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>
+
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/listbox.h>
 #include <gtkmm/menubutton.h>
 #include <gtkmm/widget.h>
 
+#include <adwaita.h>
+
+#include <string>
+
 namespace turns::app::windows::tests
 {
 
-- 
cgit v1.2.3