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

---
 .clang-format                                      | 24 ++++++++++++++++------
 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 +++--
 .../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 +++++---
 core/include/turns/core/disposition.hpp            |  4 ++--
 core/include/turns/core/participant.hpp            |  4 ++--
 core/include/turns/core/turn_order.hpp             | 11 +++++-----
 core/src/participant.cpp                           |  6 +++---
 core/src/turn_order.cpp                            |  4 ++--
 core/tests/disposition.cpp                         |  6 +++---
 core/tests/participant.cpp                         |  5 +++--
 lang/tests/messages.cpp                            |  4 ++--
 test_support/src/glib_main.cpp                     |  3 ++-
 test_support/src/gtk_main.cpp                      |  3 ++-
 26 files changed, 108 insertions(+), 74 deletions(-)

diff --git a/.clang-format b/.clang-format
index 8d02964..45efa4a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -66,16 +66,28 @@ FixNamespaceComments: true
 IncludeBlocks: Regroup
 IncludeCategories:
     # Local Headers
-    - Regex: '"[A-za-z0-9._\/]+"'
+    - Regex: '^"[[:alnum:]_/\-]+\.h(pp)?'
       Priority: 200
     # Catch2 Headers
-    - Regex: '<catch2/.*\.hpp>'
+    - Regex: '^<catch2/[[:alnum:]_/]+\.hpp'
       Priority: 300
-    # STL Headers
-    - Regex: '<[A-za-z0-9_]+>'
-      Priority: 400
+    # sigc++ Headers
+    - Regex: '^<sigc\+\+/[[:alnum:]/]+\.h(pp)?'
+      Priority: 340
+    # Glibmm Headers
+    - Regex: '^<glibmm/[[:alnum:]/]+\.h(pp)?'
+      Priority: 350
+    # Giomm Headers
+    - Regex: '^<giomm/[[:alnum:]/]+\.h(pp)?'
+      Priority: 360
+    # Gtk Headers
+    - Regex: '^<gtkmm/[[:alnum:]/]+\.h(pp)?'
+      Priority: 370
     # General System Headers
