From ba5432fd52ef69b906c665fb39c8332baf2b78d6 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 17 Aug 2019 22:42:16 +0200 Subject: [PATCH] Remove slideWindow(QWidget*) overload with recent KWindowSystem Test Plan: Fixes the build after https://phabricator.kde.org/D23213 Reviewers: davidedmundson, zzag Reviewed By: zzag Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D23227 --- plugins/windowsystem/windoweffects.cpp | 2 ++ plugins/windowsystem/windoweffects.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/plugins/windowsystem/windoweffects.cpp b/plugins/windowsystem/windoweffects.cpp index eb90f6ee20..c06ca43bf1 100644 --- a/plugins/windowsystem/windoweffects.cpp +++ b/plugins/windowsystem/windoweffects.cpp @@ -81,10 +81,12 @@ void WindowEffects::slideWindow(WId id, KWindowEffects::SlideFromLocation locati w->setProperty("kwin_slide_offset", offset); } +#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 61, 0) void WindowEffects::slideWindow(QWidget *widget, KWindowEffects::SlideFromLocation location) { slideWindow(widget->winId(), location, 0); } +#endif QList WindowEffects::windowSizes(const QList &ids) { diff --git a/plugins/windowsystem/windoweffects.h b/plugins/windowsystem/windoweffects.h index 9f025dd87b..7acd3406c4 100644 --- a/plugins/windowsystem/windoweffects.h +++ b/plugins/windowsystem/windoweffects.h @@ -19,6 +19,7 @@ */ #pragma once #include +#include namespace KWin { @@ -31,7 +32,9 @@ public: bool isEffectAvailable(KWindowEffects::Effect effect) override; void slideWindow(WId id, KWindowEffects::SlideFromLocation location, int offset) override; +#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 61, 0) void slideWindow(QWidget *widget, KWindowEffects::SlideFromLocation location) override; +#endif QList windowSizes(const QList &ids) override; void presentWindows(WId controller, const QList &ids) override; void presentWindows(WId controller, int desktop = NET::OnAllDesktops) override;