diff --git a/autotests/fakeeffectplugin_version.cpp b/autotests/fakeeffectplugin_version.cpp index 1d1f5bcc03..07066d0d0e 100644 --- a/autotests/fakeeffectplugin_version.cpp +++ b/autotests/fakeeffectplugin_version.cpp @@ -38,7 +38,7 @@ class FakeEffectPluginFactory : public KWin::EffectPluginFactory Q_PLUGIN_METADATA(IID KPluginFactory_iid FILE "fakeeffectplugin_version.json") Q_INTERFACES(KPluginFactory) public: - explicit FakeEffectPluginFactory(const char *a = 0, QObject *b = 0) : KWin::EffectPluginFactory(a, b) {} + FakeEffectPluginFactory() {} ~FakeEffectPluginFactory() {} KWin::Effect *createEffect() const override { return new KWin::FakeVersionEffect(); diff --git a/libkwineffects/kwineffects.cpp b/libkwineffects/kwineffects.cpp index 6a91813dad..4343bc14fd 100644 --- a/libkwineffects/kwineffects.cpp +++ b/libkwineffects/kwineffects.cpp @@ -611,8 +611,7 @@ int Effect::requestedEffectChainPosition() const //**************************************** // EffectFactory //**************************************** -EffectPluginFactory::EffectPluginFactory(const char *componentName, QObject *parent) - : KPluginFactory(componentName, parent) +EffectPluginFactory::EffectPluginFactory() { } diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h index 1f978cd8b8..84797722cc 100644 --- a/libkwineffects/kwineffects.h +++ b/libkwineffects/kwineffects.h @@ -587,7 +587,7 @@ class KWINEFFECTS_EXPORT EffectPluginFactory : public KPluginFactory { Q_OBJECT public: - explicit EffectPluginFactory(const char *componentName = nullptr, QObject *parent = nullptr); + EffectPluginFactory(); virtual ~EffectPluginFactory(); /** * Returns whether the Effect is supported. @@ -644,7 +644,7 @@ public: Q_PLUGIN_METADATA(IID KPluginFactory_iid FILE jsonFile) \ Q_INTERFACES(KPluginFactory) \ public: \ - explicit factoryName(const char *a = 0, QObject *b = 0) : KWin::EffectPluginFactory(a, b) {} \ + explicit factoryName() {} \ ~factoryName() {} \ bool isSupported() const override { \ supported \ diff --git a/scripting/genericscriptedconfig.cpp b/scripting/genericscriptedconfig.cpp index 7a0a389c84..79e9298b40 100644 --- a/scripting/genericscriptedconfig.cpp +++ b/scripting/genericscriptedconfig.cpp @@ -33,19 +33,14 @@ namespace KWin { -GenericScriptedConfigFactory::GenericScriptedConfigFactory() - : KPluginFactory("kcm_kwin4_genericscripted") -{ -} - QObject *GenericScriptedConfigFactory::create(const char *iface, QWidget *parentWidget, QObject *parent, const QVariantList &args, const QString &keyword) { Q_UNUSED(iface) Q_UNUSED(parent) if (keyword.startsWith(QStringLiteral("kwin4_effect_"))) { - return new ScriptedEffectConfig(componentName(), keyword, parentWidget, args); + return new ScriptedEffectConfig(QStringLiteral("kcm_kwin4_genericscripted"), keyword, parentWidget, args); } else { - return new ScriptingConfig(componentName(), keyword, parentWidget, args); + return new ScriptingConfig(QStringLiteral("kcm_kwin4_genericscripted"), keyword, parentWidget, args); } } diff --git a/scripting/genericscriptedconfig.h b/scripting/genericscriptedconfig.h index 47e3ba0f0a..7d768913fe 100644 --- a/scripting/genericscriptedconfig.h +++ b/scripting/genericscriptedconfig.h @@ -32,8 +32,6 @@ class GenericScriptedConfigFactory : public KPluginFactory Q_OBJECT Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "genericscriptedconfig.json" ) Q_INTERFACES(KPluginFactory) -public: - GenericScriptedConfigFactory(); protected: QObject *create(const char *iface, QWidget *parentWidget, QObject *parent, const QVariantList &args, const QString &keyword) override;