From 8726a7363eb9213235e6e23657668e0daac39a5b Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Fri, 20 Mar 2026 13:52:37 -0400 Subject: config: cleanup the entire config infrastructure (#13785) Massively refactors the config infrastructure, sorely needed and will be req'd for the lua stuff --- src/managers/eventLoop/EventLoopManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/managers/eventLoop/EventLoopManager.cpp') diff --git a/src/managers/eventLoop/EventLoopManager.cpp b/src/managers/eventLoop/EventLoopManager.cpp index e38474aa..b575bcb7 100644 --- a/src/managers/eventLoop/EventLoopManager.cpp +++ b/src/managers/eventLoop/EventLoopManager.cpp @@ -1,7 +1,7 @@ #include "EventLoopManager.hpp" #include "../../debug/log/Logger.hpp" #include "../../Compositor.hpp" -#include "../../config/ConfigWatcher.hpp" +#include "../../config/shared/inotify/ConfigWatcher.hpp" #include #include @@ -55,7 +55,7 @@ static int aquamarineFDWrite(int fd, uint32_t mask, void* data) { } static int configWatcherWrite(int fd, uint32_t mask, void* data) { - g_pConfigWatcher->onInotifyEvent(); + Config::watcher()->onInotifyEvent(); return 0; } @@ -111,7 +111,7 @@ void CEventLoopManager::onFdReadableFail(SReadableWaiter* waiter) { void CEventLoopManager::enterLoop() { m_wayland.eventSource = wl_event_loop_add_fd(m_wayland.loop, m_timers.timerfd.get(), WL_EVENT_READABLE, timerWrite, nullptr); - if (const auto& FD = g_pConfigWatcher->getInotifyFD(); FD.isValid()) + if (const auto& FD = Config::watcher()->getInotifyFD(); FD.isValid()) m_configWatcherInotifySource = wl_event_loop_add_fd(m_wayland.loop, FD.get(), WL_EVENT_READABLE, configWatcherWrite, nullptr); syncPollFDs(); -- cgit v1.2.3