diff options
25 files changed, 46 insertions, 73 deletions
diff --git a/.clang-format b/.clang-format index 45efa4a..71b5a95 100644 --- a/.clang-format +++ b/.clang-format @@ -72,7 +72,7 @@ IncludeCategories: - Regex: '^<catch2/[[:alnum:]_/]+\.hpp' Priority: 300 # sigc++ Headers - - Regex: '^<sigc\+\+/[[:alnum:]/]+\.h(pp)?' + - Regex: '^<sigc\+\+/[[:alnum:]_/]+\.h(pp)?' Priority: 340 # Glibmm Headers - Regex: '^<glibmm/[[:alnum:]/]+\.h(pp)?' 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 = {}); diff --git a/app/src/application.cpp b/app/src/application.cpp index f8156aa..211d7d9 100644 --- a/app/src/application.cpp +++ b/app/src/application.cpp @@ -3,13 +3,11 @@ #include "turns/app/widgets/turn_order_view.hpp" #include "turns/app/windows/tracker.hpp" -#include <sigc++/functors/functors.h> - -#include <glibmm/wrap.h> +#include <sigc++/functors/mem_fun.h> +#include <gtkmm/application.h> #include <gtkmm/builder.h> #include <gtkmm/init.h> -#include <gtkmm/window.h> namespace turns::app { diff --git a/app/src/main.cpp b/app/src/main.cpp index 6a8a3d1..9ec90d2 100644 --- a/app/src/main.cpp +++ b/app/src/main.cpp @@ -2,8 +2,6 @@ #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 81d9e31..c04eee0 100644 --- a/app/src/widgets/participant_row.cpp +++ b/app/src/widgets/participant_row.cpp @@ -1,16 +1,16 @@ #include "turns/app/widgets/participant_row.hpp" +#include "turns/core/disposition.hpp" +#include "turns/core/participant.hpp" #include "turns/lang/messages.hpp" +#include <glibmm/binding.h> #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 { diff --git a/app/src/widgets/turn_order_view.cpp b/app/src/widgets/turn_order_view.cpp index 82ef4e5..9e69127 100644 --- a/app/src/widgets/turn_order_view.cpp +++ b/app/src/widgets/turn_order_view.cpp @@ -2,13 +2,14 @@ #include "turns/app/widgets/participant_row.hpp" #include "turns/core/participant.hpp" -#include "turns/lang/messages.hpp" - -#include <algorithm> -#include <format> +#include "turns/core/turn_order.hpp" #include <sigc++/functors/mem_fun.h> +#include <glibmm/binding.h> + +#include <memory> + namespace turns::app::widgets { namespace diff --git a/app/src/windows/participant_editor.cpp b/app/src/windows/participant_editor.cpp index af75537..1c8d05c 100644 --- a/app/src/windows/participant_editor.cpp +++ b/app/src/windows/participant_editor.cpp @@ -1,6 +1,7 @@ #include "turns/app/windows/participant_editor.hpp" #include "turns/core/disposition.hpp" +#include "turns/core/participant.hpp" #include "turns/lang/messages.hpp" #include <glibmm/i18n.h> diff --git a/app/src/windows/tracker.cpp b/app/src/windows/tracker.cpp index 8c5d02c..7188968 100644 --- a/app/src/windows/tracker.cpp +++ b/app/src/windows/tracker.cpp @@ -1,17 +1,16 @@ #include "turns/app/windows/tracker.hpp" -#include "turns/app/widgets/participant_row.hpp" #include "turns/app/windows/participant_editor.hpp" +#include "turns/core/participant.hpp" +#include "turns/core/turn_order.hpp" #include "turns/lang/messages.hpp" +#include <glibmm/binding.h> #include <glibmm/i18n.h> -#include <gtkmm/stringobject.h> - #include <adwaita.h> -#include <format> -#include <ranges> +#include <utility> namespace turns::app::windows { diff --git a/app/tests/widgets/participant_row.cpp b/app/tests/widgets/participant_row.cpp index 3098dbc..8f20f56 100644 --- a/app/tests/widgets/participant_row.cpp +++ b/app/tests/widgets/participant_row.cpp @@ -2,15 +2,8 @@ #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 <gtkmm/widget.h> - -#include <algorithm> -#include <string> namespace turns::app::widgets::tests { diff --git a/app/tests/windows/participant_editor.cpp b/app/tests/windows/participant_editor.cpp index 4dc2935..f9f59ee 100644 --- a/app/tests/windows/participant_editor.cpp +++ b/app/tests/windows/participant_editor.cpp @@ -11,15 +11,11 @@ #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 { diff --git a/app/tests/windows/tracker.cpp b/app/tests/windows/tracker.cpp index 842dd76..3d7f0c2 100644 --- a/app/tests/windows/tracker.cpp +++ b/app/tests/windows/tracker.cpp @@ -10,14 +10,11 @@ #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 df9d641..92a7d03 100644 --- a/core/include/turns/core/disposition.hpp +++ b/core/include/turns/core/disposition.hpp @@ -1,9 +1,8 @@ -#ifndef TURNS_DOMAIN_DISPOSITION_HPP -#define TURNS_DOMAIN_DISPOSITION_HPP +#ifndef TURNS_CORE_DISPOSITION_HPP +#define TURNS_CORE_DISPOSITION_HPP #include <glibmm/ustring.h> -#include <compare> #include <cstdint> namespace turns::core diff --git a/core/include/turns/core/fwd.hpp b/core/include/turns/core/fwd.hpp new file mode 100644 index 0000000..deac497 --- /dev/null +++ b/core/include/turns/core/fwd.hpp @@ -0,0 +1,14 @@ +#ifndef TURNS_CORE_FWD_HPP +#define TURNS_CORE_FWD_HPP + +#include <cstdint> + +namespace turns::core +{ + enum struct disposition : std::uint8_t; + + struct participant; + struct turn_order; +} + +#endif
\ No newline at end of file diff --git a/core/include/turns/core/participant.hpp b/core/include/turns/core/participant.hpp index a0ad42b..8568b03 100644 --- a/core/include/turns/core/participant.hpp +++ b/core/include/turns/core/participant.hpp @@ -1,11 +1,10 @@ -#ifndef TURNS_DOMAIN_PARTICIPANT_HPP -#define TURNS_DOMAIN_PARTICIPANT_HPP +#ifndef TURNS_CORE_PARTICIPANT_HPP +#define TURNS_CORE_PARTICIPANT_HPP #include "turns/core/disposition.hpp" #include <glibmm/object.h> #include <glibmm/property.h> -#include <glibmm/propertyproxy.h> #include <glibmm/refptr.h> #include <glibmm/ustring.h> diff --git a/core/include/turns/core/turn_order.hpp b/core/include/turns/core/turn_order.hpp index aeb0e6d..59cab84 100644 --- a/core/include/turns/core/turn_order.hpp +++ b/core/include/turns/core/turn_order.hpp @@ -1,16 +1,15 @@ -#ifndef TURNS_DOMAIN_TURN_ORDER_HPP -#define TURNS_DOMAIN_TURN_ORDER_HPP +#ifndef TURNS_CORE_TURN_ORDER_HPP +#define TURNS_CORE_TURN_ORDER_HPP -#include "turns/core/disposition.hpp" -#include "turns/core/participant.hpp" +#include "turns/core/fwd.hpp" #include <glibmm/property.h> +#include <glibmm/propertyproxy.h> #include <glibmm/refptr.h> #include <glibmm/ustring.h> #include <giomm/listmodel.h> -#include <initializer_list> #include <limits> #include <optional> #include <vector> diff --git a/core/src/participant.cpp b/core/src/participant.cpp index aa97e83..24d1cff 100644 --- a/core/src/participant.cpp +++ b/core/src/participant.cpp @@ -1,10 +1,9 @@ #include "turns/core/participant.hpp" -#include <glibmm/class.h> #include <glibmm/refptr.h> #include <typeinfo> -#include <utility> +#include <compare> namespace turns::core { diff --git a/core/src/turn_order.cpp b/core/src/turn_order.cpp index 20eaa83..234f394 100644 --- a/core/src/turn_order.cpp +++ b/core/src/turn_order.cpp @@ -5,8 +5,6 @@ #include <glibmm/refptr.h> #include <algorithm> -#include <compare> -#include <limits> #include <typeinfo> namespace turns::core diff --git a/core/tests/disposition.cpp b/core/tests/disposition.cpp index 56e4e46..e003f7e 100644 --- a/core/tests/disposition.cpp +++ b/core/tests/disposition.cpp @@ -6,7 +6,6 @@ #include <glibmm/i18n.h> #include <glibmm/ustring.h> -#include <compare> #include <format> #include <limits> #include <utility> diff --git a/core/tests/participant.cpp b/core/tests/participant.cpp index b969310..99e7fa4 100644 --- a/core/tests/participant.cpp +++ b/core/tests/participant.cpp @@ -4,8 +4,6 @@ #include <catch2/catch_test_macros.hpp> -#include <glibmm/init.h> - #include <compare> namespace turns::core::tests diff --git a/core/tests/turn_order.cpp b/core/tests/turn_order.cpp index fc779d7..4caf174 100644 --- a/core/tests/turn_order.cpp +++ b/core/tests/turn_order.cpp @@ -4,8 +4,6 @@ #include <catch2/catch_test_macros.hpp> -#include <giomm/liststore.h> - namespace turns::core::tests { SCENARIO("Queries on a fresh turn_order instance", "[turn_order]") @@ -16,8 +14,7 @@ namespace turns::core::tests THEN("get_n_items() returns 0") { - auto str = Gio::ListStore<Glib::Object>::create(); - REQUIRE(instance->get_n_items() == str->get_n_items()); + REQUIRE(instance->get_n_items() == 0); } THEN("get_type() returns participant::get_type()") diff --git a/core/tests/turn_order_bugs.cpp b/core/tests/turn_order_bugs.cpp index 0fa0720..d5502bc 100644 --- a/core/tests/turn_order_bugs.cpp +++ b/core/tests/turn_order_bugs.cpp @@ -1,10 +1,8 @@ -#include "turns/core/participant.hpp" +#include "turns/core/disposition.hpp" #include "turns/core/turn_order.hpp" #include <catch2/catch_test_macros.hpp> -#include <giomm/liststore.h> - namespace turns::core::tests { /** |