summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFelix Morgner <felix.morgner@gmail.com>2025-05-30 11:09:54 +0200
committerFelix Morgner <felix.morgner@gmail.com>2025-05-30 11:09:54 +0200
commit8ef970b679505ea82ea41e94ffa972a732731eae (patch)
tree9678ff0d6a880e639091179a64f90b8ecfbbb8ad /lib
parent149df837961635b81109796e6b6b2c81c376b356 (diff)
downloadturns-8ef970b679505ea82ea41e94ffa972a732731eae.tar.xz
turns-8ef970b679505ea82ea41e94ffa972a732731eae.zip
source: reformat include statements
Diffstat (limited to 'lib')
-rw-r--r--lib/include/turnsmm/enum_helpers.hpp4
-rw-r--r--lib/include/turnsmm/init.hpp2
-rw-r--r--lib/include/turnsmm/participant.hpp6
-rw-r--r--lib/include/turnsmm/private/participant_p.hpp4
-rw-r--r--lib/include/turnsmm/private/turn-order_p.hpp4
-rw-r--r--lib/include/turnsmm/turn-order.hpp9
-rw-r--r--lib/src/turns-participant.c1
-rw-r--r--lib/src/turns-turn-order.c1
-rw-r--r--lib/src/turnsmm/init.cpp4
-rw-r--r--lib/src/turnsmm/participant.cpp4
-rw-r--r--lib/src/turnsmm/turn-order.cpp9
-rw-r--r--lib/tests/runtime_init.cpp2
-rw-r--r--lib/tests/turns-participant.cpp2
-rw-r--r--lib/tests/turnsmm/participant.cpp10
-rw-r--r--lib/tests/turnsmm/runtime_init.cpp9
-rw-r--r--lib/tests/turnsmm/turn-order.cpp5
16 files changed, 38 insertions, 38 deletions
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>