Cleaned up the effects/ directory by moving each individual effect into

its own directory, cleaned up the effect config macros and renamed
"MakeTransparent" to "Translucency" so that it matches its visible name.

svn path=/trunk/KDE/kdebase/workspace/; revision=921749

effects/CMakeLists.txt

@@ -1,235 +1,104 @@
-# Uncomment to have the test effects built
+# Uncomment to have the test effects built as well
-#add_subdirectory( test )
+#add_subdirectory( _test )
-
 
 # Adds effect plugin with given name. Sources are given after the name
-macro(KWIN4_ADD_EFFECT name)
+macro( KWIN4_ADD_EFFECT name )
-    kde4_add_plugin(kwin4_effect_${name} ${ARGN})
+    kde4_add_plugin( kwin4_effect_${name} ${ARGN} )
-    target_link_libraries(kwin4_effect_${name} kwineffects ${KDE4_KDEUI_LIBS} kephal)
+    target_link_libraries( kwin4_effect_${name} kwineffects ${KDE4_KDEUI_LIBS} kephal )
-    install(TARGETS kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR})
+    install( TARGETS kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR} )
-endmacro(KWIN4_ADD_EFFECT)
+endmacro( KWIN4_ADD_EFFECT )
 
-macro(KWIN4_ADD_EFFECT_CONFIG name)
+macro( KWIN4_ADD_EFFECT_CONFIG name )
-    set(kwin4_effect_ui ) #empty
+    set( kwin4_effect_ui ) # Initially empty
-    set(kwin4_effect_src ) #empty
+    set( kwin4_effect_src ) # Initially empty
-    foreach(file ${ARGN})
-        if(file MATCHES \\.ui)
-            set(kwin4_effect_ui ${kwin4_effect_ui} ${file})
-        else(file MATCHES \\.ui)
-            set(kwin4_effect_src ${kwin4_effect_src} ${file})
-        endif(file MATCHES \\.ui)
-    endforeach(file)
-    kde4_add_ui_files(kwin4_effect_src ${kwin4_effect_ui})
-    kde4_add_plugin(kcm_kwin4_effect_${name} ${kwin4_effect_src})
-    target_link_libraries(kcm_kwin4_effect_${name} kwineffects ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} kephal)
-    install(TARGETS kcm_kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR})
-endmacro(KWIN4_ADD_EFFECT_CONFIG)
 
+    foreach( file ${ARGN} )
+        if( file MATCHES \\.ui )
+            set( kwin4_effect_ui ${kwin4_effect_ui} ${file} )
+        else( file MATCHES \\.ui )
+            set( kwin4_effect_src ${kwin4_effect_src} ${file} )
+        endif( file MATCHES \\.ui )
+    endforeach( file )
+
+    kde4_add_ui_files( kwin4_effect_src ${kwin4_effect_ui} )
+    kde4_add_plugin( kcm_kwin4_effect_${name} ${kwin4_effect_src} )
+    target_link_libraries( kcm_kwin4_effect_${name} kwineffects ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} kephal )
+    install( TARGETS kcm_kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR} )
+endmacro( KWIN4_ADD_EFFECT_CONFIG )
+
+macro( KWIN4_EFFECT_LINK_XRENDER name )
+    if( KWIN_HAVE_XRENDER_COMPOSITING )
+        target_link_libraries( kwin4_effect_${name} ${X11_Xrender_LIB} ${X11_LIBRARIES} kephal )
+    endif( KWIN_HAVE_XRENDER_COMPOSITING )
+endmacro( KWIN4_EFFECT_LINK_XRENDER )
+
+# Make sure we can see our libraries
 include_directories(
     ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib
     )
 
