internal: move to hyprutils' scopeguard

bumps hyprutils dep to 0.2.2
hyprwm · Sep 20, 2024 · 9232bc2 · 9232bc2
1 parent db0b764
commit 9232bc2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,7 +114,7 @@ pkg_check_modules(
   gio-2.0
   hyprlang>=0.3.2
   hyprcursor>=0.1.7
-  hyprutils>=0.2.1)
+  hyprutils>=0.2.2)
 
 find_package(hyprwayland-scanner 0.3.10 REQUIRED)
 

diff --git a/flake.lock b/flake.lock
diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp
@@ -2,7 +2,6 @@
 #include "MiscFunctions.hpp"
 #include "math/Math.hpp"
 #include "sync/SyncReleaser.hpp"
-#include "ScopeGuard.hpp"
 #include "../Compositor.hpp"
 #include "../config/ConfigValue.hpp"
 #include "../protocols/GammaControl.hpp"
@@ -17,7 +16,9 @@
 #include "sync/SyncTimeline.hpp"
 #include <aquamarine/output/Output.hpp>
 #include <hyprutils/string/String.hpp>
+#include <hyprutils/utils/ScopeGuard.hpp>
 using namespace Hyprutils::String;
+using namespace Hyprutils::Utils;
 
 int ratHandler(void* data) {
     g_pHyprRenderer->renderMonitor((CMonitor*)data);

diff --git a/src/helpers/ScopeGuard.cpp b/src/helpers/ScopeGuard.cpp
diff --git a/src/helpers/ScopeGuard.hpp b/src/helpers/ScopeGuard.hpp
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
@@ -1,7 +1,6 @@
 #include "Renderer.hpp"
 #include "../Compositor.hpp"
 #include "../helpers/math/Math.hpp"
-#include "../helpers/ScopeGuard.hpp"
 #include "../helpers/sync/SyncReleaser.hpp"
 #include <algorithm>
 #include <aquamarine/output/Output.hpp>
@@ -23,6 +22,9 @@
 #include "../helpers/sync/SyncTimeline.hpp"
 #include "debug/Log.hpp"
 
+#include <hyprutils/utils/ScopeGuard.hpp>
+using namespace Hyprutils::Utils;
+
 extern "C" {
 #include <xf86drm.h>
 }