From 6cf490c9cc32f96efa210a9b632113749b4a71cf Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 18 Apr 2022 11:19:10 +0300 Subject: [PATCH] Remove AbstractClient plumbing casts in PointerInputRedirection --- src/pointer_input.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp index e03ea80684..9ec233ebaf 100644 --- a/src/pointer_input.cpp +++ b/src/pointer_input.cpp @@ -197,9 +197,8 @@ void PointerInputRedirection::updateToReset() setDecoration(nullptr); } if (focus()) { - auto t = focus(); - if (auto c = static_cast(t->isClient() ? t : nullptr)) { - c->pointerLeaveEvent(); + if (focus()->isClient()) { + focus()->pointerLeaveEvent(); } disconnect(m_focusGeometryConnection); m_focusGeometryConnection = QMetaObject::Connection(); @@ -558,16 +557,16 @@ void PointerInputRedirection::cleanupDecoration(Decoration::DecoratedClientImpl void PointerInputRedirection::focusUpdate(AbstractClient *focusOld, AbstractClient *focusNow) { - if (auto ac = static_cast(focusOld && focusOld->isClient() ? focusOld : nullptr)) { - ac->pointerLeaveEvent(); - breakPointerConstraints(ac->surface()); + if (focusOld && focusOld->isClient()) { + focusOld->pointerLeaveEvent(); + breakPointerConstraints(focusOld->surface()); disconnectPointerConstraintsConnection(); } disconnect(m_focusGeometryConnection); m_focusGeometryConnection = QMetaObject::Connection(); - if (auto ac = static_cast(focusNow && focusNow->isClient() ? focusNow : nullptr)) { - ac->pointerEnterEvent(m_pos.toPoint()); + if (focusNow && focusNow->isClient()) { + focusNow->pointerEnterEvent(m_pos.toPoint()); } auto seat = waylandServer()->seat();