From 60e0584d1635170d1220c8f891bf580dec029632 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 3 Apr 2023 09:41:24 +0200 Subject: [PATCH] fix: lint --- include/AModule.hpp | 2 +- include/factory.hpp | 2 +- include/modules/clock.hpp | 18 +++++++----------- include/util/clara.hpp | 2 +- src/modules/mpris/mpris.cpp | 4 ++-- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/include/AModule.hpp b/include/AModule.hpp index 6f724cb6..9b16076b 100644 --- a/include/AModule.hpp +++ b/include/AModule.hpp @@ -15,7 +15,7 @@ class AModule : public IModule { auto update() -> void override; virtual auto refresh(int) -> void{}; operator Gtk::Widget &() override; - auto doAction(const std::string& name) -> void override; + auto doAction(const std::string &name) -> void override; Glib::Dispatcher dp; diff --git a/include/factory.hpp b/include/factory.hpp index b2b242fa..89eea0e9 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -18,10 +18,10 @@ #include "modules/wlr/workspace_manager.hpp" #endif #ifdef HAVE_RIVER +#include "modules/river/layout.hpp" #include "modules/river/mode.hpp" #include "modules/river/tags.hpp" #include "modules/river/window.hpp" -#include "modules/river/layout.hpp" #endif #ifdef HAVE_HYPRLAND #include "modules/hyprland/backend.hpp" diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp index 07f2284f..999c843f 100644 --- a/include/modules/clock.hpp +++ b/include/modules/clock.hpp @@ -15,10 +15,7 @@ enum class WeeksSide { HIDDEN, }; -enum class CldMode { - MONTH, - YEAR -}; +enum class CldMode { MONTH, YEAR }; class Clock final : public ALabel { public: @@ -64,12 +61,11 @@ class Clock final : public ALabel { void tz_down(); // ModuleActionMap - static inline std::map actionMap_{ - {"mode", &waybar::modules::Clock::cldModeSwitch}, - {"shift_up", &waybar::modules::Clock::cldShift_up}, - {"shift_down", &waybar::modules::Clock::cldShift_down}, - {"tz_up", &waybar::modules::Clock::tz_up}, - {"tz_down", &waybar::modules::Clock::tz_down} - }; + static inline std::map actionMap_{ + {"mode", &waybar::modules::Clock::cldModeSwitch}, + {"shift_up", &waybar::modules::Clock::cldShift_up}, + {"shift_down", &waybar::modules::Clock::cldShift_down}, + {"tz_up", &waybar::modules::Clock::tz_up}, + {"tz_down", &waybar::modules::Clock::tz_down}}; }; } // namespace waybar::modules diff --git a/include/util/clara.hpp b/include/util/clara.hpp index 4cc6f486..73fa5415 100644 --- a/include/util/clara.hpp +++ b/include/util/clara.hpp @@ -989,7 +989,7 @@ struct Help : Opt { showHelpFlag = flag; return ParserResult::ok(ParseResultType::ShortCircuitAll); }) { - static_cast (*this)("display usage information")["-?"]["-h"]["--help"].optional(); + static_cast(*this)("display usage information")["-?"]["-h"]["--help"].optional(); } }; diff --git a/src/modules/mpris/mpris.cpp b/src/modules/mpris/mpris.cpp index 68bb7fec..e1194bbf 100644 --- a/src/modules/mpris/mpris.cpp +++ b/src/modules/mpris/mpris.cpp @@ -1,11 +1,11 @@ +#include "modules/mpris/mpris.hpp" + #include #include #include #include -#include "modules/mpris/mpris.hpp" - extern "C" { #include }