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

CC: Remove unnecessary init/uninit CC methods

Browse source
This commit is contained in:
Casian Andrei 2012-09-23 15:32:58 +03:00
parent b17071555d
commit f219c108bb
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scene_opengl.cpp
View file

@ -429,9 +429,13 @@ bool SceneOpenGL2::supported(OpenGLBackend *backend)
SceneOpenGL2::SceneOpenGL2(OpenGLBackend *backend) SceneOpenGL2::SceneOpenGL2(OpenGLBackend *backend)
: SceneOpenGL(Workspace::self(), backend) : SceneOpenGL(Workspace::self(), backend)
, m_colorCorrection(NULL) , m_colorCorrection(new ColorCorrection(this))
{ {
initColorCorrection(); // NOTE is this the right place? // Initialize color correction before the shaders
kDebug(1212) << "Color correction:" << options->isColorCorrected();
m_colorCorrection->setEnabled(options->isColorCorrected());
connect(m_colorCorrection, SIGNAL(changed()), Compositor::self(), SLOT(addRepaintFull()));
connect(options, SIGNAL(colorCorrectedChanged()), this, SLOT(slotColorCorrectedChanged()));
if (!ShaderManager::instance()->isValid()) { if (!ShaderManager::instance()->isValid()) {
kDebug(1212) << "No Scene Shaders available"; kDebug(1212) << "No Scene Shaders available";
@ -451,7 +455,6 @@ SceneOpenGL2::SceneOpenGL2(OpenGLBackend *backend)
SceneOpenGL2::~SceneOpenGL2() SceneOpenGL2::~SceneOpenGL2()
{ {
uninitColorCorrection();
} }
void SceneOpenGL2::paintGenericScreen(int mask, ScreenPaintData data) void SceneOpenGL2::paintGenericScreen(int mask, ScreenPaintData data)
@ -523,15 +526,6 @@ ColorCorrection *SceneOpenGL2::colorCorrection()
return m_colorCorrection; return m_colorCorrection;
} }
void SceneOpenGL2::initColorCorrection()
{
kDebug(1212) << "Color correction:" << options->isColorCorrected();
m_colorCorrection = new ColorCorrection(this);
m_colorCorrection->setEnabled(options->isColorCorrected());
connect(m_colorCorrection, SIGNAL(changed()), Compositor::self(), SLOT(addRepaintFull()));
connect(options, SIGNAL(colorCorrectedChanged()), this, SLOT(slotColorCorrectedChanged()));
}
void SceneOpenGL2::slotColorCorrectedChanged() void SceneOpenGL2::slotColorCorrectedChanged()
{ {
m_colorCorrection->setEnabled(options->isColorCorrected()); m_colorCorrection->setEnabled(options->isColorCorrected());
@ -541,12 +535,6 @@ void SceneOpenGL2::slotColorCorrectedChanged()
ShaderManager::instance(); ShaderManager::instance();
} }
void SceneOpenGL2::uninitColorCorrection()
{
kDebug(1212);
disconnect(options, SIGNAL(colorCorrectedChanged()), Compositor::self(), SLOT(slotReinitialize()));
}
//**************************************** //****************************************
// SceneOpenGL1 // SceneOpenGL1
//**************************************** //****************************************

2
scene_opengl.h
View file

@ -108,8 +108,6 @@ private Q_SLOTS:
void slotColorCorrectedChanged(); void slotColorCorrectedChanged();
private: private:
void initColorCorrection();
void uninitColorCorrection();
void performPaintWindow(EffectWindowImpl* w, int mask, QRegion region, WindowPaintData& data); void performPaintWindow(EffectWindowImpl* w, int mask, QRegion region, WindowPaintData& data);
private: private: