source: reformat include statements

20 files changed, 57 insertions, 69 deletions

diff --git a/.clang-format b/.clang-format
index 4301842..7453904 100644
--- a/.clang-format
+++ b/.clang-format
@@ -66,37 +66,27 @@ FixNamespaceComments: true
 IncludeBlocks: Regroup
 IncludeCategories:
     # Local Headers
-    - Regex: '^"[[:alnum:]_/\-]+\.h(pp)?'
+    - Regex: '^("|<)turns'
       Priority: 100
-    # Catch2 Headers
-    - Regex: '^<catch2/[[:alnum:]_/]+\.hpp'
-      Priority: 200
     # sigc++ Headers
-    - Regex: '^<sigc\+\+/[[:alnum:]_/]+\.h(pp)?'
-      Priority: 300
-    # Glibmm Headers
-    - Regex: '^<glibmm/[[:alnum:]_/]+\.h(pp)?'
-      Priority: 300
-    # Giomm Headers
-    - Regex: '^<giomm/[[:alnum:]_/]+\.h(pp)?'
+    - Regex: '^<sigc\+\+\/'
       Priority: 300
-    # Gdkmm Headers
-    - Regex: '^<gdkmm/[[:alnum:]_/]+\.h(pp)?'
-      Priority: 300
-    # Gtkmm Headers
-    - Regex: '^<gtkmm/[[:alnum:]_/]+\.h(pp)?'
-      Priority: 300
-    # Adwaitamm Headers
-    - Regex: '^<adwaitamm/[[:alnum:]_/]+\.hpp?'
-      Priority: 400
+    # G*mm Headers
+    - Regex: '^<(g(lib|io|dk|tk)|adwaita)mm'
+      Priority: 310
+    # G* Headers
+    - Regex: '^<g(lib|io|dk|tk)|adwaita'
+      Priority: 305
+    # Catch2 Headers
+    - Regex: '^<catch2/'
+      Priority: 200
     # General System Headers
-    - Regex: '^<[[:alnum:]/+-_]+\.h(pp)?'
+    - Regex: '^<[[:alnum:]\/+-_]+\.h(pp)?'
       Priority: 500
     # STL Headers
     - Regex: '^<[[:alnum:]_]+>'
       Priority: 600
 
-      
 IndentCaseLabels: false
 IndentPPDirectives: None
 IndentWidth: 2
diff --git a/gui/include/settings.hpp b/gui/include/settings.hpp
index 668758f..f57f4e9 100644
--- a/gui/include/settings.hpp
+++ b/gui/include/settings.hpp
@@ -6,9 +6,8 @@
 #ifndef TURNS_GUI_SETTINGS_HPP
 #define TURNS_GUI_SETTINGS_HPP
 
-#include <glibmm/refptr.h>
-
 #include <giomm/settings.h>
