diff --git a/effects.cpp b/effects.cpp index c3a8674f47..8680023201 100644 --- a/effects.cpp +++ b/effects.cpp @@ -210,7 +210,6 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene) new EffectsAdaptor(this); QDBusConnection dbus = QDBusConnection::sessionBus(); dbus.registerObject(QStringLiteral("/Effects"), this); - dbus.registerService(QStringLiteral("org.kde.kwin.Effects")); // init is important, otherwise causes crashes when quads are build before the first painting pass start m_currentBuildQuadsIterator = m_activeEffects.constEnd(); diff --git a/effects/blur/blur_config.cpp b/effects/blur/blur_config.cpp index d2407b01bc..f584ceb73a 100644 --- a/effects/blur/blur_config.cpp +++ b/effects/blur/blur_config.cpp @@ -49,7 +49,7 @@ void BlurEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("blur")); diff --git a/effects/coverswitch/coverswitch_config.cpp b/effects/coverswitch/coverswitch_config.cpp index e4a198f557..8410cce3ad 100644 --- a/effects/coverswitch/coverswitch_config.cpp +++ b/effects/coverswitch/coverswitch_config.cpp @@ -54,7 +54,7 @@ CoverSwitchEffectConfig::CoverSwitchEffectConfig(QWidget* parent, const QVariant void CoverSwitchEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("coverswitch")); diff --git a/effects/cube/cube_config.cpp b/effects/cube/cube_config.cpp index 37e79e4764..f59d08a0e3 100644 --- a/effects/cube/cube_config.cpp +++ b/effects/cube/cube_config.cpp @@ -91,7 +91,7 @@ void CubeEffectConfig::save() { KCModule::save(); m_ui->editor->save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("cube")); diff --git a/effects/cube/cubeslide_config.cpp b/effects/cube/cubeslide_config.cpp index 4079660ede..de550e37e2 100644 --- a/effects/cube/cubeslide_config.cpp +++ b/effects/cube/cubeslide_config.cpp @@ -56,7 +56,7 @@ CubeSlideEffectConfig::CubeSlideEffectConfig(QWidget* parent, const QVariantList void CubeSlideEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("cubeslide")); diff --git a/effects/dashboard/dashboard_config.cpp b/effects/dashboard/dashboard_config.cpp index 90e1ecdbcd..75696bd07b 100644 --- a/effects/dashboard/dashboard_config.cpp +++ b/effects/dashboard/dashboard_config.cpp @@ -50,7 +50,7 @@ void DashboardEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("dashboard")); diff --git a/effects/desktopgrid/desktopgrid_config.cpp b/effects/desktopgrid/desktopgrid_config.cpp index 516feae70c..d36d8c6b26 100644 --- a/effects/desktopgrid/desktopgrid_config.cpp +++ b/effects/desktopgrid/desktopgrid_config.cpp @@ -107,7 +107,7 @@ void DesktopGridEffectConfig::save() conf.writeEntry("DesktopNameAlignment", DesktopGridConfig::desktopNameAlignment()); conf.sync(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("desktopgrid")); diff --git a/effects/diminactive/diminactive_config.cpp b/effects/diminactive/diminactive_config.cpp index 3bcf0e83bc..799275b6e3 100644 --- a/effects/diminactive/diminactive_config.cpp +++ b/effects/diminactive/diminactive_config.cpp @@ -61,7 +61,7 @@ DimInactiveEffectConfig::DimInactiveEffectConfig(QWidget* parent, const QVariant void DimInactiveEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("diminactive")); diff --git a/effects/flipswitch/flipswitch_config.cpp b/effects/flipswitch/flipswitch_config.cpp index aa03d55d73..eb0b754c97 100644 --- a/effects/flipswitch/flipswitch_config.cpp +++ b/effects/flipswitch/flipswitch_config.cpp @@ -82,7 +82,7 @@ void FlipSwitchEffectConfig::save() KCModule::save(); m_ui->shortcutEditor->save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("flipswitch")); diff --git a/effects/glide/glide_config.cpp b/effects/glide/glide_config.cpp index a8fdfc9208..3847db3a37 100644 --- a/effects/glide/glide_config.cpp +++ b/effects/glide/glide_config.cpp @@ -48,7 +48,7 @@ GlideEffectConfig::~GlideEffectConfig() void GlideEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("glide")); diff --git a/effects/invert/invert_config.cpp b/effects/invert/invert_config.cpp index 9cde1ab7df..00865cf262 100644 --- a/effects/invert/invert_config.cpp +++ b/effects/invert/invert_config.cpp @@ -87,7 +87,7 @@ void InvertEffectConfig::save() mShortcutEditor->save(); // undo() will restore to this state from now on emit changed(false); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("invert")); diff --git a/effects/lookingglass/lookingglass_config.cpp b/effects/lookingglass/lookingglass_config.cpp index 68f4ae85d7..f259a60f9a 100644 --- a/effects/lookingglass/lookingglass_config.cpp +++ b/effects/lookingglass/lookingglass_config.cpp @@ -99,7 +99,7 @@ void LookingGlassEffectConfig::save() m_ui->editor->save(); // undo() will restore to this state from now on - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("lookingglass")); diff --git a/effects/magiclamp/magiclamp_config.cpp b/effects/magiclamp/magiclamp_config.cpp index 136c2247c6..51795eba08 100644 --- a/effects/magiclamp/magiclamp_config.cpp +++ b/effects/magiclamp/magiclamp_config.cpp @@ -58,7 +58,7 @@ MagicLampEffectConfig::MagicLampEffectConfig(QWidget* parent, const QVariantList void MagicLampEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("magiclamp")); diff --git a/effects/magnifier/magnifier_config.cpp b/effects/magnifier/magnifier_config.cpp index 68fc4789d6..05c0c0b1db 100644 --- a/effects/magnifier/magnifier_config.cpp +++ b/effects/magnifier/magnifier_config.cpp @@ -100,7 +100,7 @@ void MagnifierEffectConfig::save() m_ui->editor->save(); // undo() will restore to this state from now on KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("magnifier")); diff --git a/effects/mouseclick/mouseclick_config.cpp b/effects/mouseclick/mouseclick_config.cpp index c5fd4f15d3..8f28171337 100644 --- a/effects/mouseclick/mouseclick_config.cpp +++ b/effects/mouseclick/mouseclick_config.cpp @@ -80,7 +80,7 @@ void MouseClickEffectConfig::save() { KCModule::save(); m_ui->editor->save(); // undo() will restore to this state from now on - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("mouseclick")); diff --git a/effects/mousemark/mousemark_config.cpp b/effects/mousemark/mousemark_config.cpp index f00c9e63cc..176d97c8ab 100644 --- a/effects/mousemark/mousemark_config.cpp +++ b/effects/mousemark/mousemark_config.cpp @@ -94,7 +94,7 @@ void MouseMarkEffectConfig::save() m_actionCollection->writeSettings(); m_ui->editor->save(); // undo() will restore to this state from now on - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("mousemark")); diff --git a/effects/presentwindows/presentwindows_config.cpp b/effects/presentwindows/presentwindows_config.cpp index 5639b2fd88..fa14b99adc 100644 --- a/effects/presentwindows/presentwindows_config.cpp +++ b/effects/presentwindows/presentwindows_config.cpp @@ -98,7 +98,7 @@ void PresentWindowsEffectConfig::save() { KCModule::save(); m_ui->shortcutEditor->save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("presentwindows")); diff --git a/effects/resize/resize_config.cpp b/effects/resize/resize_config.cpp index ddb6db4b9c..96ee9a8f8a 100644 --- a/effects/resize/resize_config.cpp +++ b/effects/resize/resize_config.cpp @@ -57,7 +57,7 @@ ResizeEffectConfig::ResizeEffectConfig(QWidget* parent, const QVariantList& args void ResizeEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("resize")); diff --git a/effects/showfps/showfps_config.cpp b/effects/showfps/showfps_config.cpp index 227389c602..1fa2af087c 100644 --- a/effects/showfps/showfps_config.cpp +++ b/effects/showfps/showfps_config.cpp @@ -54,7 +54,7 @@ ShowFpsEffectConfig::~ShowFpsEffectConfig() void ShowFpsEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("showfps")); diff --git a/effects/thumbnailaside/thumbnailaside_config.cpp b/effects/thumbnailaside/thumbnailaside_config.cpp index e6522acc21..67f325292a 100644 --- a/effects/thumbnailaside/thumbnailaside_config.cpp +++ b/effects/thumbnailaside/thumbnailaside_config.cpp @@ -86,7 +86,7 @@ ThumbnailAsideEffectConfig::~ThumbnailAsideEffectConfig() void ThumbnailAsideEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("thumbnailaside")); diff --git a/effects/trackmouse/trackmouse_config.cpp b/effects/trackmouse/trackmouse_config.cpp index 2ed9899b72..6d34014c57 100644 --- a/effects/trackmouse/trackmouse_config.cpp +++ b/effects/trackmouse/trackmouse_config.cpp @@ -99,7 +99,7 @@ void TrackMouseEffectConfig::save() { KCModule::save(); m_actionCollection->writeSettings(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("trackmouse")); diff --git a/effects/windowgeometry/windowgeometry_config.cpp b/effects/windowgeometry/windowgeometry_config.cpp index 18c04db10c..3ba0b83849 100644 --- a/effects/windowgeometry/windowgeometry_config.cpp +++ b/effects/windowgeometry/windowgeometry_config.cpp @@ -76,7 +76,7 @@ void WindowGeometryConfig::save() { KCModule::save(); myUi->shortcuts->save(); // undo() will restore to this state from now on - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("windowgeometry")); diff --git a/effects/wobblywindows/wobblywindows_config.cpp b/effects/wobblywindows/wobblywindows_config.cpp index 78746212a4..05db81f5db 100644 --- a/effects/wobblywindows/wobblywindows_config.cpp +++ b/effects/wobblywindows/wobblywindows_config.cpp @@ -98,7 +98,7 @@ void WobblyWindowsEffectConfig::save() { KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("wobblywindows")); diff --git a/effects/zoom/zoom_config.cpp b/effects/zoom/zoom_config.cpp index dc0189b231..61f7991140 100644 --- a/effects/zoom/zoom_config.cpp +++ b/effects/zoom/zoom_config.cpp @@ -136,7 +136,7 @@ void ZoomEffectConfig::save() { m_ui->editor->save(); // undo() will restore to this state from now on KCModule::save(); - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(QStringLiteral("zoom")); diff --git a/scripting/genericscriptedconfig.cpp b/scripting/genericscriptedconfig.cpp index a06cc30649..4797b38cf3 100644 --- a/scripting/genericscriptedconfig.cpp +++ b/scripting/genericscriptedconfig.cpp @@ -122,7 +122,7 @@ KConfigGroup ScriptedEffectConfig::configGroup() void ScriptedEffectConfig::reload() { - OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), + OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); interface.reconfigureEffect(packageName());