diff --git a/effects/cube/cube.h b/effects/cube/cube.h index a897649806..43f256cdd2 100644 --- a/effects/cube/cube.h +++ b/effects/cube/cube.h @@ -34,7 +34,7 @@ namespace KWin { class CubeEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/cube/cubeslide.h b/effects/cube/cubeslide.h index a61c16693a..b1ff4a29ed 100644 --- a/effects/cube/cubeslide.h +++ b/effects/cube/cubeslide.h @@ -31,6 +31,7 @@ namespace KWin class CubeSlideEffect : public Effect { + Q_OBJECT public: CubeSlideEffect(); ~CubeSlideEffect(); diff --git a/effects/desktopgrid/desktopgrid.h b/effects/desktopgrid/desktopgrid.h index 9c192271c8..76ea364bcf 100644 --- a/effects/desktopgrid/desktopgrid.h +++ b/effects/desktopgrid/desktopgrid.h @@ -59,7 +59,7 @@ private: }; class DesktopGridEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/fadedesktop/fadedesktop.h b/effects/fadedesktop/fadedesktop.h index 81cac9ff21..6f39220a1c 100644 --- a/effects/fadedesktop/fadedesktop.h +++ b/effects/fadedesktop/fadedesktop.h @@ -28,7 +28,7 @@ namespace KWin { class FadeDesktopEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/flipswitch/flipswitch.h b/effects/flipswitch/flipswitch.h index 701fc30b60..bccb934201 100644 --- a/effects/flipswitch/flipswitch.h +++ b/effects/flipswitch/flipswitch.h @@ -31,7 +31,7 @@ namespace KWin { class FlipSwitchEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/invert/invert.h b/effects/invert/invert.h index b0da551715..8bd84e063d 100644 --- a/effects/invert/invert.h +++ b/effects/invert/invert.h @@ -33,7 +33,7 @@ class GLShader; * Inverts desktop's colors **/ class InvertEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/lookingglass/lookingglass.cpp b/effects/lookingglass/lookingglass.cpp index 610e261a36..7004a1f429 100644 --- a/effects/lookingglass/lookingglass.cpp +++ b/effects/lookingglass/lookingglass.cpp @@ -43,8 +43,7 @@ KWIN_EFFECT_SUPPORTED(lookingglass, LookingGlassEffect::supported()) LookingGlassEffect::LookingGlassEffect() - : QObject() - , zoom(1.0f) + : zoom(1.0f) , target_zoom(1.0f) , polling(false) , m_texture(NULL) diff --git a/effects/lookingglass/lookingglass.h b/effects/lookingglass/lookingglass.h index 032a888a60..813b9d28dd 100644 --- a/effects/lookingglass/lookingglass.h +++ b/effects/lookingglass/lookingglass.h @@ -37,7 +37,7 @@ class GLVertexBuffer; /** * Enhanced magnifier **/ -class LookingGlassEffect : public QObject, public Effect +class LookingGlassEffect : public Effect { Q_OBJECT public: diff --git a/effects/magnifier/magnifier.h b/effects/magnifier/magnifier.h index 9001f1f937..185f25414d 100644 --- a/effects/magnifier/magnifier.h +++ b/effects/magnifier/magnifier.h @@ -27,7 +27,7 @@ namespace KWin { class MagnifierEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/mousemark/mousemark.h b/effects/mousemark/mousemark.h index da222a9195..29a8f77a95 100644 --- a/effects/mousemark/mousemark.h +++ b/effects/mousemark/mousemark.h @@ -28,7 +28,7 @@ namespace KWin { class MouseMarkEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/presentwindows/presentwindows.h b/effects/presentwindows/presentwindows.h index 4362bc7e1e..3302654a3d 100644 --- a/effects/presentwindows/presentwindows.h +++ b/effects/presentwindows/presentwindows.h @@ -63,7 +63,7 @@ private: * letting the user select active window. **/ class PresentWindowsEffect - : public QObject, public Effect + : public Effect { Q_OBJECT private: diff --git a/effects/screenshot/screenshot.h b/effects/screenshot/screenshot.h index 0b02712504..83b29a8449 100644 --- a/effects/screenshot/screenshot.h +++ b/effects/screenshot/screenshot.h @@ -28,7 +28,7 @@ along with this program. If not, see . namespace KWin { -class ScreenShotEffect : public QObject, public Effect +class ScreenShotEffect : public Effect { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.kwin.Screenshot") diff --git a/effects/slide/slide.h b/effects/slide/slide.h index 5befbeecd5..d2d55c087f 100644 --- a/effects/slide/slide.h +++ b/effects/slide/slide.h @@ -29,7 +29,7 @@ namespace KWin { class SlideEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/startupfeedback/startupfeedback.h b/effects/startupfeedback/startupfeedback.h index 0e4ae0785a..057c6b756e 100644 --- a/effects/startupfeedback/startupfeedback.h +++ b/effects/startupfeedback/startupfeedback.h @@ -30,7 +30,7 @@ namespace KWin class GLTexture; class StartupFeedbackEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/thumbnailaside/thumbnailaside.h b/effects/thumbnailaside/thumbnailaside.h index ccb1907be1..02741887ac 100644 --- a/effects/thumbnailaside/thumbnailaside.h +++ b/effects/thumbnailaside/thumbnailaside.h @@ -36,8 +36,7 @@ namespace KWin { class ThumbnailAsideEffect - : public QObject - , public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/trackmouse/trackmouse.h b/effects/trackmouse/trackmouse.h index 6ef2c889a6..fb26ef59b8 100644 --- a/effects/trackmouse/trackmouse.h +++ b/effects/trackmouse/trackmouse.h @@ -31,7 +31,7 @@ namespace KWin class GLTexture; class TrackMouseEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/effects/windowgeometry/windowgeometry.h b/effects/windowgeometry/windowgeometry.h index 985420208b..993b4aee77 100644 --- a/effects/windowgeometry/windowgeometry.h +++ b/effects/windowgeometry/windowgeometry.h @@ -26,7 +26,7 @@ along with this program. If not, see . namespace KWin { -class WindowGeometry : public QObject, public Effect +class WindowGeometry : public Effect { Q_OBJECT public: diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp index 151797a573..5be354b71c 100644 --- a/effects/zoom/zoom.cpp +++ b/effects/zoom/zoom.cpp @@ -57,8 +57,7 @@ static int nominalCursorSize(int iconSize) KWIN_EFFECT(zoom, ZoomEffect) ZoomEffect::ZoomEffect() - : QObject() - , Effect() + : Effect() , zoom(1) , target_zoom(1) , polling(false) diff --git a/effects/zoom/zoom.h b/effects/zoom/zoom.h index 74521a5570..fd744acad7 100644 --- a/effects/zoom/zoom.h +++ b/effects/zoom/zoom.h @@ -32,7 +32,7 @@ class GLTexture; class XRenderPicture; class ZoomEffect - : public QObject, public Effect + : public Effect { Q_OBJECT public: diff --git a/libkwineffects/kwineffects.cpp b/libkwineffects/kwineffects.cpp index 01d5e5e30a..9c84e17ff9 100644 --- a/libkwineffects/kwineffects.cpp +++ b/libkwineffects/kwineffects.cpp @@ -1337,3 +1337,5 @@ void EffectFrame::enableCrossFade(bool enable) } } // namespace + +#include "kwineffects.moc" diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h index 2343f8f7d7..a894074665 100644 --- a/libkwineffects/kwineffects.h +++ b/libkwineffects/kwineffects.h @@ -263,8 +263,9 @@ QRect infiniteRegion() * is called for every window which the screen method is usually called just * once. **/ -class KWIN_EXPORT Effect +class KWIN_EXPORT Effect : public QObject { + Q_OBJECT public: /** Flags controlling how painting is done. */ // TODO: is that ok here? @@ -579,8 +580,9 @@ public: * desktop or create a special input window to receive mouse and keyboard * events. **/ -class KWIN_EXPORT EffectsHandler +class KWIN_EXPORT EffectsHandler : public QObject { + Q_OBJECT friend class Effect; public: EffectsHandler(CompositingType type);