Drop dependency to libplasma from kwineffects library

Since the EffectFrames have been moved into KWin core nothing in the
Effects lib actually used Plasma. The only remaining method is moved
to core as it's not used in the Effects. The Effects itself still
link against Plasma, so nothing changes for them.

The Plasma includes in the kwineffects header seemed to pull in
quite some additional headers, so the includes in some effects have
to be adjusted (most often KConfigGroup). This should speed up the
compilation of the library and the effects.

effects.cpp

@@ -39,6 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kservice.h>
 #include <kservicetypetrader.h>
 #include <kplugininfo.h>
+#include <Plasma/Theme>
 
 #include <assert.h>
 
@@ -1852,4 +1853,9 @@ void EffectFrameImpl::autoResize()
     setGeometry(geometry);
 }
 
+QColor EffectFrameImpl::styledTextColor()
+{
+    return Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor);
+}
+
 } // namespace

effects.h

@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QStack>
 #include <QHash>
+#include <Plasma/FrameSvg>
 
 
 class KService;
@@ -361,6 +362,10 @@ public:
     Plasma::FrameSvg& selectionFrame() {
         return m_selection;
     }
+    /**
+     * The foreground text color as specified by the default Plasma theme.
+     */
+    static QColor styledTextColor();
 
 private Q_SLOTS:
     void plasmaThemeChanged();

effects/blur/blur.cpp

@@ -23,6 +23,7 @@
 #include <X11/Xatom.h>
 
 #include <QMatrix4x4>
+#include <KConfigGroup>
 #include <KDebug>
 
 namespace KWin

effects/dashboard/dashboard.cpp

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #include "dashboard.h"
+#include <KDE/KConfigGroup>
 
 namespace KWin
 {

effects/desktopgrid/desktopgrid.cpp

@@ -37,6 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kglobalsettings.h>
 #include <QtGui/QPainter>
 #include <QtGui/QGraphicsLinearLayout>
+#include <Plasma/FrameSvg>
 #include <Plasma/PushButton>
 #include <Plasma/WindowEffects>
 

effects/desktopgrid/desktopgrid.h

@@ -30,6 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 namespace Plasma
 {
 class PushButton;
+class FrameSvg;
 }
 
 namespace KWin

effects/fallapart/fallapart.cpp

@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 #include <assert.h>
 #include <math.h>
+#include <KDE/KConfigGroup>
 
 namespace KWin
 {

effects/flipswitch/flipswitch.cpp

@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 #include <KAction>
 #include <KActionCollection>
+#include <KLocale>
 
 #include <kwinglutils.h>
 

effects/presentwindows/presentwindows.cpp

@@ -35,6 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QMouseEvent>
 #include <QtGui/QPainter>
 #include <QtGui/QGraphicsLinearLayout>
+#include <Plasma/FrameSvg>
 #include <Plasma/PushButton>
 #include <Plasma/WindowEffects>
 

effects/presentwindows/presentwindows.h

@@ -32,6 +32,7 @@ class QTimer;
 namespace Plasma
 {
 class PushButton;
+class FrameSvg;
 }
 
 namespace KWin

effects/resize/resize.cpp

@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #include <KColorScheme>
+#include <KDE/KConfigGroup>
 
 namespace KWin
 {

effects/showfps/showfps.h

@@ -21,6 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_SHOWFPS_H
 #define KWIN_SHOWFPS_H
 
+#include <QtCore/QTime>
+
 #include <kwineffects.h>
 #include <kwinglutils.h>
 

effects/slidingpopups/slidingpopups.cpp

@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "slidingpopups.h"
 
 #include <kdebug.h>
+#include <KDE/KConfigGroup>
 
 namespace KWin
 {

effects/startupfeedback/startupfeedback.cpp

@@ -22,6 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtCore/QSize>
 #include <QtGui/QPainter>
 // KDE
+#include <KDE/KConfigGroup>
+#include <KDE/KDebug>
 #include <KDE/KGlobal>
 #include <KDE/KIconLoader>
 #include <KDE/KStandardDirs>

effects/trackmouse/trackmouse.cpp

@@ -31,6 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
+#include <KDE/KConfigGroup>
+#include <KDE/KLocale>
 
 #include <math.h>
 

effects/windowgeometry/windowgeometry.cpp

@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwindowsystem.h>
 #include <KActionCollection>
 #include <kaction.h>
+#include <KDE/KLocale>
 
 using namespace KWin;
 

effects/zoom/zoom.cpp

@@ -31,6 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kstandardaction.h>
+#include <KDE/KConfigGroup>
+#include <KDE/KLocale>
 
 #include <kwinglutils.h>
 #include <kwinxrenderutils.h>

effects/zoom/zoom.h

@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_ZOOM_H
 
 #include <kwineffects.h>
+#include <QtCore/QTime>
 
 namespace KWin
 {

lib/CMakeLists.txt

@@ -39,7 +39,7 @@ set(kwin_EFFECTSLIB_SRCS
     )
 
 kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
-target_link_libraries(kwineffects ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTGUI_LIBRARY}
+target_link_libraries(kwineffects ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}
     ${X11_LIBRARIES} kephal)
 set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 

lib/kwineffects.cpp

@@ -1336,9 +1336,4 @@ void EffectFrame::enableCrossFade(bool enable)
     d->crossFading = enable;
 }
 
-QColor EffectFrame::styledTextColor()
-{
-    return Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor);
-}
-
 } // namespace

lib/kwineffects.h

@@ -40,9 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KDE/KPluginFactory>
 #include <KDE/KShortcutsEditor>
 
-#include <KDE/Plasma/FrameSvg>
-#include <KDE/Plasma/Theme>
-
 #include <assert.h>
 #include <limits.h>
 
@@ -1796,11 +1793,6 @@ public:
      **/
     virtual GLShader* shader() const = 0;
 
-    /**
-     * The foreground text color as specified by the default Plasma theme.
-     */
-    static QColor styledTextColor();
-
     /**
      * If @p enable is @c true cross fading between icons and text is enabled
      * By default disabled. Use setCrossFadeProgress to cross fade.

tabbox.cpp

@@ -39,6 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfig>
 #include <KConfigGroup>
 #include <KDebug>
+#include <KLocale>
 #include <kkeyserver.h>
 // X11
 #include <fixx11h.h>