tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Plugin stuff

Browse source
This commit is contained in:
Nicolas Fella 2020-11-29 18:27:13 +01:00
parent c314093d7e
commit 514f38a63c
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
core/pluginloader.cpp
View file

@ -60,37 +60,31 @@ KPluginMetaData PluginLoader::getPluginInfo(const QString& name) const
KdeConnectPlugin* PluginLoader::instantiatePluginForDevice(const QString& pluginName, Device* device) const KdeConnectPlugin* PluginLoader::instantiatePluginForDevice(const QString& pluginName, Device* device) const
{ {
KdeConnectPlugin* ret = nullptr;
KPluginMetaData service = plugins.value(pluginName); KPluginMetaData service = plugins.value(pluginName);
if (!service.isValid()) {
qCDebug(KDECONNECT_CORE) << "Plugin unknown" << pluginName; const QStringList outgoingInterfaces = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPacketType"));
return ret; const QVariantList args = {QVariant::fromValue(device), pluginName, outgoingInterfaces, service.iconName()};
}
#ifdef SAILFISHOS #ifdef SAILFISHOS
KPluginFactory* factory = pluginsFactories.value(pluginName); KPluginFactory* factory = pluginsFactories.value(pluginName);
#else
KPluginLoader loader(service.fileName());
KPluginFactory* factory = loader.factory();
if (!factory) {
qCDebug(KDECONNECT_CORE) << "KPluginFactory could not load the plugin:" << service.pluginId() << loader.errorString();
return ret;
}
#endif
const QStringList outgoingInterfaces = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPacketType")); const auto ret = factory->create<KdeConnectPlugin>(device, args);
QVariant deviceVariant = QVariant::fromValue<Device*>(device);
ret = factory->create<KdeConnectPlugin>(device, QVariantList() << deviceVariant << pluginName << outgoingInterfaces << service.iconName());
if (!ret) { if (!ret) {
qCDebug(KDECONNECT_CORE) << "Error loading plugin"; qCDebug(KDECONNECT_CORE) << "Error loading plugin";
}
return ret; return ret;
#else
auto result = KPluginLoader::instantiatePlugin<KdeConnectPlugin>(service.fileName(), device, args);
if (result) {
return *result;
} }
//qCDebug(KDECONNECT_CORE) << "Loaded plugin:" << service.pluginId(); qCDebug(KDECONNECT_CORE) << "Error loading plugin" << *result;
return ret; return nullptr;
#endif
} }
QStringList PluginLoader::incomingCapabilities() const QStringList PluginLoader::incomingCapabilities() const