From ddf2c892064b214b0622c6dbce4537471aeb1c1c Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Sun, 9 Jan 2022 20:32:38 +0100 Subject: [PATCH] Remove plugin loading using keywords This was deprecated in during the 5.24 development period. All KDE consumers are ported away from it. Third parties will get meaningful runtime messages which instruct them to register the plugins without keywords. The create overloads which take keywords were already deprecated in KPluginFactory. --- .../declarative-plugin/previewbridge.cpp | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp index 913eef0705..74135faeca 100644 --- a/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp +++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp @@ -147,16 +147,7 @@ DecorationButton *PreviewBridge::createButton(KDecoration2::Decoration *decorati if (!m_valid) { return nullptr; } - auto button = m_factory->create(parent, QVariantList({QVariant::fromValue(type), QVariant::fromValue(decoration)})); -#if KCOREADDONS_BUILD_DEPRECATED_SINCE(5, 87) - if (!button) { - button = m_factory->create(QStringLiteral("button"), parent, QVariantList({QVariant::fromValue(type), QVariant::fromValue(decoration)})); - if (button) { - qWarning() << "Loading a KDecoration2::DecorationButton using the button keyword is deprecated in KWin 5.23, register the plugin without a keyword instead" << m_plugin; - } - } -#endif - return button; + return m_factory->create(parent, QVariantList({QVariant::fromValue(type), QVariant::fromValue(decoration)})); } void PreviewBridge::configure(QQuickItem *ctx) @@ -177,18 +168,7 @@ void PreviewBridge::configure(QQuickItem *ctx) args.insert(QStringLiteral("theme"), m_theme); } - KCModule *kcm = nullptr; - - kcm = m_factory->create(dialog, QVariantList({args})); - -#if KCOREADDONS_BUILD_DEPRECATED_SINCE(5, 87) - if (!kcm) { - kcm = m_factory->create(QStringLiteral("kcmodule"), dialog, QVariantList({args})); - if (kcm) { - qWarning() << "Loading a KCModule using the kcmodule keyword is deprecated in KWin 5.23, register the plugin without a keyword instead" << m_theme; - } - } -#endif + KCModule *kcm = m_factory->create(dialog, QVariantList({args})); if (!kcm) { return;