Changeset View
Changeset View
Standalone View
Standalone View
core/pluginloader.cpp
Show All 30 Lines | |||||
31 | PluginLoader* PluginLoader::instance() | 31 | PluginLoader* PluginLoader::instance() | ||
32 | { | 32 | { | ||
33 | static PluginLoader* instance = new PluginLoader(); | 33 | static PluginLoader* instance = new PluginLoader(); | ||
34 | return instance; | 34 | return instance; | ||
35 | } | 35 | } | ||
36 | 36 | | |||
37 | PluginLoader::PluginLoader() | 37 | PluginLoader::PluginLoader() | ||
38 | { | 38 | { | ||
39 | QVector<KPluginMetaData> data = KPluginLoader::findPlugins(QStringLiteral("kdeconnect/")); | 39 | const QVector<KPluginMetaData> data = KPluginLoader::findPlugins(QStringLiteral("kdeconnect/")); | ||
40 | Q_FOREACH (const KPluginMetaData& metadata, data) { | 40 | for (const KPluginMetaData& metadata : data) { | ||
41 | plugins[metadata.pluginId()] = metadata; | 41 | plugins[metadata.pluginId()] = metadata; | ||
42 | } | 42 | } | ||
43 | } | 43 | } | ||
44 | 44 | | |||
45 | QStringList PluginLoader::getPluginList() const | 45 | QStringList PluginLoader::getPluginList() const | ||
46 | { | 46 | { | ||
47 | return plugins.keys(); | 47 | return plugins.keys(); | ||
48 | } | 48 | } | ||
Show All 32 Lines | 56 | { | |||
81 | 81 | | |||
82 | //qCDebug(KDECONNECT_CORE) << "Loaded plugin:" << service.pluginId(); | 82 | //qCDebug(KDECONNECT_CORE) << "Loaded plugin:" << service.pluginId(); | ||
83 | return ret; | 83 | return ret; | ||
84 | } | 84 | } | ||
85 | 85 | | |||
86 | QStringList PluginLoader::incomingCapabilities() const | 86 | QStringList PluginLoader::incomingCapabilities() const | ||
87 | { | 87 | { | ||
88 | QSet<QString> ret; | 88 | QSet<QString> ret; | ||
89 | Q_FOREACH (const KPluginMetaData& service, plugins) { | 89 | for (const KPluginMetaData& service : qAsConst(plugins)) { | ||
90 | ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPackageType")).toSet(); | 90 | ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPackageType")).toSet(); | ||
91 | } | 91 | } | ||
92 | return ret.toList(); | 92 | return ret.toList(); | ||
93 | } | 93 | } | ||
94 | 94 | | |||
95 | QStringList PluginLoader::outgoingCapabilities() const | 95 | QStringList PluginLoader::outgoingCapabilities() const | ||
96 | { | 96 | { | ||
97 | QSet<QString> ret; | 97 | QSet<QString> ret; | ||
98 | Q_FOREACH (const KPluginMetaData& service, plugins) { | 98 | for (const KPluginMetaData& service : qAsConst(plugins)) { | ||
99 | ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPackageType")).toSet(); | 99 | ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPackageType")).toSet(); | ||
100 | } | 100 | } | ||
101 | return ret.toList(); | 101 | return ret.toList(); | ||
102 | } | 102 | } | ||
103 | 103 | | |||
104 | QSet<QString> PluginLoader::pluginsForCapabilities(const QSet<QString>& incoming, const QSet<QString>& outgoing) | 104 | QSet<QString> PluginLoader::pluginsForCapabilities(const QSet<QString>& incoming, const QSet<QString>& outgoing) | ||
105 | { | 105 | { | ||
106 | QSet<QString> ret; | 106 | QSet<QString> ret; | ||
107 | 107 | | |||
108 | Q_FOREACH (const KPluginMetaData& service, plugins) { | 108 | for (const KPluginMetaData& service : qAsConst(plugins)) { | ||
109 | const QSet<QString> pluginIncomingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPackageType")).toSet(); | 109 | const QSet<QString> pluginIncomingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPackageType")).toSet(); | ||
110 | const QSet<QString> pluginOutgoingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPackageType")).toSet(); | 110 | const QSet<QString> pluginOutgoingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPackageType")).toSet(); | ||
111 | 111 | | |||
112 | bool capabilitiesEmpty = (pluginIncomingCapabilities.isEmpty() && pluginOutgoingCapabilities.isEmpty()); | 112 | bool capabilitiesEmpty = (pluginIncomingCapabilities.isEmpty() && pluginOutgoingCapabilities.isEmpty()); | ||
113 | #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) | 113 | #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) | ||
114 | bool capabilitiesIntersect = (outgoing.intersects(pluginIncomingCapabilities) || incoming.intersects(pluginOutgoingCapabilities)); | 114 | bool capabilitiesIntersect = (outgoing.intersects(pluginIncomingCapabilities) || incoming.intersects(pluginOutgoingCapabilities)); | ||
115 | #else | 115 | #else | ||
116 | QSet<QString> commonIncoming = incoming; | 116 | QSet<QString> commonIncoming = incoming; | ||
Show All 15 Lines |