yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove plugin loading using keywords

Browse source 
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.
This commit is contained in:
Alexander Lohnau 2022-01-09 20:32:38 +01:00
parent b696bf7dec
commit ddf2c89206
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp
View file

@ -147,16 +147,7 @@ DecorationButton *PreviewBridge::createButton(KDecoration2::Decoration *decorati
if (!m_valid) { if (!m_valid) {
return nullptr; return nullptr;
} }
auto button = m_factory->create<KDecoration2::DecorationButton>(parent, QVariantList({QVariant::fromValue(type), QVariant::fromValue(decoration)})); return m_factory->create<KDecoration2::DecorationButton>(parent, QVariantList({QVariant::fromValue(type), QVariant::fromValue(decoration)}));
#if KCOREADDONS_BUILD_DEPRECATED_SINCE(5, 87)
if (!button) {
button = m_factory->create<KDecoration2::DecorationButton>(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;
} }
void PreviewBridge::configure(QQuickItem *ctx) void PreviewBridge::configure(QQuickItem *ctx)
@ -177,18 +168,7 @@ void PreviewBridge::configure(QQuickItem *ctx)
args.insert(QStringLiteral("theme"), m_theme); args.insert(QStringLiteral("theme"), m_theme);
} }
KCModule *kcm = nullptr; KCModule *kcm = m_factory->create<KCModule>(dialog, QVariantList({args}));
kcm = m_factory->create<KCModule>(dialog, QVariantList({args}));
#if KCOREADDONS_BUILD_DEPRECATED_SINCE(5, 87)
if (!kcm) {
kcm = m_factory->create<KCModule>(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
if (!kcm) { if (!kcm) {
return; return;