Merge pull request #2926 from alebastr/meson-cleanup

build: refactorings and deprecation fixes

include/factory.hpp

@@ -13,8 +13,10 @@
 #include "modules/sway/window.hpp"
 #include "modules/sway/workspaces.hpp"
 #endif
-#ifdef HAVE_WLR
+#ifdef HAVE_WLR_TASKBAR
 #include "modules/wlr/taskbar.hpp"
+#endif
+#ifdef HAVE_WLR_WORKSPACES
 #include "modules/wlr/workspace_manager.hpp"
 #endif
 #ifdef HAVE_RIVER
@@ -33,7 +35,7 @@
 #include "modules/hyprland/window.hpp"
 #include "modules/hyprland/workspaces.hpp"
 #endif
-#if defined(__FreeBSD__) || (defined(__linux__) && !defined(NO_FILESYSTEM))
+#if defined(__FreeBSD__) || defined(__linux__)
 #include "modules/battery.hpp"
 #endif
 #if defined(HAVE_CPU_LINUX) || defined(HAVE_CPU_BSD)
@@ -80,8 +82,10 @@
 #ifdef HAVE_LIBSNDIO
 #include "modules/sndio.hpp"
 #endif
-#ifdef HAVE_GIO_UNIX
+#if defined(__linux__)
 #include "modules/bluetooth.hpp"
+#endif
+#ifdef HAVE_LOGIND_INHIBITOR
 #include "modules/inhibitor.hpp"
 #endif
 #ifdef HAVE_LIBJACK

include/modules/battery.hpp

@@ -1,11 +1,8 @@
 #pragma once
 
-#ifdef FILESYSTEM_EXPERIMENTAL
-#include <experimental/filesystem>
-#else
-#include <filesystem>
-#endif
 #include <fmt/format.h>
+
+#include <filesystem>
 #if defined(__linux__)
 #include <sys/inotify.h>
 #endif
@@ -21,11 +18,7 @@
 
 namespace waybar::modules {
 
-#ifdef FILESYSTEM_EXPERIMENTAL
-namespace fs = std::experimental::filesystem;
-#else
 namespace fs = std::filesystem;
-#endif
 
 class Battery : public ALabel {
  public:

include/util/css_reload_helper.hpp

@@ -16,6 +16,8 @@ class CssReloadHelper {
  public:
   CssReloadHelper(std::string cssFile, std::function<void()> callback);
 
+  virtual ~CssReloadHelper() = default;
+
   virtual void monitorChanges();
 
  protected: