From 99411ce7b1dd85e356d5dcade9e3760b58568ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Wed, 21 Nov 2012 14:42:21 +0100
Subject: [PATCH] Merge CubeEffect::loadConfig with reconfigure

Only called from inside reconfigure and reconfigure does nothing else
than calling loadConfig.
---
 effects/cube/cube.cpp | 5 -----
 effects/cube/cube.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/effects/cube/cube.cpp b/effects/cube/cube.cpp
index 965c9b93a2..6afbb98d3b 100644
--- a/effects/cube/cube.cpp
+++ b/effects/cube/cube.cpp
@@ -119,11 +119,6 @@ bool CubeEffect::supported()
 }
 
 void CubeEffect::reconfigure(ReconfigureFlags)
-{
-    loadConfig("Cube");
-}
-
-void CubeEffect::loadConfig(QString config)
 {
     CubeConfig::self()->readConfig();
     foreach (ElectricBorder border, borderActivate) {
diff --git a/effects/cube/cube.h b/effects/cube/cube.h
index e68aafe98c..4a1cd26988 100644
--- a/effects/cube/cube.h
+++ b/effects/cube/cube.h
@@ -165,7 +165,6 @@ private:
     void paintCylinderCap();
     void paintSphereCap();
     bool loadShader();
-    void loadConfig(QString config);
     void rotateCube();
     void rotateToDesktop(int desktop);
     void setActive(bool active);