alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port packageStructure loading from KPluginTrader

Browse Source 
It will be deprecated.
This commit is contained in:
Nicolas Fella 2020-11-21 22:50:18 +01:00
parent 1a1133006b
commit d7f118e589
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/plasma/pluginloader.cpp
View File

@ -435,14 +435,29 @@ Package PluginLoader::loadPackage(const QString &packageFormat, const QString &s
structure->d->internalStructure = internalStructure;
//fallback to old structures
} else {
const QString constraint = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(packageFormat);
structure = KPluginTrader::createInstanceFromQuery<Plasma::PackageStructure>(PluginLoaderPrivate::s_packageStructurePluginDir, QStringLiteral("Plasma/PackageStructure"), constraint, nullptr);
if (structure) {
structure->d->internalStructure = new PackageStructureWrapper(structure);
auto filter = [packageFormat](const KPluginMetaData &md) -> bool
{
return md.value(QStringLiteral("X-KDE-PluginInfo-Name")) == packageFormat;
};
const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(PluginLoaderPrivate::s_packageStructurePluginDir, filter);
if (!plugins.isEmpty()) {
KPluginLoader loader(plugins.first().fileName());
KPluginFactory* factory = loader.factory();
if (!factory) {
qWarning() << "Error loading plugin:" << loader.errorString();
} else {
structure = factory->create<Plasma::PackageStructure>();
}
if (structure) {
structure->d->internalStructure = new PackageStructureWrapper(structure);
}
}
}
if (structure) {
d->structures.insert(hashkey, structure);
return Package(structure);