From beee22a95ed9044950e5486f22edd813e00ffa2c Mon Sep 17 00:00:00 2001 From: Kamikadze <40305144+Kam1k4dze@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:44:56 +0500 Subject: refactor: Use new hyprutils casts (#11377) --- src/protocols/XDGShell.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/protocols/XDGShell.cpp') diff --git a/src/protocols/XDGShell.cpp b/src/protocols/XDGShell.cpp index 488ff6f1..55945cb9 100644 --- a/src/protocols/XDGShell.cpp +++ b/src/protocols/XDGShell.cpp @@ -99,7 +99,7 @@ Vector2D CXDGPopupResource::accumulateParentOffset() { } SP CXDGPopupResource::fromResource(wl_resource* res) { - auto data = (CXDGPopupResource*)(((CXdgPopup*)wl_resource_get_user_data(res))->data()); + auto data = sc(sc(wl_resource_get_user_data(res))->data()); return data ? data->m_self.lock() : nullptr; } @@ -146,9 +146,9 @@ CXDGToplevelResource::CXDGToplevelResource(SP resource_, SPversion() >= 5) { wl_array arr; wl_array_init(&arr); - auto p = (uint32_t*)wl_array_add(&arr, sizeof(uint32_t)); + auto p = sc(wl_array_add(&arr, sizeof(uint32_t))); *p = XDG_TOPLEVEL_WM_CAPABILITIES_FULLSCREEN; - p = (uint32_t*)wl_array_add(&arr, sizeof(uint32_t)); + p = sc(wl_array_add(&arr, sizeof(uint32_t))); *p = XDG_TOPLEVEL_WM_CAPABILITIES_MAXIMIZE; m_resource->sendWmCapabilities(&arr); wl_array_release(&arr); @@ -239,7 +239,7 @@ CXDGToplevelResource::~CXDGToplevelResource() { } SP CXDGToplevelResource::fromResource(wl_resource* res) { - auto data = (CXDGToplevelResource*)(((CXdgToplevel*)wl_resource_get_user_data(res))->data()); + auto data = sc(sc(wl_resource_get_user_data(res))->data()); return data ? data->m_self.lock() : nullptr; } @@ -491,12 +491,12 @@ bool CXDGSurfaceResource::good() { } SP CXDGSurfaceResource::fromResource(wl_resource* res) { - auto data = (CXDGSurfaceResource*)(((CXdgSurface*)wl_resource_get_user_data(res))->data()); + auto data = sc(sc(wl_resource_get_user_data(res))->data()); return data ? data->m_self.lock() : nullptr; } static void onConfigure(void* data) { - ((CXDGSurfaceResource*)data)->configure(); + sc(data)->configure(); } uint32_t CXDGSurfaceResource::scheduleConfigure() { @@ -547,14 +547,14 @@ CXDGPositionerResource::CXDGPositionerResource(SP resource_, SP< m_resource->setSetGravity([this](CXdgPositioner* r, xdgPositionerGravity g) { m_state.setGravity(g); }); - m_resource->setSetConstraintAdjustment([this](CXdgPositioner* r, xdgPositionerConstraintAdjustment a) { m_state.constraintAdjustment = (uint32_t)a; }); + m_resource->setSetConstraintAdjustment([this](CXdgPositioner* r, xdgPositionerConstraintAdjustment a) { m_state.constraintAdjustment = sc(a); }); // TODO: support this shit better. The current impl _works_, but is lacking and could be wrong in a few cases. // doesn't matter _that_ much for now, though. } SP CXDGPositionerResource::fromResource(wl_resource* res) { - auto data = (CXDGPositionerResource*)(((CXdgPositioner*)wl_resource_get_user_data(res))->data()); + auto data = sc(sc(wl_resource_get_user_data(res))->data()); return data ? data->m_self.lock() : nullptr; } -- cgit v1.2.3