From 614b20d0736bb5ea04f3b4d4305d7cbd32fe6b9d Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Sun, 18 Feb 2024 23:28:35 -0800
Subject: [PATCH] refactor: move all module includes to factory.cpp

None of these includes are required in the header.

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
---
 include/factory.hpp | 105 ++----------------------------------------
 src/factory.cpp     | 109 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/include/factory.hpp b/include/factory.hpp
index 9ce680d7..f805aab5 100644
--- a/include/factory.hpp
+++ b/include/factory.hpp
@@ -1,110 +1,13 @@
 #pragma once
 
 #include <json/json.h>
-#if defined(HAVE_CHRONO_TIMEZONES) || defined(HAVE_LIBDATE)
-#include "modules/clock.hpp"
-#else
-#include "modules/simpleclock.hpp"
-#endif
-#ifdef HAVE_SWAY
-#include "modules/sway/language.hpp"
-#include "modules/sway/mode.hpp"
-#include "modules/sway/scratchpad.hpp"
-#include "modules/sway/window.hpp"
-#include "modules/sway/workspaces.hpp"
-#endif
-#ifdef HAVE_WLR
-#include "modules/wlr/taskbar.hpp"
-#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"
-#endif
-#ifdef HAVE_DWL
-#include "modules/dwl/tags.hpp"
-#endif
-#ifdef HAVE_HYPRLAND
-#include "modules/hyprland/backend.hpp"
-#include "modules/hyprland/language.hpp"
-#include "modules/hyprland/submap.hpp"
-#include "modules/hyprland/window.hpp"
-#include "modules/hyprland/workspaces.hpp"
-#endif
-#if defined(__FreeBSD__) || (defined(__linux__) && !defined(NO_FILESYSTEM))
-#include "modules/battery.hpp"
-#endif
-#if defined(HAVE_CPU_LINUX) || defined(HAVE_CPU_BSD)
-#include "modules/cpu.hpp"
-#include "modules/cpu_frequency.hpp"
-#include "modules/cpu_usage.hpp"
-#include "modules/load.hpp"
-#endif
-#include "modules/idle_inhibitor.hpp"
-#if defined(HAVE_MEMORY_LINUX) || defined(HAVE_MEMORY_BSD)
-#include "modules/memory.hpp"
-#endif
-#include "modules/disk.hpp"
-#ifdef HAVE_DBUSMENU
-#include "modules/sni/tray.hpp"
-#endif
-#ifdef HAVE_MPRIS
-#include "modules/mpris/mpris.hpp"
-#endif
-#ifdef HAVE_LIBNL
-#include "modules/network.hpp"
-#endif
-#ifdef HAVE_LIBUDEV
-#include "modules/backlight.hpp"
-#endif
-#ifdef HAVE_LIBEVDEV
-#include "modules/keyboard_state.hpp"
-#endif
-#ifdef HAVE_GAMEMODE
-#include "modules/gamemode.hpp"
-#endif
-#ifdef HAVE_UPOWER
-#include "modules/upower/upower.hpp"
-#endif
-#ifdef HAVE_PIPEWIRE
-#include "modules/privacy/privacy.hpp"
-#endif
-#ifdef HAVE_LIBPULSE
-#include "modules/pulseaudio.hpp"
-#endif
-#ifdef HAVE_LIBMPDCLIENT
-#include "modules/mpd/mpd.hpp"
-#endif
-#ifdef HAVE_LIBSNDIO
-#include "modules/sndio.hpp"
-#endif
-#ifdef HAVE_GIO_UNIX
-#include "modules/bluetooth.hpp"
-#include "modules/inhibitor.hpp"
-#endif
-#ifdef HAVE_LIBJACK
-#include "modules/jack.hpp"
-#endif
-#ifdef HAVE_LIBWIREPLUMBER
-#include "modules/wireplumber.hpp"
-#endif
-#ifdef HAVE_LIBCAVA
-#include "modules/cava.hpp"
-#endif
-#ifdef HAVE_SYSTEMD_MONITOR
-#include "modules/systemd_failed_units.hpp"
-#endif
-#include "bar.hpp"
-#include "modules/cffi.hpp"
-#include "modules/custom.hpp"
-#include "modules/image.hpp"
-#include "modules/temperature.hpp"
-#include "modules/user.hpp"
+
+#include <AModule.hpp>
 
 namespace waybar {
 
+class Bar;
+
 class Factory {
  public:
   Factory(const Bar& bar, const Json::Value& config);
diff --git a/src/factory.cpp b/src/factory.cpp
index 00fc42ed..1275c36c 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -1,12 +1,112 @@
 #include "factory.hpp"
 
-#ifdef HAVE_LIBPULSE
-#include "modules/pulseaudio_slider.hpp"
-#endif
+#include "bar.hpp"
 
+#if defined(HAVE_CHRONO_TIMEZONES) || defined(HAVE_LIBDATE)
+#include "modules/clock.hpp"
+#else
+#include "modules/simpleclock.hpp"
+#endif
+#ifdef HAVE_SWAY
+#include "modules/sway/language.hpp"
+#include "modules/sway/mode.hpp"
+#include "modules/sway/scratchpad.hpp"
+#include "modules/sway/window.hpp"
+#include "modules/sway/workspaces.hpp"
+#endif
+#ifdef HAVE_WLR_TASKBAR
+#include "modules/wlr/taskbar.hpp"
+#endif
+#ifdef HAVE_WLR_WORKSPACES
+#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"
+#endif
+#ifdef HAVE_DWL
+#include "modules/dwl/tags.hpp"
+#endif
+#ifdef HAVE_HYPRLAND
+#include "modules/hyprland/language.hpp"
+#include "modules/hyprland/submap.hpp"
+#include "modules/hyprland/window.hpp"
+#include "modules/hyprland/workspaces.hpp"
+#endif
+#if defined(__FreeBSD__) || defined(__linux__)
+#include "modules/battery.hpp"
+#endif
+#if defined(HAVE_CPU_LINUX) || defined(HAVE_CPU_BSD)
+#include "modules/cpu.hpp"
+#include "modules/cpu_frequency.hpp"
+#include "modules/cpu_usage.hpp"
+#include "modules/load.hpp"
+#endif
+#include "modules/idle_inhibitor.hpp"
+#if defined(HAVE_MEMORY_LINUX) || defined(HAVE_MEMORY_BSD)
+#include "modules/memory.hpp"
+#endif
+#include "modules/disk.hpp"
+#ifdef HAVE_DBUSMENU
+#include "modules/sni/tray.hpp"
+#endif
+#ifdef HAVE_MPRIS
+#include "modules/mpris/mpris.hpp"
+#endif
+#ifdef HAVE_LIBNL
+#include "modules/network.hpp"
+#endif
 #ifdef HAVE_LIBUDEV
+#include "modules/backlight.hpp"
 #include "modules/backlight_slider.hpp"
 #endif
+#ifdef HAVE_LIBEVDEV
+#include "modules/keyboard_state.hpp"
+#endif
+#ifdef HAVE_GAMEMODE
+#include "modules/gamemode.hpp"
+#endif
+#ifdef HAVE_UPOWER
+#include "modules/upower/upower.hpp"
+#endif
+#ifdef HAVE_PIPEWIRE
+#include "modules/privacy/privacy.hpp"
+#endif
+#ifdef HAVE_LIBPULSE
+#include "modules/pulseaudio.hpp"
+#include "modules/pulseaudio_slider.hpp"
+#endif
+#ifdef HAVE_LIBMPDCLIENT
+#include "modules/mpd/mpd.hpp"
+#endif
+#ifdef HAVE_LIBSNDIO
+#include "modules/sndio.hpp"
+#endif
+#if defined(__linux__)
+#include "modules/bluetooth.hpp"
+#endif
+#ifdef HAVE_LOGIND_INHIBITOR
+#include "modules/inhibitor.hpp"
+#endif
+#ifdef HAVE_LIBJACK
+#include "modules/jack.hpp"
+#endif
+#ifdef HAVE_LIBWIREPLUMBER
+#include "modules/wireplumber.hpp"
+#endif
+#ifdef HAVE_LIBCAVA
+#include "modules/cava.hpp"
+#endif
+#ifdef HAVE_SYSTEMD_MONITOR
+#include "modules/systemd_failed_units.hpp"
+#endif
+#include "modules/cffi.hpp"
+#include "modules/custom.hpp"
+#include "modules/image.hpp"
+#include "modules/temperature.hpp"
+#include "modules/user.hpp"
 
 waybar::Factory::Factory(const Bar& bar, const Json::Value& config) : bar_(bar), config_(config) {}
 
@@ -16,6 +116,7 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name,
     auto hash_pos = name.find('#');
     auto ref = name.substr(0, hash_pos);
     auto id = hash_pos != std::string::npos ? name.substr(hash_pos + 1) : "";
+/* gtk4 todo
 #if defined(__FreeBSD__) || (defined(__linux__) && !defined(NO_FILESYSTEM))
     if (ref == "battery") {
       return new waybar::modules::Battery(id, config_[name]);
@@ -214,7 +315,7 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name,
     }
     if (ref.compare(0, 5, "cffi/") == 0 && ref.size() > 5) {
       return new waybar::modules::CFFI(ref.substr(5), id, config_[name]);
-    }
+    }*/
   } catch (const std::exception& e) {
     auto err = fmt::format("Disabling module \"{}\", {}", name, e.what());
     throw std::runtime_error(err);