mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-05 09:25:58 +01:00
internal: move to hyprutils' scopeguard
bumps hyprutils dep to 0.2.2
This commit is contained in:
parent
db0b764a5a
commit
9232bc2c00
6 changed files with 9 additions and 29 deletions
|
@ -114,7 +114,7 @@ pkg_check_modules(
|
||||||
gio-2.0
|
gio-2.0
|
||||||
hyprlang>=0.3.2
|
hyprlang>=0.3.2
|
||||||
hyprcursor>=0.1.7
|
hyprcursor>=0.1.7
|
||||||
hyprutils>=0.2.1)
|
hyprutils>=0.2.2)
|
||||||
|
|
||||||
find_package(hyprwayland-scanner 0.3.10 REQUIRED)
|
find_package(hyprwayland-scanner 0.3.10 REQUIRED)
|
||||||
|
|
||||||
|
|
|
@ -116,11 +116,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724966483,
|
"lastModified": 1726874949,
|
||||||
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
|
"narHash": "sha256-PNnIpwGqpTvMU3N2r0wMQwK1E+t4Bb5fbJwblQvr+80=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
|
"rev": "d97af4f6bd068c03a518b597675e598f57ea2291",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#include "MiscFunctions.hpp"
|
#include "MiscFunctions.hpp"
|
||||||
#include "math/Math.hpp"
|
#include "math/Math.hpp"
|
||||||
#include "sync/SyncReleaser.hpp"
|
#include "sync/SyncReleaser.hpp"
|
||||||
#include "ScopeGuard.hpp"
|
|
||||||
#include "../Compositor.hpp"
|
#include "../Compositor.hpp"
|
||||||
#include "../config/ConfigValue.hpp"
|
#include "../config/ConfigValue.hpp"
|
||||||
#include "../protocols/GammaControl.hpp"
|
#include "../protocols/GammaControl.hpp"
|
||||||
|
@ -17,7 +16,9 @@
|
||||||
#include "sync/SyncTimeline.hpp"
|
#include "sync/SyncTimeline.hpp"
|
||||||
#include <aquamarine/output/Output.hpp>
|
#include <aquamarine/output/Output.hpp>
|
||||||
#include <hyprutils/string/String.hpp>
|
#include <hyprutils/string/String.hpp>
|
||||||
|
#include <hyprutils/utils/ScopeGuard.hpp>
|
||||||
using namespace Hyprutils::String;
|
using namespace Hyprutils::String;
|
||||||
|
using namespace Hyprutils::Utils;
|
||||||
|
|
||||||
int ratHandler(void* data) {
|
int ratHandler(void* data) {
|
||||||
g_pHyprRenderer->renderMonitor((CMonitor*)data);
|
g_pHyprRenderer->renderMonitor((CMonitor*)data);
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
#include "ScopeGuard.hpp"
|
|
||||||
|
|
||||||
CScopeGuard::CScopeGuard(const std::function<void()>& fn_) : fn(fn_) {
|
|
||||||
;
|
|
||||||
}
|
|
||||||
|
|
||||||
CScopeGuard::~CScopeGuard() {
|
|
||||||
if (fn)
|
|
||||||
fn();
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <functional>
|
|
||||||
|
|
||||||
// calls a function when it goes out of scope
|
|
||||||
class CScopeGuard {
|
|
||||||
public:
|
|
||||||
CScopeGuard(const std::function<void()>& fn_);
|
|
||||||
~CScopeGuard();
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::function<void()> fn;
|
|
||||||
};
|
|
|
@ -1,7 +1,6 @@
|
||||||
#include "Renderer.hpp"
|
#include "Renderer.hpp"
|
||||||
#include "../Compositor.hpp"
|
#include "../Compositor.hpp"
|
||||||
#include "../helpers/math/Math.hpp"
|
#include "../helpers/math/Math.hpp"
|
||||||
#include "../helpers/ScopeGuard.hpp"
|
|
||||||
#include "../helpers/sync/SyncReleaser.hpp"
|
#include "../helpers/sync/SyncReleaser.hpp"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <aquamarine/output/Output.hpp>
|
#include <aquamarine/output/Output.hpp>
|
||||||
|
@ -23,6 +22,9 @@
|
||||||
#include "../helpers/sync/SyncTimeline.hpp"
|
#include "../helpers/sync/SyncTimeline.hpp"
|
||||||
#include "debug/Log.hpp"
|
#include "debug/Log.hpp"
|
||||||
|
|
||||||
|
#include <hyprutils/utils/ScopeGuard.hpp>
|
||||||
|
using namespace Hyprutils::Utils;
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include <xf86drm.h>
|
#include <xf86drm.h>
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue