diff --git a/autotests/integration/dont_crash_reinitialize_compositor.cpp b/autotests/integration/dont_crash_reinitialize_compositor.cpp index 59d895d3e2..3d955e0f05 100644 --- a/autotests/integration/dont_crash_reinitialize_compositor.cpp +++ b/autotests/integration/dont_crash_reinitialize_compositor.cpp @@ -56,8 +56,7 @@ void DontCrashReinitializeCompositorTest::initTestCase() auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (const QString &name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/desktop_switching_animation_test.cpp b/autotests/integration/effects/desktop_switching_animation_test.cpp index 5c5348d714..dbb5ea86f2 100644 --- a/autotests/integration/effects/desktop_switching_animation_test.cpp +++ b/autotests/integration/effects/desktop_switching_animation_test.cpp @@ -52,8 +52,7 @@ void DesktopSwitchingAnimationTest::initTestCase() auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (const QString &name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/maximize_animation_test.cpp b/autotests/integration/effects/maximize_animation_test.cpp index 943c63c967..ac3eb0f532 100644 --- a/autotests/integration/effects/maximize_animation_test.cpp +++ b/autotests/integration/effects/maximize_animation_test.cpp @@ -50,8 +50,7 @@ void MaximizeAnimationTest::initTestCase() auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (const QString &name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/minimize_animation_test.cpp b/autotests/integration/effects/minimize_animation_test.cpp index b5e961e1ef..eccdd117c4 100644 --- a/autotests/integration/effects/minimize_animation_test.cpp +++ b/autotests/integration/effects/minimize_animation_test.cpp @@ -53,8 +53,7 @@ void MinimizeAnimationTest::initTestCase() auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (const QString &name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/popup_open_close_animation_test.cpp b/autotests/integration/effects/popup_open_close_animation_test.cpp index 2b7a8c4f60..aa8707d765 100644 --- a/autotests/integration/effects/popup_open_close_animation_test.cpp +++ b/autotests/integration/effects/popup_open_close_animation_test.cpp @@ -59,8 +59,7 @@ void PopupOpenCloseAnimationTest::initTestCase() auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (const QString &name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/scripted_effects_test.cpp b/autotests/integration/effects/scripted_effects_test.cpp index 4a7640540f..9888bff2f3 100644 --- a/autotests/integration/effects/scripted_effects_test.cpp +++ b/autotests/integration/effects/scripted_effects_test.cpp @@ -135,12 +135,10 @@ void ScriptedEffectsTest::initTestCase() kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); QVERIFY(waylandServer()->init(s_socketName)); - ScriptedEffectLoader loader; - // disable all effects - we don't want to have it interact with the rendering auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (QString name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/slidingpopups_test.cpp b/autotests/integration/effects/slidingpopups_test.cpp index 7d35a51ab7..3326d23fe7 100644 --- a/autotests/integration/effects/slidingpopups_test.cpp +++ b/autotests/integration/effects/slidingpopups_test.cpp @@ -60,8 +60,7 @@ void SlidingPopupsTest::initTestCase() // disable all effects - we don't want to have it interact with the rendering auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (QString name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/toplevel_open_close_animation_test.cpp b/autotests/integration/effects/toplevel_open_close_animation_test.cpp index bb6d7f0906..9c9c288218 100644 --- a/autotests/integration/effects/toplevel_open_close_animation_test.cpp +++ b/autotests/integration/effects/toplevel_open_close_animation_test.cpp @@ -55,8 +55,7 @@ void ToplevelOpenCloseAnimationTest::initTestCase() auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (const QString &name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/translucency_test.cpp b/autotests/integration/effects/translucency_test.cpp index 4b344f4052..c4ab2f0f1c 100644 --- a/autotests/integration/effects/translucency_test.cpp +++ b/autotests/integration/effects/translucency_test.cpp @@ -53,8 +53,7 @@ void TranslucencyTest::initTestCase() // disable all effects - we don't want to have it interact with the rendering auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (QString name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/windowgeometry_test.cpp b/autotests/integration/effects/windowgeometry_test.cpp index 2f16eb0b60..ca3e19de18 100644 --- a/autotests/integration/effects/windowgeometry_test.cpp +++ b/autotests/integration/effects/windowgeometry_test.cpp @@ -49,8 +49,7 @@ void WindowGeometryTest::initTestCase() // disable all effects - we don't want to have it interact with the rendering auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (QString name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/effects/wobbly_shade_test.cpp b/autotests/integration/effects/wobbly_shade_test.cpp index 7df598943e..84eaf26d06 100644 --- a/autotests/integration/effects/wobbly_shade_test.cpp +++ b/autotests/integration/effects/wobbly_shade_test.cpp @@ -53,8 +53,7 @@ void WobblyWindowsShadeTest::initTestCase() // disable all effects - we don't want to have it interact with the rendering auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (QString name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/generic_scene_opengl_test.cpp b/autotests/integration/generic_scene_opengl_test.cpp index c15136d621..0f1d925aa2 100644 --- a/autotests/integration/generic_scene_opengl_test.cpp +++ b/autotests/integration/generic_scene_opengl_test.cpp @@ -47,8 +47,7 @@ void GenericSceneOpenGLTest::initTestCase() // disable all effects - we don't want to have it interact with the rendering auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (QString name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/scene_qpainter_test.cpp b/autotests/integration/scene_qpainter_test.cpp index 9565e5ebb0..f409f6ccc4 100644 --- a/autotests/integration/scene_qpainter_test.cpp +++ b/autotests/integration/scene_qpainter_test.cpp @@ -63,8 +63,7 @@ void SceneQPainterTest::initTestCase() // disable all effects - we don't want to have it interact with the rendering auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (QString name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/screenedges_test.cpp b/autotests/integration/screenedges_test.cpp index 509d6017c2..9027fda4ff 100644 --- a/autotests/integration/screenedges_test.cpp +++ b/autotests/integration/screenedges_test.cpp @@ -77,8 +77,7 @@ void ScreenEdgesTest::initTestCase() // Disable effects, in particular present windows, which reserves a screen edge. auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (const QString &name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/autotests/integration/scripting/screenedge_test.cpp b/autotests/integration/scripting/screenedge_test.cpp index 56768eca80..f5ae800f60 100644 --- a/autotests/integration/scripting/screenedge_test.cpp +++ b/autotests/integration/scripting/screenedge_test.cpp @@ -58,8 +58,7 @@ void ScreenEdgeTest::initTestCase() // disable all effects to prevent them grabbing edges KConfigGroup plugins(config, QStringLiteral("Plugins")); - ScriptedEffectLoader loader; - const auto builtinNames = BuiltInEffects::availableEffectNames() << loader.listOfKnownEffects(); + const auto builtinNames = EffectLoader().listOfKnownEffects(); for (QString name : builtinNames) { plugins.writeEntry(name + QStringLiteral("Enabled"), false); } diff --git a/src/effectloader.h b/src/effectloader.h index f7b6f3adbc..aea1582b40 100644 --- a/src/effectloader.h +++ b/src/effectloader.h @@ -348,7 +348,7 @@ private: QMetaObject::Connection m_queryConnection; }; -class EffectLoader : public AbstractEffectLoader +class KWIN_EXPORT EffectLoader : public AbstractEffectLoader { Q_OBJECT public: