diff --git a/kcmkwin/kwindecoration/decorationmodel.cpp b/kcmkwin/kwindecoration/decorationmodel.cpp --- a/kcmkwin/kwindecoration/decorationmodel.cpp +++ b/kcmkwin/kwindecoration/decorationmodel.cpp @@ -24,7 +24,7 @@ // KDE #include #include -#include +#include // Qt #include @@ -132,9 +132,9 @@ { beginResetModel(); m_plugins.clear(); - const auto plugins = KPluginTrader::self()->query(s_pluginName, s_pluginName); + const auto plugins = KPluginLoader::findPlugins(s_pluginName); for (const auto &info : plugins) { - KPluginLoader loader(info.libraryPath()); + KPluginLoader loader(info.fileName()); KPluginFactory *factory = loader.factory(); if (!factory) { continue; @@ -164,7 +164,7 @@ const auto themesMap = themes.toMap(); for (auto it = themesMap.begin(); it != themesMap.end(); ++it) { Data d; - d.pluginName = info.pluginName(); + d.pluginName = info.pluginId(); d.themeName = it.value().toString(); d.visibleName = it.key(); QMetaObject::invokeMethod(themeFinder.data(), "hasConfiguration", @@ -179,8 +179,8 @@ data.configuration = isConfigureable(decoSettingsMap); data.recommendedBorderSize = recommendedBorderSize(decoSettingsMap); } - data.pluginName = info.pluginName(); - data.visibleName = info.name().isEmpty() ? info.pluginName() : info.name(); + data.pluginName = info.pluginId(); + data.visibleName = info.name().isEmpty() ? info.pluginId() : info.name(); data.themeName = data.visibleName; m_plugins.emplace_back(std::move(data));