yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[libkwineffects] Remove EffectsHandler::registerPropertyType

Browse source 
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
This commit is contained in:
Martin Gräßlin 2016-11-07 15:57:00 +01:00
parent 40ad7ef4e9
commit 4783e45ab7
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autotests/mock_effectshandler.h
View file

@ -175,7 +175,6 @@ public:
void registerAxisShortcut(Qt::KeyboardModifiers, KWin::PointerAxisDirection, QAction *) override {} void registerAxisShortcut(Qt::KeyboardModifiers, KWin::PointerAxisDirection, QAction *) override {}
void registerGlobalShortcut(const QKeySequence &, QAction *) override {} void registerGlobalShortcut(const QKeySequence &, QAction *) override {}
void registerPointerShortcut(Qt::KeyboardModifiers, Qt::MouseButton, QAction *) override {} void registerPointerShortcut(Qt::KeyboardModifiers, Qt::MouseButton, QAction *) override {}
void registerPropertyType(long int, bool) override {}
void reloadEffect(KWin::Effect *) override {} void reloadEffect(KWin::Effect *) override {}
void removeSupportProperty(const QByteArray &, KWin::Effect *) override {} void removeSupportProperty(const QByteArray &, KWin::Effect *) override {}
void reserveElectricBorder(KWin::ElectricBorder, KWin::Effect *) override {} void reserveElectricBorder(KWin::ElectricBorder, KWin::Effect *) override {}

2
effects.h
View file

@ -174,7 +174,6 @@ public:
unsigned long xrenderBufferPicture() override; unsigned long xrenderBufferPicture() override;
QPainter* scenePainter() override; QPainter* scenePainter() override;
void reconfigure() override; void reconfigure() override;
void registerPropertyType(long atom, bool reg) override;
QByteArray readRootProperty(long atom, long type, int format) const override; QByteArray readRootProperty(long atom, long type, int format) const override;
xcb_atom_t announceSupportProperty(const QByteArray& propertyName, Effect* effect) override; xcb_atom_t announceSupportProperty(const QByteArray& propertyName, Effect* effect) override;
void removeSupportProperty(const QByteArray& propertyName, Effect* effect) override; void removeSupportProperty(const QByteArray& propertyName, Effect* effect) override;
@ -287,6 +286,7 @@ protected:
int next_window_quad_type; int next_window_quad_type;
private: private:
void registerPropertyType(long atom, bool reg);
typedef QVector< Effect*> EffectsList; typedef QVector< Effect*> EffectsList;
typedef EffectsList::const_iterator EffectsIterator; typedef EffectsList::const_iterator EffectsIterator;
EffectsList m_activeEffects; EffectsList m_activeEffects;

7
libkwineffects/kwineffects.h
View file

@ -1056,13 +1056,6 @@ public:
virtual QPainter *scenePainter() = 0; virtual QPainter *scenePainter() = 0;
virtual void reconfigure() = 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; 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 * @brief Announces support for the feature with the given name. If no other Effect