+#include <glibmm/refptr.h>
 
 namespace Turns::gui
 {
diff --git a/gui/src/main.cpp b/gui/src/main.cpp
index c8830bf..c4b95e5 100644
--- a/gui/src/main.cpp
+++ b/gui/src/main.cpp
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-#include "turnsmm/init.hpp"
-
-#include <giomm/application.h>
+#include <turnsmm.hpp>
+#include <turnsmm/enum_helpers.hpp>
 
 #include <adwaitamm/application.hpp>
+#include <giomm/application.h>
 
 #include <libintl.h>
 
diff --git a/gui/src/settings.cpp b/gui/src/settings.cpp
index fed7452..d268c74 100644
--- a/gui/src/settings.cpp
+++ b/gui/src/settings.cpp
@@ -5,13 +5,12 @@
 
 #include "settings.hpp"
 
-#include <glibmm/refptr.h>
-#include <glibmm/wrap.h>
+#include <gio/gsettings.h>
 
 #include <giomm/settings.h>
 #include <giomm/settingsschemasource.h>
-
-#include <gio/gsettings.h>
+#include <glibmm/refptr.h>
+#include <glibmm/wrap.h>
 
 namespace Turns::gui
 {
diff --git a/lib/include/turnsmm/enum_helpers.hpp b/lib/include/turnsmm/enum_helpers.hpp
index 60b8cd7..e829b76 100644
--- a/lib/include/turnsmm/enum_helpers.hpp
+++ b/lib/include/turnsmm/enum_helpers.hpp
@@ -6,11 +6,11 @@
 #ifndef TURNSMM_ENUM_HELPERS_HPP
 #define TURNSMM_ENUM_HELPERS_HPP
 
-#include <glibmm/value.h>
-
 #include <glib-object.h>
 #include <glib.h>
 
+#include <glibmm/value.h>
+
 #include <type_traits>
 
 #define TURNS_DECLARE_ENUM_VALUE_SPECIALIZATION(Enum)                                                                                          \
diff --git a/lib/include/turnsmm/init.hpp b/lib/include/turnsmm/init.hpp
index c22b4c9..a683461 100644
--- a/lib/include/turnsmm/init.hpp
+++ b/lib/include/turnsmm/init.hpp
@@ -9,6 +9,6 @@
 namespace Turns
 {
   void init(void);
-}
+}  // namespace Turns
 
 #endif
diff --git a/lib/include/turnsmm/participant.hpp b/lib/include/turnsmm/participant.hpp
index 6dece0e..d7956ab 100644
--- a/lib/include/turnsmm/participant.hpp
+++ b/lib/include/turnsmm/participant.hpp
@@ -9,14 +9,14 @@
 #include "turns-participant.h"
 #include "turnsmm/enum_helpers.hpp"
 
+#include <glib-object.h>
+#include <glib.h>
+
 #include <glibmm/object.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 
-#include <glib-object.h>
-#include <glib.h>
-
 namespace Turns
 {
 
diff --git a/lib/include/turnsmm/private/participant_p.hpp b/lib/include/turnsmm/private/participant_p.hpp
index d0f4f0d..4c6272a 100644
--- a/lib/include/turnsmm/private/participant_p.hpp
+++ b/lib/include/turnsmm/private/participant_p.hpp
@@ -8,12 +8,12 @@
 
 #include "turns-participant.h"
 
+#include <glib-object.h>
+
 #include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 
-#include <glib-object.h>
-
 namespace Turns
 {
 
diff --git a/lib/include/turnsmm/private/turn-order_p.hpp b/lib/include/turnsmm/private/turn-order_p.hpp
index d694b3e..bbc57e6 100644
--- a/lib/include/turnsmm/private/turn-order_p.hpp
+++ b/lib/include/turnsmm/private/turn-order_p.hpp
@@ -8,12 +8,12 @@
 
 #include "turns-turn-order.h"
 
+#include <glib-object.h>
+
 #include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
 
-#include <glib-object.h>
-
 namespace Turns
 {
 
diff --git a/lib/include/turnsmm/turn-order.hpp b/lib/include/turnsmm/turn-order.hpp
index 5b8deb9..ebe09f7 100644
--- a/lib/include/turnsmm/turn-order.hpp
+++ b/lib/include/turnsmm/turn-order.hpp
@@ -9,17 +9,16 @@
 #include "turns-turn-order.h"
 #include "turnsmm/participant.hpp"
 
+#include <glib-object.h>
+#include <glib.h>
+
+#include <giomm/listmodel.h>
 #include <glibmm/object.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glibmm/value.h>
 
-#include <giomm/listmodel.h>
-
-#include <glib-object.h>
-#include <glib.h>
-
 #include <cstddef>
 
 namespace Turns
diff --git a/lib/src/turns-participant.c b/lib/src/turns-participant.c
index 18785db..c18ae69 100644
--- a/lib/src/turns-participant.c
+++ b/lib/src/turns-participant.c
@@ -7,6 +7,7 @@
 
 #include <glib-object.h>
 #include <glib.h>
+
 #include <math.h>
 
 struct _TurnsParticipant
diff --git a/lib/src/turns-turn-order.c b/lib/src/turns-turn-order.c
index 552b200..1861888 100644
--- a/lib/src/turns-turn-order.c
+++ b/lib/src/turns-turn-order.c
@@ -10,6 +10,7 @@
 #include <gio/gio.h>
 #include <glib-object.h>
 #include <glib.h>
+
 #include <stdint.h>
 
 enum
diff --git a/lib/src/turnsmm/init.cpp b/lib/src/turnsmm/init.cpp
index e649797..7ee4859 100644
--- a/lib/src/turnsmm/init.cpp
+++ b/lib/src/turnsmm/init.cpp
@@ -11,11 +11,11 @@
 #include "turnsmm/private/turn-order_p.hpp"   // IWYU pragma: keep
 #include "turnsmm/turn-order.hpp"
 
+#include <glib-object.h>
+
 #include <glibmm/value.h>
 #include <glibmm/wrap.h>
 
-#include <glib-object.h>
-
 #define WRAP_CLASS(Name, name) Glib::wrap_register(turns_##name##_get_type(), &Name##_Class::wrap_new)
 #define ENSURE_TYPE(Name) g_type_ensure(Name::get_type())
 
diff --git a/lib/src/turnsmm/participant.cpp b/lib/src/turnsmm/participant.cpp
index 754339d..758f062 100644
--- a/lib/src/turnsmm/participant.cpp
+++ b/lib/src/turnsmm/participant.cpp
@@ -9,6 +9,8 @@
 #include "turnsmm/enum_helpers.hpp"
 #include "turnsmm/private/participant_p.hpp"
 
+#include <glib-object.h>
+
 #include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
@@ -19,8 +21,6 @@
 #include <glibmm/utility.h>
 #include <glibmm/wrap.h>
 
-#include <glib-object.h>
-
 #include <bit>
 
 namespace Turns
diff --git a/lib/src/turnsmm/turn-order.cpp b/lib/src/turnsmm/turn-order.cpp
index 8d1c8e6..ae9bd43 100644
--- a/lib/src/turnsmm/turn-order.cpp
+++ b/lib/src/turnsmm/turn-order.cpp
@@ -10,6 +10,10 @@
 #include "turnsmm/participant.hpp"
 #include "turnsmm/private/turn-order_p.hpp"
 
+#include <glib-object.h>
+#include <glib.h>
+
+#include <giomm/listmodel.h>
 #include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
@@ -18,11 +22,6 @@
 #include <glibmm/refptr.h>
 #include <glibmm/wrap.h>
 
-#include <giomm/listmodel.h>
-
-#include <glib-object.h>
-#include <glib.h>
-
 #include <bit>
 #include <cstddef>
 
diff --git a/lib/tests/runtime_init.cpp b/lib/tests/runtime_init.cpp
index b9d3e44..f896d71 100644
--- a/lib/tests/runtime_init.cpp
+++ b/lib/tests/runtime_init.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
- #include "turns-init.h"
+#include "turns-init.h"
 
 #include <catch2/reporters/catch_reporter_event_listener.hpp>
 #include <catch2/reporters/catch_reporter_registrars.hpp>
diff --git a/lib/tests/turns-participant.cpp b/lib/tests/turns-participant.cpp
index e3d9e3a..e9cc62e 100644
--- a/lib/tests/turns-participant.cpp
+++ b/lib/tests/turns-participant.cpp
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
- #include "turns-participant.h"
+#include "turns-participant.h"
 
 #include <catch2/catch_approx.hpp>
 #include <catch2/catch_test_macros.hpp>
diff --git a/lib/tests/turnsmm/participant.cpp b/lib/tests/turnsmm/participant.cpp
index c1e3026..47cf867 100644
--- a/lib/tests/turnsmm/participant.cpp
+++ b/lib/tests/turnsmm/participant.cpp
@@ -3,17 +3,17 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
- #include "turnsmm/participant.hpp"
+#include "turnsmm/participant.hpp"
 
 #include <catch2/catch_approx.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 
-#include <glibmm/ustring.h>
-
 #include <glib-object.h>
 #include <glib.h>
 
+#include <glibmm/ustring.h>
+
 SCENARIO("Creating a participant", "[lib][object][lifetime]")
 {
   GIVEN("A participant constructed using the default constructor")
@@ -193,7 +193,9 @@ SCENARIO("Modifying a participant", "[lib][object][data]")
 
     WHEN("a new disposition is set")
     {
-      auto new_value = GENERATE(Turns::Participant::Disposition::Friendly, Turns::Participant::Disposition::Hostile, Turns::Participant::Disposition::Secret);
+      auto new_value = GENERATE(Turns::Participant::Disposition::Friendly,
+                                Turns::Participant::Disposition::Hostile,
+                                Turns::Participant::Disposition::Secret);
 
       CHECK_FALSE(instance.get_disposition() == new_value);
       instance.set_disposition(new_value);
diff --git a/lib/tests/turnsmm/runtime_init.cpp b/lib/tests/turnsmm/runtime_init.cpp
index f505a3d..ee529b9 100644
--- a/lib/tests/turnsmm/runtime_init.cpp
+++ b/lib/tests/turnsmm/runtime_init.cpp
@@ -3,7 +3,11 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
+#include "turns-participant.h"
+#include "turns-turn-order.h"
 #include "turnsmm/init.hpp"
+#include "turnsmm/participant.hpp"
+#include "turnsmm/turn-order.hpp"
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/internal/catch_test_run_info.hpp>
@@ -12,11 +16,6 @@
 
 #include <glibmm/init.h>
 
-#include <turns-participant.h>
-#include <turns-turn-order.h>
-#include <turnsmm/participant.hpp>
-#include <turnsmm/turn-order.hpp>
-
 namespace turns::core::tests
 {
 
diff --git a/lib/tests/turnsmm/turn-order.cpp b/lib/tests/turnsmm/turn-order.cpp
index 14b6b2c..fffe507 100644
--- a/lib/tests/turnsmm/turn-order.cpp
+++ b/lib/tests/turnsmm/turn-order.cpp
@@ -9,10 +9,9 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <giomm/listmodel.h>
-
 #include <glib.h>
-#include <turns-turn-order.h>
+
+#include <giomm/listmodel.h>
 
 #include <optional>
 #include <tuple>