-install( FILES kwineffect.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+# Install the KWin/Effect service type
+install( FILES kwineffect.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
-### builtins - most important, ready-to-use effects
+# Create initial variables
-# sources
+set( kwin4_effect_builtins_sources )
-SET(kwin4_effect_builtins_sources
+set( kwin4_effect_builtins_config_sources configs_builtins.cpp )
-    boxswitch.cpp
+set( kwin4_effect_include_directories )
-    desktopgrid.cpp
+
-    dialogparent.cpp
+###############################################################################
-    diminactive.cpp
+# Built-in effects go here
-    dimscreen.cpp
+
-    fade.cpp
+# Common effects
-    fadedesktop.cpp
+include( boxswitch/CMakeLists.txt )
-    fallapart.cpp
+include( desktopgrid/CMakeLists.txt )
-    highlightwindow.cpp
+include( dialogparent/CMakeLists.txt )
-    login.cpp
+include( diminactive/CMakeLists.txt )
-    logout.cpp
+include( dimscreen/CMakeLists.txt )
-    magiclamp.cpp
+include( fade/CMakeLists.txt )
-    maketransparent.cpp
+include( fadedesktop/CMakeLists.txt )
-    minimizeanimation.cpp
+include( fallapart/CMakeLists.txt )
-    presentwindows.cpp
+include( highlightwindow/CMakeLists.txt )
-    scalein.cpp
+include( login/CMakeLists.txt )
-    shadow.cpp
+include( logout/CMakeLists.txt )
-    showfps.cpp
+include( magiclamp/CMakeLists.txt )
-    showpaint.cpp
+include( translucency/CMakeLists.txt )
-    slide.cpp
+include( minimizeanimation/CMakeLists.txt )
-    taskbarthumbnail.cpp
+include( presentwindows/CMakeLists.txt )
-    thumbnailaside.cpp
+include( scalein/CMakeLists.txt )
-    zoom.cpp
+include( shadow/CMakeLists.txt )
-    )
+include( showfps/CMakeLists.txt )
-# their .desktop files
+include( showpaint/CMakeLists.txt )
+include( slide/CMakeLists.txt )
+include( taskbarthumbnail/CMakeLists.txt )
+include( thumbnailaside/CMakeLists.txt )
+include( zoom/CMakeLists.txt )
+
+# OpenGL-specific effects
+if( KWIN_HAVE_OPENGL_COMPOSITING )
+    include( blur/CMakeLists.txt )
+    include( coverswitch/CMakeLists.txt )
+    include( cube/CMakeLists.txt )
+    include( explosion/CMakeLists.txt )
+    include( flipswitch/CMakeLists.txt )
+    include( invert/CMakeLists.txt )
+    include( lookingglass/CMakeLists.txt )
+    include( magnifier/CMakeLists.txt )
+    include( mousemark/CMakeLists.txt )
+    include( sharpen/CMakeLists.txt )
+    include( snow/CMakeLists.txt )
+    include( trackmouse/CMakeLists.txt )
+    include( wobblywindows/CMakeLists.txt )
+endif( KWIN_HAVE_OPENGL_COMPOSITING )
+
+###############################################################################
+
+# Add the builtins plugin
+KWIN4_ADD_EFFECT( builtins ${kwin4_effect_builtins_sources} )
+KWIN4_ADD_EFFECT_CONFIG( builtins ${kwin4_effect_builtins_config_sources} )
+KWIN4_EFFECT_LINK_XRENDER( builtins )
+
+# Install global data files
 install( FILES
-    boxswitch.desktop
+    _data/circle-edgy.png
-    desktopgrid.desktop
+    _data/circle.png
-    dialogparent.desktop
+    DESTINATION ${DATA_INSTALL_DIR}/kwin )
-    diminactive.desktop
-    dimscreen.desktop
-    fade.desktop
-    fadedesktop.desktop
-    fallapart.desktop
-    highlightwindow.desktop
-    login.desktop
-    logout.desktop
-    magiclamp.desktop
-    maketransparent.desktop
-    minimizeanimation.desktop
-    presentwindows.desktop
-    scalein.desktop
-    shadow.desktop
-    showfps.desktop
-    showpaint.desktop
-    slide.desktop
-    taskbarthumbnail.desktop
-    thumbnailaside.desktop
-    zoom.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
-
-# config modules
-SET(kwin4_effect_builtins_config_sources
-    boxswitch_config.cpp
-    boxswitch_config.ui
-    desktopgrid_config.cpp
-    desktopgrid_config.ui
-    diminactive_config.cpp
-    diminactive_config.ui
-    magiclamp_config.cpp
-    magiclamp_config.ui
-    maketransparent_config.cpp
-    maketransparent_config.ui
-    presentwindows_config.cpp
-    presentwindows_config.ui
-    shadow_config.cpp
-    shadow_config.ui
-    showfps_config.cpp
-    showfps_config.ui
-    thumbnailaside_config.cpp
-    thumbnailaside_config.ui
-    zoom_config.cpp
-    configs_builtins.cpp)
-install( FILES
-    boxswitch_config.desktop
-    desktopgrid_config.desktop
-    diminactive_config.desktop
-    magiclamp_config.desktop
-    maketransparent_config.desktop
-    presentwindows_config.desktop
-    shadow_config.desktop
-    showfps_config.desktop
-    thumbnailaside_config.desktop
-    zoom_config.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
-
-if(KWIN_HAVE_OPENGL_COMPOSITING)
-    # opengl-based effects
-    SET(kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
-        blur.cpp
-        coverswitch.cpp
-        cube.cpp
-        cylinder.cpp
-        explosioneffect.cpp
-        flipswitch.cpp
-        invert.cpp
-        lookingglass.cpp
-        magnifier.cpp
-        mousemark.cpp
-        sharpen.cpp
-        sphere.cpp
-        snow.cpp
-        trackmouse.cpp
-        wobblywindows.cpp
-        )
-    install( FILES
-        blur.desktop
-        coverswitch.desktop
-        cube.desktop
-        cylinder.desktop
-        explosion.desktop
-        flipswitch.desktop
-        invert.desktop
-        lookingglass.desktop
-        magnifier.desktop
-        mousemark.desktop
-        sharpen.desktop
-        sphere.desktop
-        snow.desktop
-        trackmouse.desktop
-        wobblywindows.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
-    install( FILES
-        data/trackmouse.png
-        data/explosion.frag
-        data/explosion.vert
-        data/explosion-start.png
-        data/explosion-end.png
-        data/blur.frag
-        data/blur.vert
-        data/blur-render.frag
-        data/blur-render.vert
-        data/invert.frag
-        data/invert.vert
-        data/sharpen.frag
-        data/sharpen.vert
-        data/lookingglass.frag
-        data/lookingglass.vert
-        data/shadow-texture.png
-        data/snow.frag
-        data/snow.vert
-        data/snowflake.png
-        data/circle.png
-        data/circle-edgy.png
-        data/cubecap.png
-        data/cylinder.frag
-        data/cylinder.vert
-        data/sphere.vert
-        DESTINATION  ${DATA_INSTALL_DIR}/kwin )
-    SET(kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources}
-        coverswitch_config.cpp
-        coverswitch_config.ui
-        cube_config.cpp
-        cube_config.ui
-        cylinder_config.cpp
-        cylinder_config.ui
-        flipswitch_config.cpp
-        flipswitch_config.ui
-        invert_config.cpp
-        lookingglass_config.cpp
-        lookingglass_config.ui
-        magnifier_config.cpp
-        magnifier_config.ui
-        mousemark_config.cpp
-        mousemark_config.ui
-        sharpen_config.cpp
-        snow_config.cpp
-        snow_config.ui
-        sphere_config.cpp
-        sphere_config.ui
-        trackmouse_config.cpp
-        wobblywindows_config.cpp
-        wobblywindows_config.ui
-        )
-    install( FILES
-        coverswitch_config.desktop
-        cube_config.desktop
-        cylinder_config.desktop
-        flipswitch_config.desktop
-        invert_config.desktop
-        lookingglass_config.desktop
-        magnifier_config.desktop
-        mousemark_config.desktop
-        sharpen_config.desktop
-        snow_config.desktop
-        sphere_config.desktop
-        trackmouse_config.desktop
-        wobblywindows_config.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
-endif(KWIN_HAVE_OPENGL_COMPOSITING)
-
-# add the plugin
-KWIN4_ADD_EFFECT(builtins ${kwin4_effect_builtins_sources})
-KWIN4_ADD_EFFECT_CONFIG(builtins ${kwin4_effect_builtins_config_sources})
-# link to xrender if necessary
-if (KWIN_HAVE_XRENDER_COMPOSITING)
-  target_link_libraries(kwin4_effect_builtins ${X11_Xrender_LIB} ${X11_LIBRARIES} kephal)
-endif (KWIN_HAVE_XRENDER_COMPOSITING)
-

effects/blur/CMakeLists.txt

@@ -0,0 +1,20 @@
+#######################################
+# Effect
+
+# Source files
+set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
+    blur/blur.cpp
+    )
+
+# .desktop files
+install( FILES
+    blur/blur.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
+
+# Data files
+install( FILES
+    blur/data/blur.frag
+    blur/data/blur.vert
+    blur/data/blur-render.frag
+    blur/data/blur-render.vert
+    DESTINATION  ${DATA_INSTALL_DIR}/kwin )

effects/boxswitch/CMakeLists.txt

@@ -0,0 +1,26 @@
+#######################################
+# Effect
+
+# Source files
+set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
+    boxswitch/boxswitch.cpp
+    )
+
+# .desktop files
+install( FILES
+    boxswitch/boxswitch.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
+
+#######################################
+# Config
+
+# Source files
+set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources}
+    boxswitch/boxswitch_config.cpp
+    boxswitch/boxswitch_config.ui
+    )
+
+# .desktop files
+install( FILES
+    boxswitch/boxswitch_config.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )

effects/boxswitch/boxswitch_config.cpp

@@ -24,13 +24,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kconfiggroup.h>
 
 #include <QVBoxLayout>
-#ifndef KDE_USE_FINAL
-KWIN_EFFECT_CONFIG_FACTORY
-#endif
 
 namespace KWin
 {
 
+KWIN_EFFECT_CONFIG_FACTORY
+
 BoxSwitchEffectConfigForm::BoxSwitchEffectConfigForm(QWidget* parent) : QWidget(parent)
 {
   setupUi(this);

effects/configs_builtins.cpp

@@ -4,6 +4,7 @@
 
 Copyright (C) 2007 Bernhard Loos <nhuh.put@web.de>
 Copyright (C) 2007 Christian Nitschkowski <christian.nitschkowski@kdemail.net>
+Copyright (C) 2009 Lucas Murray <lmurray@undefinedfire.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,93 +22,67 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwinconfig.h>
 
-#include "boxswitch_config.h"
+#include "boxswitch/boxswitch_config.h"
-#include "desktopgrid_config.h"
+#include "desktopgrid/desktopgrid_config.h"
-#include "diminactive_config.h"
+#include "diminactive/diminactive_config.h"
-#include "magiclamp_config.h"
+#include "magiclamp/magiclamp_config.h"
-#include "maketransparent_config.h"
+#include "translucency/translucency_config.h"
-#include "presentwindows_config.h"
+#include "presentwindows/presentwindows_config.h"
-#include "shadow_config.h"
+#include "shadow/shadow_config.h"
-#include "showfps_config.h"
+#include "showfps/showfps_config.h"
-#include "thumbnailaside_config.h"
+#include "thumbnailaside/thumbnailaside_config.h"
-#include "zoom_config.h"
+#include "zoom/zoom_config.h"
-
 
 #ifdef KWIN_HAVE_OPENGL_COMPOSITING
-#include "coverswitch_config.h"
+#include "coverswitch/coverswitch_config.h"
-#include "cube_config.h"
+#include "cube/cube_config.h"
-#include "cylinder_config.h"
+#include "cube/cylinder_config.h"
-#include "flipswitch_config.h"
+#include "cube/sphere_config.h"
-#include "invert_config.h"
+#include "flipswitch/flipswitch_config.h"
-#include "lookingglass_config.h"
+#include "invert/invert_config.h"
-#include "mousemark_config.h"
+#include "lookingglass/lookingglass_config.h"
-#include "magnifier_config.h"
+#include "mousemark/mousemark_config.h"
-#include "sharpen_config.h"
+#include "magnifier/magnifier_config.h"
-#include "snow_config.h"
+#include "sharpen/sharpen_config.h"
-#include "sphere_config.h"
+#include "snow/snow_config.h"
-#include "trackmouse_config.h"
+#include "trackmouse/trackmouse_config.h"
-#include "wobblywindows_config.h"
+#include "wobblywindows/wobblywindows_config.h"
-#endif
-#ifdef KWIN_HAVE_XRENDER_COMPOSITING
-// xrender-only here if any
-#endif
-#ifdef HAVE_CAPTURY
-#include "videorecord_config.h"
 #endif
 
 #include <kwineffects.h>
 
 #include <KPluginLoader>
-#ifndef KDE_USE_FINAL
-KWIN_EFFECT_CONFIG_FACTORY
-#endif
 
-#define COMMON_PLUGINS \
+namespace KWin
-    registerPlugin<KWin::BoxSwitchEffectConfig>("boxswitch"); \
+{
-    registerPlugin<KWin::DesktopGridEffectConfig>("desktopgrid"); \
-    registerPlugin<KWin::DimInactiveEffectConfig>("diminactive"); \
-    registerPlugin<KWin::MagicLampEffectConfig>("magiclamp"); \
-    registerPlugin<KWin::MakeTransparentEffectConfig>("maketransparent"); \
-    registerPlugin<KWin::PresentWindowsEffectConfig>("presentwindows");   \
-    registerPlugin<KWin::ShadowEffectConfig>("shadow"); \
-    registerPlugin<KWin::ShowFpsEffectConfig> ("showfps"); \
-    registerPlugin<KWin::ThumbnailAsideEffectConfig>("thumbnailaside"); \
-    registerPlugin<KWin::ZoomEffectConfig>("zoom");
 
-#define OPENGL_PLUGINS \
+KWIN_EFFECT_CONFIG_MULTIPLE( builtins,
-    registerPlugin<KWin::CoverSwitchEffectConfig>("coverswitch"); \
+    KWIN_EFFECT_CONFIG_SINGLE( boxswitch, BoxSwitchEffectConfig )
-    registerPlugin<KWin::CubeEffectConfig>("cube"); \
+    KWIN_EFFECT_CONFIG_SINGLE( desktopgrid, DesktopGridEffectConfig )
-    registerPlugin<KWin::CylinderEffectConfig>("cylinder"); \
+    KWIN_EFFECT_CONFIG_SINGLE( diminactive, DimInactiveEffectConfig )
-    registerPlugin<KWin::FlipSwitchEffectConfig>("flipswitch"); \
+    KWIN_EFFECT_CONFIG_SINGLE( magiclamp, MagicLampEffectConfig )
-    registerPlugin<KWin::InvertEffectConfig>("invert"); \
+    KWIN_EFFECT_CONFIG_SINGLE( translucency, TranslucencyEffectConfig )
-    registerPlugin<KWin::LookingGlassEffectConfig>("lookingglass"); \
+    KWIN_EFFECT_CONFIG_SINGLE( presentwindows, PresentWindowsEffectConfig )
-    registerPlugin<KWin::MouseMarkEffectConfig>("mousemark"); \
+    KWIN_EFFECT_CONFIG_SINGLE( shadow, ShadowEffectConfig )
-    registerPlugin<KWin::MagnifierEffectConfig>("magnifier"); \
+    KWIN_EFFECT_CONFIG_SINGLE( showfps, ShowFpsEffectConfig )
-    registerPlugin<KWin::SharpenEffectConfig>("sharpen"); \
+    KWIN_EFFECT_CONFIG_SINGLE( thumbnailaside, ThumbnailAsideEffectConfig )
-    registerPlugin<KWin::SnowEffectConfig>("snow"); \
+    KWIN_EFFECT_CONFIG_SINGLE( zoom, ZoomEffectConfig )
-    registerPlugin<KWin::SphereEffectConfig>("sphere"); \
-    registerPlugin<KWin::TrackMouseEffectConfig>("trackmouse"); \
-    registerPlugin<KWin::WobblyWindowsEffectConfig> ("wobblywindows");
 
-#define XRENDER_PLUGINS
-#define CAPTURY_PLUGINS \
-    registerPlugin<KWin::VideoRecordEffectConfig> ("videorecord");
-
-K_PLUGIN_FACTORY_DEFINITION(EffectFactory,
-    COMMON_PLUGINS
 #ifdef KWIN_HAVE_OPENGL_COMPOSITING
-    OPENGL_PLUGINS
+    KWIN_EFFECT_CONFIG_SINGLE( coverswitch, CoverSwitchEffectConfig )
-#endif
+    KWIN_EFFECT_CONFIG_SINGLE( cube, CubeEffectConfig )
-#ifdef KWIN_HAVE_XRENDER_COMPOSITING
+    KWIN_EFFECT_CONFIG_SINGLE( cylinder, CylinderEffectConfig )
-    XRENDER_PLUGINS
+    KWIN_EFFECT_CONFIG_SINGLE( sphere, SphereEffectConfig )
-#endif
+    KWIN_EFFECT_CONFIG_SINGLE( flipswitch, FlipSwitchEffectConfig )
-#ifdef HAVE_CAPTURY
+    KWIN_EFFECT_CONFIG_SINGLE( invert, InvertEffectConfig )
-    CAPTURY_PLUGINS
+    KWIN_EFFECT_CONFIG_SINGLE( lookingglass, LookingGlassEffectConfig )
+    KWIN_EFFECT_CONFIG_SINGLE( mousemark, MouseMarkEffectConfig )
+    KWIN_EFFECT_CONFIG_SINGLE( magnifier, MagnifierEffectConfig )
+    KWIN_EFFECT_CONFIG_SINGLE( sharpen, SharpenEffectConfig )
+    KWIN_EFFECT_CONFIG_SINGLE( snow, SnowEffectConfig )
+    KWIN_EFFECT_CONFIG_SINGLE( trackmouse, TrackMouseEffectConfig )
+    KWIN_EFFECT_CONFIG_SINGLE( wobblywindows, WobblyWindowsEffectConfig )
 #endif
     )
-K_EXPORT_PLUGIN(EffectFactory("kwin"))
 
-#undef COMMON_PLUGINS
+} // namespace
-#undef OPENGL_PLUGINS
-#undef XRENDER_PLUGINS
-#undef CAPTURY_PLUGINS

effects/coverswitch/CMakeLists.txt

@@ -0,0 +1,26 @@
+#######################################
+# Effect
+
+# Source files
+set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
+    coverswitch/coverswitch.cpp
+    )
+
+# .desktop files
+install( FILES
+    coverswitch/coverswitch.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
+
+#######################################
+# Config
+
+# Source files
+set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources}
+    coverswitch/coverswitch_config.cpp
+    coverswitch/coverswitch_config.ui
+    )
+
+# .desktop files
+install( FILES
+    coverswitch/coverswitch_config.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )

effects/coverswitch/coverswitch_config.cpp

@@ -23,13 +23,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kconfiggroup.h>
 
 #include <QVBoxLayout>
-#ifndef KDE_USE_FINAL
-KWIN_EFFECT_CONFIG_FACTORY
-#endif
 
 namespace KWin
 {
 
+KWIN_EFFECT_CONFIG_FACTORY
+
 CoverSwitchEffectConfigForm::CoverSwitchEffectConfigForm(QWidget* parent) : QWidget(parent)
 {
   setupUi(this);

effects/cube/CMakeLists.txt

@@ -0,0 +1,44 @@
+#######################################
+# Effect
+
+# Source files
+set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
+    cube/cube.cpp
+    cube/cylinder.cpp
+    cube/sphere.cpp
+    )
+
+# .desktop files
+install( FILES
+    cube/cube.desktop
+    cube/cylinder.desktop
+    cube/sphere.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
+
+# Data files
+install( FILES
+    cube/data/cubecap.png
+    cube/data/cylinder.frag
+    cube/data/cylinder.vert
+    cube/data/sphere.vert
+    DESTINATION ${DATA_INSTALL_DIR}/kwin )
+
+#######################################
+# Config
+
+# Source files
+set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources}
+    cube/cube_config.cpp
+    cube/cube_config.ui
+    cube/cylinder_config.cpp
+    cube/cylinder_config.ui
+    cube/sphere_config.cpp
+    cube/sphere_config.ui
+    )
+
+# .desktop files
+install( FILES
+    cube/cube_config.desktop
+    cube/cylinder_config.desktop
+    cube/sphere_config.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )

effects/cube/cube_config.cpp

@@ -29,13 +29,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QVBoxLayout>
 #include <QColor>
-#ifndef KDE_USE_FINAL
-KWIN_EFFECT_CONFIG_FACTORY
-#endif
 
 namespace KWin
 {
 
+KWIN_EFFECT_CONFIG_FACTORY
+
 CubeEffectConfigForm::CubeEffectConfigForm(QWidget* parent) : QWidget(parent)
 {
   setupUi(this);

effects/cube/cylinder_config.cpp

@@ -29,13 +29,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QVBoxLayout>
 #include <QColor>
-#ifndef KDE_USE_FINAL
-KWIN_EFFECT_CONFIG_FACTORY
-#endif
 
 namespace KWin
 {
 
+KWIN_EFFECT_CONFIG_FACTORY
+
 CylinderEffectConfigForm::CylinderEffectConfigForm(QWidget* parent) : QWidget(parent)
 {
   setupUi(this);

effects/cube/sphere_config.cpp

@@ -29,13 +29,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QGridLayout>
 #include <QColor>
-#ifndef KDE_USE_FINAL
-KWIN_EFFECT_CONFIG_FACTORY
-#endif
 
 namespace KWin
 {
 
+KWIN_EFFECT_CONFIG_FACTORY
+
 SphereEffectConfigForm::SphereEffectConfigForm(QWidget* parent) : QWidget(parent)
 {
   setupUi(this);

effects/desktopgrid/CMakeLists.txt

@@ -0,0 +1,26 @@
+#######################################
+# Effect
+
+# Source files
+set( kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
+    desktopgrid/desktopgrid.cpp
+    )
+
+# .desktop files
+install( FILES
+    desktopgrid/desktopgrid.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )
+
+#######################################
+# Config
+
+# Source files
+set( kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources}
+    desktopgrid/desktopgrid_config.cpp
+    desktopgrid/desktopgrid_config.ui
+    )
+
+# .desktop files
+install( FILES
+    desktopgrid/desktopgrid_config.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}/kwin )