-    - Regex: '<[A-za-z0-9._\/]+>'
+    - Regex: '^<[[:alnum:]/+-]+\.h(pp)?'
+      Priority: 400
+    # STL Headers
+    - Regex: '^<[[:alnum:]_]+>'
       Priority: 500
 
       
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
 {
 
diff --git a/core/include/turns/core/disposition.hpp b/core/include/turns/core/disposition.hpp
index 291aaf5..df9d641 100644
--- a/core/include/turns/core/disposition.hpp
+++ b/core/include/turns/core/disposition.hpp
@@ -1,11 +1,11 @@
 #ifndef TURNS_DOMAIN_DISPOSITION_HPP
 #define TURNS_DOMAIN_DISPOSITION_HPP
 
+#include <glibmm/ustring.h>
+
 #include <compare>
 #include <cstdint>
 
-#include <glibmm/ustring.h>
-
 namespace turns::core
 {
 
diff --git a/core/include/turns/core/participant.hpp b/core/include/turns/core/participant.hpp
index 9b5dab4..a0ad42b 100644
--- a/core/include/turns/core/participant.hpp
+++ b/core/include/turns/core/participant.hpp
@@ -3,14 +3,14 @@
 
 #include "turns/core/disposition.hpp"
 
-#include <compare>
-
 #include <glibmm/object.h>
 #include <glibmm/property.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 
+#include <compare>
+
 namespace turns::core
 {
   struct participant : Glib::Object
diff --git a/core/include/turns/core/turn_order.hpp b/core/include/turns/core/turn_order.hpp
index 43ee075..aeb0e6d 100644
--- a/core/include/turns/core/turn_order.hpp
+++ b/core/include/turns/core/turn_order.hpp
@@ -4,16 +4,17 @@
 #include "turns/core/disposition.hpp"
 #include "turns/core/participant.hpp"
 
+#include <glibmm/property.h>
+#include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
+
+#include <giomm/listmodel.h>
+
 #include <initializer_list>
 #include <limits>
 #include <optional>
 #include <vector>
 
-#include <giomm/listmodel.h>
-#include <glibmm/property.h>
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-
 namespace turns::core
 {
 
diff --git a/core/src/participant.cpp b/core/src/participant.cpp
index 45b02bd..aa97e83 100644
--- a/core/src/participant.cpp
+++ b/core/src/participant.cpp
@@ -1,11 +1,11 @@
 #include "turns/core/participant.hpp"
 
-#include <typeinfo>
-#include <utility>
-
 #include <glibmm/class.h>
 #include <glibmm/refptr.h>
 
+#include <typeinfo>
+#include <utility>
+
 namespace turns::core
 {
   auto participant::create(Glib::ustring name, float priority, core::disposition disposition) -> Glib::RefPtr<participant>
diff --git a/core/src/turn_order.cpp b/core/src/turn_order.cpp
index ae3511e..20eaa83 100644
--- a/core/src/turn_order.cpp
+++ b/core/src/turn_order.cpp
@@ -2,13 +2,13 @@
 
 #include "turns/core/participant.hpp"
 
+#include <glibmm/refptr.h>
+
 #include <algorithm>
 #include <compare>
 #include <limits>
 #include <typeinfo>
 
-#include <glibmm/refptr.h>
-
 namespace turns::core
 {
 
diff --git a/core/tests/disposition.cpp b/core/tests/disposition.cpp
index 3a35741..56e4e46 100644
--- a/core/tests/disposition.cpp
+++ b/core/tests/disposition.cpp
@@ -3,14 +3,14 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 
+#include <glibmm/i18n.h>
+#include <glibmm/ustring.h>
+
 #include <compare>
 #include <format>
 #include <limits>
 #include <utility>
 
-#include <glibmm/i18n.h>
-#include <glibmm/ustring.h>
-
 namespace turns::core::tests
 {
 
diff --git a/core/tests/participant.cpp b/core/tests/participant.cpp
index 14fb1ae..b969310 100644
--- a/core/tests/participant.cpp
+++ b/core/tests/participant.cpp
@@ -1,12 +1,13 @@
 #include "turns/core/participant.hpp"
+
 #include "turns/core/disposition.hpp"
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <compare>
-
 #include <glibmm/init.h>
 
+#include <compare>
+
 namespace turns::core::tests
 {
 
diff --git a/lang/tests/messages.cpp b/lang/tests/messages.cpp
index 53442b6..14e9fcf 100644
--- a/lang/tests/messages.cpp
+++ b/lang/tests/messages.cpp
@@ -3,11 +3,11 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 
+#include <libintl.h>
+
 #include <format>
 #include <string>
 
-#include <libintl.h>
-
 namespace turns::lang::tests
 {
 
diff --git a/test_support/src/glib_main.cpp b/test_support/src/glib_main.cpp
index b9dc858..c2fe10f 100644
--- a/test_support/src/glib_main.cpp
+++ b/test_support/src/glib_main.cpp
@@ -1,8 +1,9 @@
 #include <catch2/catch_session.hpp>
 
-#include <giomm/init.h>
 #include <glibmm/init.h>
 
+#include <giomm/init.h>
+
 namespace turns::tests
 {
   auto register_types() -> void;
diff --git a/test_support/src/gtk_main.cpp b/test_support/src/gtk_main.cpp
index cb2ae5c..4656c12 100644
--- a/test_support/src/gtk_main.cpp
+++ b/test_support/src/gtk_main.cpp
@@ -1,8 +1,9 @@
 #include <catch2/catch_session.hpp>
 
-#include <adwaita.h>
 #include <gtkmm/init.h>
 
+#include <adwaita.h>
+
 auto main(int argc, char * argv[]) -> int
 {
   setlocale(LC_ALL, "");
-- 
cgit v1.2.3