From 23f3b2a571392b48f1c48a504c24408af38a56ae Mon Sep 17 00:00:00 2001 From: Casian Andrei Date: Mon, 27 Aug 2012 15:41:46 +0300 Subject: [PATCH] CC: Rename performPaint to performPaintWindow and make it non-virtual --- scene_opengl.cpp | 6 +++--- scene_opengl.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scene_opengl.cpp b/scene_opengl.cpp index dc1c372a6d..668453a1d7 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -219,14 +219,14 @@ void SceneOpenGL::finalDrawWindow(EffectWindowImpl* w, int mask, QRegion region, regionForScreen = region.intersected(Workspace::self()->screenGeometry(screen)); data.setScreen(screen); - performPaint(w, mask, regionForScreen, data); + performPaintWindow(w, mask, regionForScreen, data); } } else { - performPaint(w, mask, region, data); + performPaintWindow(w, mask, region, data); } } -void SceneOpenGL::performPaint(EffectWindowImpl* w, int mask, QRegion region, WindowPaintData& data) +void SceneOpenGL::performPaintWindow(EffectWindowImpl* w, int mask, QRegion region, WindowPaintData& data) { if (mask & PAINT_WINDOW_LANCZOS) { if (lanczos_filter.isNull()) { diff --git a/scene_opengl.h b/scene_opengl.h index 68406b2766..b92f40f013 100644 --- a/scene_opengl.h +++ b/scene_opengl.h @@ -57,7 +57,6 @@ protected: virtual void paintGenericScreen(int mask, ScreenPaintData data); virtual void paintBackground(QRegion region); virtual void finalDrawWindow(EffectWindowImpl* w, int mask, QRegion region, WindowPaintData& data); - virtual void performPaint(EffectWindowImpl* w, int mask, QRegion region, WindowPaintData& data); QMatrix4x4 transformation(int mask, const ScreenPaintData &data) const; public Q_SLOTS: virtual void windowOpacityChanged(KWin::Toplevel* c); @@ -75,6 +74,7 @@ private: void setupModelViewProjectionMatrix(); #endif void flushBuffer(int mask, QRegion damage); + void performPaintWindow(EffectWindowImpl* w, int mask, QRegion region, WindowPaintData& data); GC gcroot; class FBConfigInfo {