From 8e89308a333173026acfc47bd4df00a4d1524024 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 13 Jan 2020 18:53:11 +0200 Subject: [PATCH] [plugins/windowsystem] Fix compilation with no-deprecated build of KWindowSystem Summary: This change ensures that KWin can be built with a version of KWS that doesn't have any deprecated stuff. I assume that no distro ships such builds of KWS and it's only a developer thing. I didn't backport KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE macro because the next release of Plasma (5.18) depends on KF 5.66. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D26642 --- plugins/windowsystem/windoweffects.cpp | 2 ++ plugins/windowsystem/windoweffects.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/plugins/windowsystem/windoweffects.cpp b/plugins/windowsystem/windoweffects.cpp index c06ca43bf1..2d18fe7758 100644 --- a/plugins/windowsystem/windoweffects.cpp +++ b/plugins/windowsystem/windoweffects.cpp @@ -144,9 +144,11 @@ void WindowEffects::enableBackgroundContrast(WId window, bool enable, qreal cont } } +#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 67) void WindowEffects::markAsDashboard(WId window) { Q_UNUSED(window) } +#endif } diff --git a/plugins/windowsystem/windoweffects.h b/plugins/windowsystem/windoweffects.h index 7acd3406c4..67ee567cd0 100644 --- a/plugins/windowsystem/windoweffects.h +++ b/plugins/windowsystem/windoweffects.h @@ -41,7 +41,9 @@ public: void highlightWindows(WId controller, const QList &ids) override; void enableBlurBehind(WId window, bool enable = true, const QRegion ®ion = QRegion()) override; void enableBackgroundContrast(WId window, bool enable = true, qreal contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion = QRegion()) override; +#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 67) void markAsDashboard(WId window) override; +#endif }; }