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

DecoratedClientImpl::client returns AbstractClient* instead of Client*

Browse source
This commit is contained in:
Martin Gräßlin 2015-12-03 17:12:25 +01:00
parent ae28c2499d
commit 1758db337f
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
decorations/decoratedclient.h
View file

@ -28,6 +28,7 @@ namespace KWin
{ {
class Client; class Client;
class AbstractClient;
namespace Decoration namespace Decoration
{ {
@ -78,7 +79,7 @@ public:
void requestToggleOnAllDesktops() override; void requestToggleOnAllDesktops() override;
void requestToggleShade() override; void requestToggleShade() override;
Client *client() { AbstractClient *client() {
return m_client; return m_client;
} }
Renderer *renderer() { Renderer *renderer() {
@ -91,7 +92,7 @@ public:
private: private:
void createRenderer(); void createRenderer();
Client *m_client; AbstractClient *m_client;
Renderer *m_renderer; Renderer *m_renderer;
}; };

2
scene_opengl.cpp
View file

@ -2429,7 +2429,7 @@ SceneOpenGLDecorationRenderer::SceneOpenGLDecorationRenderer(Decoration::Decorat
: Renderer(client) : Renderer(client)
, m_texture() , m_texture()
{ {
connect(this, &Renderer::renderScheduled, client->client(), static_cast<void (Client::*)(const QRect&)>(&Client::addRepaint)); connect(this, &Renderer::renderScheduled, client->client(), static_cast<void (AbstractClient::*)(const QRect&)>(&AbstractClient::addRepaint));
} }
SceneOpenGLDecorationRenderer::~SceneOpenGLDecorationRenderer() = default; SceneOpenGLDecorationRenderer::~SceneOpenGLDecorationRenderer() = default;

2
scene_qpainter.cpp
View file

@ -571,7 +571,7 @@ bool SceneQPainterShadow::prepareBackend()
SceneQPainterDecorationRenderer::SceneQPainterDecorationRenderer(Decoration::DecoratedClientImpl *client) SceneQPainterDecorationRenderer::SceneQPainterDecorationRenderer(Decoration::DecoratedClientImpl *client)
: Renderer(client) : Renderer(client)
{ {
connect(this, &Renderer::renderScheduled, client->client(), static_cast<void (Client::*)(const QRect&)>(&Client::addRepaint)); connect(this, &Renderer::renderScheduled, client->client(), static_cast<void (AbstractClient::*)(const QRect&)>(&AbstractClient::addRepaint));
} }
SceneQPainterDecorationRenderer::~SceneQPainterDecorationRenderer() = default; SceneQPainterDecorationRenderer::~SceneQPainterDecorationRenderer() = default;

2
scene_xrender.cpp
View file

@ -1173,7 +1173,7 @@ SceneXRenderDecorationRenderer::SceneXRenderDecorationRenderer(Decoration::Decor
: Renderer(client) : Renderer(client)
, m_gc(XCB_NONE) , m_gc(XCB_NONE)
{ {
connect(this, &Renderer::renderScheduled, client->client(), static_cast<void (Client::*)(const QRect&)>(&Client::addRepaint)); connect(this, &Renderer::renderScheduled, client->client(), static_cast<void (AbstractClient::*)(const QRect&)>(&AbstractClient::addRepaint));
for (int i = 0; i < int(DecorationPart::Count); ++i) { for (int i = 0; i < int(DecorationPart::Count); ++i) {
m_pixmaps[i] = XCB_PIXMAP_NONE; m_pixmaps[i] = XCB_PIXMAP_NONE;
m_pictures[i] = nullptr; m_pictures[i] = nullptr;