From 68759692556989a85dea59df3e63b6452e459d13 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 23 May 2025 14:32:42 -0400 Subject: [PATCH] chore: static_cast to replace reinterpret_cast where possible --- src/lib/platform/EiScreen.h | 2 +- src/lib/platform/PortalInputCapture.cpp | 8 ++++---- src/lib/platform/PortalInputCapture.h | 10 +++++----- src/lib/platform/PortalRemoteDesktop.cpp | 6 +++--- src/lib/platform/PortalRemoteDesktop.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/lib/platform/EiScreen.h b/src/lib/platform/EiScreen.h index 73e51b25f..9e0039f0a 100644 --- a/src/lib/platform/EiScreen.h +++ b/src/lib/platform/EiScreen.h @@ -105,7 +105,7 @@ private: static void cb_handle_ei_log_event(ei *ei, ei_log_priority priority, const char *message, ei_log_context *context) { - auto screen = reinterpret_cast(ei_get_user_data(ei)); + auto screen = static_cast(ei_get_user_data(ei)); screen->handle_ei_log_event(priority, message); } diff --git a/src/lib/platform/PortalInputCapture.cpp b/src/lib/platform/PortalInputCapture.cpp index c800e6395..e97188b6f 100644 --- a/src/lib/platform/PortalInputCapture.cpp +++ b/src/lib/platform/PortalInputCapture.cpp @@ -36,7 +36,7 @@ PortalInputCapture::PortalInputCapture(EiScreen *screen, IEventQueue *events) glib_thread_ = new Thread(new TMethodJob(this, &PortalInputCapture::glib_thread)); auto init_capture_cb = [](gpointer data) -> gboolean { - return reinterpret_cast(data)->init_input_capture_session(); + return static_cast(data)->init_input_capture_session(); }; g_idle_add(init_capture_cb, this); @@ -204,7 +204,7 @@ gboolean PortalInputCapture::init_input_capture_session() static_cast(XDP_INPUT_CAPABILITY_KEYBOARD | XDP_INPUT_CAPABILITY_POINTER), nullptr, // cancellable [](GObject *obj, GAsyncResult *res, gpointer data) { - reinterpret_cast(data)->cb_init_input_capture_session(obj, res); + static_cast(data)->cb_init_input_capture_session(obj, res); }, this ); @@ -262,7 +262,7 @@ void PortalInputCapture::cb_disabled(const XdpInputCaptureSession *session, cons g_timeout_add( 1000, [](gpointer data) -> gboolean { - reinterpret_cast(data)->enable(); + static_cast(data)->enable(); return false; }, this @@ -372,7 +372,7 @@ void PortalInputCapture::cb_zones_changed(XdpInputCaptureSession *session, GVari session_, list, nullptr, // cancellable [](GObject *obj, GAsyncResult *res, gpointer data) { - reinterpret_cast(data)->cb_set_pointer_barriers(obj, res); + static_cast(data)->cb_set_pointer_barriers(obj, res); }, this ); diff --git a/src/lib/platform/PortalInputCapture.h b/src/lib/platform/PortalInputCapture.h index 0fc84fac6..0533bb900 100644 --- a/src/lib/platform/PortalInputCapture.h +++ b/src/lib/platform/PortalInputCapture.h @@ -47,25 +47,25 @@ private: /// g_signal_connect callback wrapper static void cb_session_closed_cb(XdpSession *session, gpointer data) { - reinterpret_cast(data)->cb_session_closed(session); + static_cast(data)->cb_session_closed(session); } static void cb_disabled_cb(XdpInputCaptureSession *session, GVariant *options, gpointer data) { - reinterpret_cast(data)->cb_disabled(session, options); + static_cast(data)->cb_disabled(session, options); } static void cb_activated_cb(XdpInputCaptureSession *session, std::uint32_t activation_id, GVariant *options, gpointer data) { - reinterpret_cast(data)->cb_activated(session, activation_id, options); + static_cast(data)->cb_activated(session, activation_id, options); } static void cb_deactivated_cb(XdpInputCaptureSession *session, std::uint32_t activation_id, GVariant *options, gpointer data) { - reinterpret_cast(data)->cb_deactivated(session, activation_id, options); + static_cast(data)->cb_deactivated(session, activation_id, options); } static void cb_zones_changed_cb(XdpInputCaptureSession *session, GVariant *options, gpointer data) { - reinterpret_cast(data)->cb_zones_changed(session, options); + static_cast(data)->cb_zones_changed(session, options); } int fake_eis_fd() const; diff --git a/src/lib/platform/PortalRemoteDesktop.cpp b/src/lib/platform/PortalRemoteDesktop.cpp index dee405681..2d0ada065 100644 --- a/src/lib/platform/PortalRemoteDesktop.cpp +++ b/src/lib/platform/PortalRemoteDesktop.cpp @@ -57,7 +57,7 @@ gboolean PortalRemoteDesktop::timeout_handler() const void PortalRemoteDesktop::reconnect(unsigned int timeout) { auto init_cb = [](gpointer data) -> gboolean { - return reinterpret_cast(data)->init_remote_desktop_session(); + return static_cast(data)->init_remote_desktop_session(); }; if (timeout > 0) @@ -139,7 +139,7 @@ void PortalRemoteDesktop::cb_init_remote_desktop_session(GObject *object, GAsync nullptr, // parent nullptr, // cancellable [](GObject *obj, GAsyncResult *res, gpointer data) { - reinterpret_cast(data)->cb_session_started(obj, res); + static_cast(data)->cb_session_started(obj, res); }, this ); @@ -153,7 +153,7 @@ gboolean PortalRemoteDesktop::init_remote_desktop_session() XDP_REMOTE_DESKTOP_FLAG_NONE, XDP_CURSOR_MODE_HIDDEN, XDP_PERSIST_MODE_TRANSIENT, session_restore_token_, nullptr, // cancellable [](GObject *obj, GAsyncResult *res, gpointer data) { - reinterpret_cast(data)->cb_init_remote_desktop_session(obj, res); + static_cast(data)->cb_init_remote_desktop_session(obj, res); }, this ); diff --git a/src/lib/platform/PortalRemoteDesktop.h b/src/lib/platform/PortalRemoteDesktop.h index b9c2c0d12..6d7de47ff 100644 --- a/src/lib/platform/PortalRemoteDesktop.h +++ b/src/lib/platform/PortalRemoteDesktop.h @@ -33,7 +33,7 @@ private: /// g_signal_connect callback wrapper static void cb_session_closed_cb(XdpSession *session, gpointer data) { - reinterpret_cast(data)->cb_session_closed(session); + static_cast(data)->cb_session_closed(session); } int fake_eis_fd();