From 9b0c6ddef32e86c740654de04ba5ab6286828287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 24 Jun 2013 08:54:41 +0200 Subject: [PATCH] Drop pure virtual Scene::windowOpacityChanged slot It's neither implemented in the XRender nor in the OpenGL Scene. --- scene.h | 2 -- scene_opengl.cpp | 14 -------------- scene_opengl.h | 1 - scene_xrender.cpp | 5 ----- scene_xrender.h | 1 - 5 files changed, 23 deletions(-) diff --git a/scene.h b/scene.h index 1bbf93a834..ca4afb734f 100644 --- a/scene.h +++ b/scene.h @@ -109,8 +109,6 @@ public: public Q_SLOTS: // a window has been destroyed virtual void windowDeleted(KWin::Deleted*) = 0; - // opacity of a window changed - virtual void windowOpacityChanged(KWin::Toplevel* c) = 0; // shape/size of a window changed virtual void windowGeometryShapeChanged(KWin::Toplevel* c) = 0; // a window has been closed diff --git a/scene_opengl.cpp b/scene_opengl.cpp index 31a4abe738..289e1987d6 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -493,7 +493,6 @@ void SceneOpenGL::windowAdded(Toplevel* c) Window *w = createWindow(c); windows[ c ] = w; w->setScene(this); - connect(c, SIGNAL(opacityChanged(KWin::Toplevel*,qreal)), SLOT(windowOpacityChanged(KWin::Toplevel*))); connect(c, SIGNAL(geometryShapeChanged(KWin::Toplevel*,QRect)), SLOT(windowGeometryShapeChanged(KWin::Toplevel*))); connect(c, SIGNAL(windowClosed(KWin::Toplevel*,KWin::Deleted*)), SLOT(windowClosed(KWin::Toplevel*,KWin::Deleted*))); c->effectWindow()->setSceneWindow(windows[ c ]); @@ -533,19 +532,6 @@ void SceneOpenGL::windowGeometryShapeChanged(KWin::Toplevel* c) w->discardShape(); } -void SceneOpenGL::windowOpacityChanged(KWin::Toplevel* t) -{ - Q_UNUSED(t) -#if 0 // not really needed, windows are painted on every repaint - // and opacity is used when applying texture, not when - // creating it - if (!windows.contains(c)) // this is ok, texture is created - return; // on demand - Window* w = windows[ c ]; - w->discardTexture(); -#endif -} - SceneOpenGL::Texture *SceneOpenGL::createTexture() { return new Texture(m_backend); diff --git a/scene_opengl.h b/scene_opengl.h index bfd94b9a6d..d43ee632ae 100644 --- a/scene_opengl.h +++ b/scene_opengl.h @@ -94,7 +94,6 @@ Q_SIGNALS: void resetCompositing(); public Q_SLOTS: - virtual void windowOpacityChanged(KWin::Toplevel* c); virtual void windowGeometryShapeChanged(KWin::Toplevel* c); virtual void windowClosed(KWin::Toplevel* c, KWin::Deleted* deleted); protected: diff --git a/scene_xrender.cpp b/scene_xrender.cpp index 2a699021c4..efb924b422 100644 --- a/scene_xrender.cpp +++ b/scene_xrender.cpp @@ -253,11 +253,6 @@ void SceneXrender::windowGeometryShapeChanged(KWin::Toplevel* c) w->discardShape(); } -void SceneXrender::windowOpacityChanged(KWin::Toplevel* c) -{ - Q_UNUSED(c) -} - void SceneXrender::windowClosed(KWin::Toplevel* c, KWin::Deleted* deleted) { assert(windows.contains(c)); diff --git a/scene_xrender.h b/scene_xrender.h index 0edf890011..5c8e917520 100644 --- a/scene_xrender.h +++ b/scene_xrender.h @@ -55,7 +55,6 @@ protected: virtual void paintGenericScreen(int mask, ScreenPaintData data); virtual void paintDesktop(int desktop, int mask, const QRegion ®ion, ScreenPaintData &data); public Q_SLOTS: - virtual void windowOpacityChanged(KWin::Toplevel* c); virtual void windowGeometryShapeChanged(KWin::Toplevel* c); virtual void windowClosed(KWin::Toplevel* c, KWin::Deleted* deleted); private: