From ac66d2536484d507b80dadf7190eebf1e1c7df28 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 10 Jun 2020 19:45:09 +0300 Subject: [PATCH] Drop SurfaceInterface::inputIsInfitine Since we don't guarantee SC and BC in KWaylandServer, we can drop SurfaceInterface::inputIsInfitine(). --- src/wayland/surface_interface.cpp | 5 ----- src/wayland/surface_interface.h | 12 ------------ 2 files changed, 17 deletions(-) diff --git a/src/wayland/surface_interface.cpp b/src/wayland/surface_interface.cpp index 37088c0da1..ce3f6dcf52 100644 --- a/src/wayland/surface_interface.cpp +++ b/src/wayland/surface_interface.cpp @@ -763,11 +763,6 @@ QRegion SurfaceInterface::input() const return d->current.input; } -bool SurfaceInterface::inputIsInfitine() const -{ - return inputIsInfinite(); -} - bool SurfaceInterface::inputIsInfinite() const { Q_D(); diff --git a/src/wayland/surface_interface.h b/src/wayland/surface_interface.h index 0d0a59d7cd..88ec3a4122 100644 --- a/src/wayland/surface_interface.h +++ b/src/wayland/surface_interface.h @@ -144,18 +144,6 @@ public: QRegion damage() const; QRegion opaque() const; QRegion input() const; -#if KWAYLANDSERVER_ENABLE_DEPRECATED_SINCE(5, 5) - /** - * Use Surface::inputIsInfinite instead. - * @deprecated Since 5.5, use inputIsInfinite - */ - KWAYLANDSERVER_DEPRECATED_VERSION(5, 5, "Use SurfaceInterface::inputIsInfinite()") - bool inputIsInfitine() const; -#endif - /** - * Replaces Surface::inputIsInfitine instead. - * @since 5.5 - */ bool inputIsInfinite() const; qint32 scale() const; OutputInterface::Transform transform() const;