From 4783e45ab76a0a60866fe675adcd6fbabee95abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 7 Nov 2016 15:57:00 +0100 Subject: [PATCH] [libkwineffects] Remove EffectsHandler::registerPropertyType Summary: There is no effect using this method. As it's X11 specific it should be removed. Internally the EffectsHandlerImpl still requires the method. Thus it's moved into the private part. Reviewers: #kwin, #plasma_on_wayland Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D3297 --- autotests/mock_effectshandler.h | 1 - effects.h | 2 +- libkwineffects/kwineffects.h | 7 ------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/autotests/mock_effectshandler.h b/autotests/mock_effectshandler.h index 5f9467f70f..38558928bd 100644 --- a/autotests/mock_effectshandler.h +++ b/autotests/mock_effectshandler.h @@ -175,7 +175,6 @@ public: void registerAxisShortcut(Qt::KeyboardModifiers, KWin::PointerAxisDirection, QAction *) override {} void registerGlobalShortcut(const QKeySequence &, QAction *) override {} void registerPointerShortcut(Qt::KeyboardModifiers, Qt::MouseButton, QAction *) override {} - void registerPropertyType(long int, bool) override {} void reloadEffect(KWin::Effect *) override {} void removeSupportProperty(const QByteArray &, KWin::Effect *) override {} void reserveElectricBorder(KWin::ElectricBorder, KWin::Effect *) override {} diff --git a/effects.h b/effects.h index 9559fdddab..564a6b2ff0 100644 --- a/effects.h +++ b/effects.h @@ -174,7 +174,6 @@ public: unsigned long xrenderBufferPicture() override; QPainter* scenePainter() override; void reconfigure() override; - void registerPropertyType(long atom, bool reg) override; QByteArray readRootProperty(long atom, long type, int format) const override; xcb_atom_t announceSupportProperty(const QByteArray& propertyName, Effect* effect) override; void removeSupportProperty(const QByteArray& propertyName, Effect* effect) override; @@ -287,6 +286,7 @@ protected: int next_window_quad_type; private: + void registerPropertyType(long atom, bool reg); typedef QVector< Effect*> EffectsList; typedef EffectsList::const_iterator EffectsIterator; EffectsList m_activeEffects; diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h index 44b49d230e..d92984d162 100644 --- a/libkwineffects/kwineffects.h +++ b/libkwineffects/kwineffects.h @@ -1056,13 +1056,6 @@ public: virtual QPainter *scenePainter() = 0; virtual void reconfigure() = 0; - /** - Makes KWin core watch PropertyNotify events for the given atom, - or stops watching if reg is false (must be called the same number - of times as registering). Events are sent using Effect::propertyNotify(). - Note that even events that haven't been registered for can be received. - */ - virtual void registerPropertyType(long atom, bool reg) = 0; virtual QByteArray readRootProperty(long atom, long type, int format) const = 0; /** * @brief Announces support for the feature with the given name. If no other Effect