From 691fb88057355ff39a3806ad4a4479037893d174 Mon Sep 17 00:00:00 2001 From: Alexis Date: Sat, 1 Dec 2018 00:10:41 +0100 Subject: [PATCH] refactor(modules): const bar --- include/bar.hpp | 1 - include/factory.hpp | 4 ++-- include/modules/sni/tray.hpp | 3 ++- include/modules/sway/mode.hpp | 4 ++-- include/modules/sway/window.hpp | 4 ++-- include/modules/sway/workspaces.hpp | 4 ++-- src/factory.cpp | 2 +- src/modules/sni/tray.cpp | 6 +++--- src/modules/sway/mode.cpp | 2 +- src/modules/sway/window.cpp | 2 +- src/modules/sway/workspaces.cpp | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/bar.hpp b/include/bar.hpp index 55f392ac..a948eaca 100644 --- a/include/bar.hpp +++ b/include/bar.hpp @@ -26,7 +26,6 @@ class Bar { std::string output_name; uint32_t wl_name; bool visible = true; - uint32_t nb_tray_hosts = 0; private: static void handleLogicalPosition(void *, struct zxdg_output_v1 *, int32_t, int32_t); diff --git a/include/factory.hpp b/include/factory.hpp index 51aff7cf..5f659957 100644 --- a/include/factory.hpp +++ b/include/factory.hpp @@ -27,10 +27,10 @@ class Bar; class Factory { public: - Factory(Bar& bar, const Json::Value& config); + Factory(const Bar& bar, const Json::Value& config); IModule* makeModule(const std::string &name) const; private: - Bar& bar_; + const Bar& bar_; const Json::Value& config_; }; diff --git a/include/modules/sni/tray.hpp b/include/modules/sni/tray.hpp index afcb7057..a6c9a977 100644 --- a/include/modules/sni/tray.hpp +++ b/include/modules/sni/tray.hpp @@ -12,13 +12,14 @@ namespace waybar::modules::SNI { class Tray : public IModule { public: - Tray(Bar& bar, const Json::Value&); + Tray(const Bar& bar, const Json::Value&); auto update() -> void; operator Gtk::Widget &(); private: void onAdd(std::unique_ptr& item); void onRemove(std::unique_ptr& item); + static inline std::size_t nb_hosts_ = 0; std::thread thread_; const Json::Value& config_; Gtk::Box box_; diff --git a/include/modules/sway/mode.hpp b/include/modules/sway/mode.hpp index beb837b6..b825f018 100644 --- a/include/modules/sway/mode.hpp +++ b/include/modules/sway/mode.hpp @@ -12,12 +12,12 @@ namespace waybar::modules::sway { class Mode : public ALabel { public: - Mode(waybar::Bar&, const Json::Value&); + Mode(const waybar::Bar&, const Json::Value&); auto update() -> void; private: void worker(); - Bar& bar_; + const Bar& bar_; waybar::util::SleeperThread thread_; util::JsonParser parser_; Ipc ipc_; diff --git a/include/modules/sway/window.hpp b/include/modules/sway/window.hpp index d672829f..94c568bb 100644 --- a/include/modules/sway/window.hpp +++ b/include/modules/sway/window.hpp @@ -13,14 +13,14 @@ namespace waybar::modules::sway { class Window : public ALabel { public: - Window(waybar::Bar&, const Json::Value&); + Window(const waybar::Bar&, const Json::Value&); auto update() -> void; private: void worker(); std::tuple getFocusedNode(Json::Value nodes); void getFocusedWindow(); - Bar& bar_; + const Bar& bar_; waybar::util::SleeperThread thread_; util::JsonParser parser_; Ipc ipc_; diff --git a/include/modules/sway/workspaces.hpp b/include/modules/sway/workspaces.hpp index 982d10bb..a8208774 100644 --- a/include/modules/sway/workspaces.hpp +++ b/include/modules/sway/workspaces.hpp @@ -12,7 +12,7 @@ namespace waybar::modules::sway { class Workspaces : public IModule { public: - Workspaces(waybar::Bar&, const Json::Value&); + Workspaces(const waybar::Bar&, const Json::Value&); auto update() -> void; operator Gtk::Widget &(); private: @@ -23,7 +23,7 @@ class Workspaces : public IModule { std::string getPrevWorkspace(); std::string getNextWorkspace(); - Bar& bar_; + const Bar& bar_; const Json::Value& config_; waybar::util::SleeperThread thread_; Gtk::Box box_; diff --git a/src/factory.cpp b/src/factory.cpp index 5db627e1..923cf4d5 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -1,6 +1,6 @@ #include "factory.hpp" -waybar::Factory::Factory(Bar& bar, const Json::Value& config) +waybar::Factory::Factory(const Bar& bar, const Json::Value& config) : bar_(bar), config_(config) {} diff --git a/src/modules/sni/tray.cpp b/src/modules/sni/tray.cpp index 4b8f9eb2..ffc59057 100644 --- a/src/modules/sni/tray.cpp +++ b/src/modules/sni/tray.cpp @@ -2,8 +2,8 @@ #include -waybar::modules::SNI::Tray::Tray(Bar& bar, const Json::Value &config) - : config_(config), watcher_(), host_(bar.nb_tray_hosts, config, +waybar::modules::SNI::Tray::Tray(const Bar& bar, const Json::Value &config) + : config_(config), watcher_(), host_(nb_hosts_, config, std::bind(&Tray::onAdd, this, std::placeholders::_1), std::bind(&Tray::onRemove, this, std::placeholders::_1)) { @@ -11,7 +11,7 @@ waybar::modules::SNI::Tray::Tray(Bar& bar, const Json::Value &config) if (config_["spacing"].isUInt()) { box_.set_spacing(config_["spacing"].asUInt()); } - bar.nb_tray_hosts += 1; + nb_hosts_ += 1; } void waybar::modules::SNI::Tray::onAdd(std::unique_ptr& item) diff --git a/src/modules/sway/mode.cpp b/src/modules/sway/mode.cpp index 3bb99241..0d2bbee7 100644 --- a/src/modules/sway/mode.cpp +++ b/src/modules/sway/mode.cpp @@ -1,6 +1,6 @@ #include "modules/sway/mode.hpp" -waybar::modules::sway::Mode::Mode(Bar& bar, const Json::Value& config) +waybar::modules::sway::Mode::Mode(const Bar& bar, const Json::Value& config) : ALabel(config, "{}"), bar_(bar) { ipc_.connect(); diff --git a/src/modules/sway/window.cpp b/src/modules/sway/window.cpp index 7fc146c7..067487cf 100644 --- a/src/modules/sway/window.cpp +++ b/src/modules/sway/window.cpp @@ -1,6 +1,6 @@ #include "modules/sway/window.hpp" -waybar::modules::sway::Window::Window(Bar &bar, const Json::Value& config) +waybar::modules::sway::Window::Window(const Bar &bar, const Json::Value& config) : ALabel(config, "{}"), bar_(bar), windowId_(-1) { label_.set_name("window"); diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp index 1eb815d2..d3e42e37 100644 --- a/src/modules/sway/workspaces.cpp +++ b/src/modules/sway/workspaces.cpp @@ -1,6 +1,6 @@ #include "modules/sway/workspaces.hpp" -waybar::modules::sway::Workspaces::Workspaces(Bar& bar, +waybar::modules::sway::Workspaces::Workspaces(const Bar& bar, const Json::Value& config) : bar_(bar), config_(config), scrolling_(false) {