From b75e0bb0d0c33bf7ab44b8f5bace5b734d9d298c Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 7 May 2019 13:21:18 +0200 Subject: [PATCH] refactor: remove useless bar param --- include/modules/sway/mode.hpp | 3 +-- src/factory.cpp | 2 +- src/modules/sway/mode.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/modules/sway/mode.hpp b/include/modules/sway/mode.hpp index 6b787ea..0735d92 100644 --- a/include/modules/sway/mode.hpp +++ b/include/modules/sway/mode.hpp @@ -11,7 +11,7 @@ namespace waybar::modules::sway { class Mode : public ALabel { public: - Mode(const std::string&, const waybar::Bar&, const Json::Value&); + Mode(const std::string&, const Json::Value&); ~Mode() = default; auto update() -> void; @@ -19,7 +19,6 @@ class Mode : public ALabel { void onEvent(const struct Ipc::ipc_response&); void worker(); - const Bar& bar_; waybar::util::SleeperThread thread_; Ipc ipc_; std::string mode_; diff --git a/src/factory.cpp b/src/factory.cpp index d5015fe..a2e8839 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -12,7 +12,7 @@ waybar::IModule* waybar::Factory::makeModule(const std::string& name) const { } #ifdef HAVE_SWAY if (ref == "sway/mode") { - return new waybar::modules::sway::Mode(id, bar_, config_[name]); + return new waybar::modules::sway::Mode(id, config_[name]); } if (ref == "sway/workspaces") { return new waybar::modules::sway::Workspaces(id, bar_, config_[name]); diff --git a/src/modules/sway/mode.cpp b/src/modules/sway/mode.cpp index f3aa8b0..f59dd8b 100644 --- a/src/modules/sway/mode.cpp +++ b/src/modules/sway/mode.cpp @@ -2,8 +2,8 @@ namespace waybar::modules::sway { -Mode::Mode(const std::string& id, const Bar& bar, const Json::Value& config) - : ALabel(config, "{}"), bar_(bar) { +Mode::Mode(const std::string& id, const Json::Value& config) + : ALabel(config, "{}") { label_.set_name("mode"); if (!id.empty()) { label_.get_style_context()->add_class(id);