From 89283c4cc6dd66250205b0a6a7bc497caa168e9e Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Fri, 3 Feb 2023 22:18:10 +0200 Subject: [PATCH] effects: Drop support for effect proxy'ing It's not used by any effect. We use other means to share functionality between effects now. --- src/effects.cpp | 11 ----------- src/effects.h | 1 - src/libkwineffects/kwineffects.cpp | 5 ----- src/libkwineffects/kwineffects.h | 11 ----------- 4 files changed, 28 deletions(-) diff --git a/src/effects.cpp b/src/effects.cpp index 9240cf4287..c3aadb95f1 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -819,17 +819,6 @@ void EffectsHandlerImpl::registerTouchscreenSwipeShortcut(SwipeDirection directi input()->registerTouchscreenSwipeShortcut(direction, fingerCount, action, progressCallback); } -void *EffectsHandlerImpl::getProxy(QString name) -{ - for (QVector::const_iterator it = loaded_effects.constBegin(); it != loaded_effects.constEnd(); ++it) { - if ((*it).first == name) { - return (*it).second->proxy(); - } - } - - return nullptr; -} - void EffectsHandlerImpl::startMousePolling() { if (Cursors::self()->mouse()) { diff --git a/src/effects.h b/src/effects.h index 29e748d74d..46ddae7c26 100644 --- a/src/effects.h +++ b/src/effects.h @@ -105,7 +105,6 @@ public: void registerTouchpadSwipeShortcut(SwipeDirection dir, uint fingerCount, QAction *onUp, std::function progressCallback) override; void registerTouchpadPinchShortcut(PinchDirection dir, uint fingerCount, QAction *onUp, std::function progressCallback) override; void registerTouchscreenSwipeShortcut(SwipeDirection direction, uint fingerCount, QAction *action, std::function progressCallback) override; - void *getProxy(QString name) override; void startMousePolling() override; void stopMousePolling() override; EffectWindow *findWindow(WId id) const override; diff --git a/src/libkwineffects/kwineffects.cpp b/src/libkwineffects/kwineffects.cpp index 010876e59e..708467bb05 100644 --- a/src/libkwineffects/kwineffects.cpp +++ b/src/libkwineffects/kwineffects.cpp @@ -469,11 +469,6 @@ void Effect::reconfigure(ReconfigureFlags) { } -void *Effect::proxy() -{ - return nullptr; -} - void Effect::windowInputMouseEvent(QEvent *) { } diff --git a/src/libkwineffects/kwineffects.h b/src/libkwineffects/kwineffects.h index 682e62dd85..4fd90680f8 100644 --- a/src/libkwineffects/kwineffects.h +++ b/src/libkwineffects/kwineffects.h @@ -360,11 +360,6 @@ public: */ virtual void reconfigure(ReconfigureFlags flags); - /** - * Called when another effect requests the proxy for this effect. - */ - virtual void *proxy(); - /** * Called before starting to paint the screen. * In this method you can: @@ -922,12 +917,6 @@ public: */ virtual void registerTouchscreenSwipeShortcut(SwipeDirection direction, uint fingerCount, QAction *action, std::function progressCallback) = 0; - /** - * Retrieve the proxy class for an effect if it has one. Will return NULL if - * the effect isn't loaded or doesn't have a proxy class. - */ - virtual void *getProxy(QString name) = 0; - // Mouse polling virtual void startMousePolling() = 0; virtual void stopMousePolling() = 0;