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

Fix build with KF set to EXCLUDE_DEPRECATED_BEFORE_AND_AT=CURRENT

Browse Source 
Summary: NO_CHANGELOG

Reviewers: #plasma, mart, apol

Reviewed By: apol

Subscribers: kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D29600
This commit is contained in:
Friedrich W. H. Kossebau 2020-05-10 17:03:56 +02:00
parent 50530a7739
commit 4bd45c6de9
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plasma/pluginloader.cpp
View File

@ -502,13 +502,18 @@ QList<KPluginMetaData> PluginLoader::listAppletMetaData(const QString &category,
KPluginInfo::List PluginLoader::listAppletInfo(const QString &category, const QString &parentApp) KPluginInfo::List PluginLoader::listAppletInfo(const QString &category, const QString &parentApp)
{ {
KPluginInfo::List list;
const auto plugins = listAppletMetaData(category, parentApp); const auto plugins = listAppletMetaData(category, parentApp);
#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0)
KPluginInfo::List list;
//NOTE: it still produces kplugininfos from KServices because some user code expects //NOTE: it still produces kplugininfos from KServices because some user code expects
//info.service() to be valid and would crash otherwise //info.service() to be valid and would crash otherwise
for (const auto &md : plugins) { for (const auto &md : plugins) {
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations")
QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations")
auto pi = md.metaDataFileName().endsWith(QLatin1String(".json")) ? KPluginInfo(md) : KPluginInfo(KService::serviceByStorageId(md.metaDataFileName())); auto pi = md.metaDataFileName().endsWith(QLatin1String(".json")) ? KPluginInfo(md) : KPluginInfo(KService::serviceByStorageId(md.metaDataFileName()));
QT_WARNING_POP
if (!pi.isValid()) { if (!pi.isValid()) {
qCWarning(LOG_PLASMA) << "Could not load plugin info for plugin :" << md.pluginId() << "skipping plugin"; qCWarning(LOG_PLASMA) << "Could not load plugin info for plugin :" << md.pluginId() << "skipping plugin";
continue; continue;
@ -516,6 +521,9 @@ KPluginInfo::List PluginLoader::listAppletInfo(const QString &category, const QS
list << pi; list << pi;
} }
return list; return list;
#else
return KPluginInfo::fromMetaData(plugins.toVector());
#endif
} }
QList<KPluginMetaData> PluginLoader::listAppletMetaDataForMimeType(const QString &mimeType) QList<KPluginMetaData> PluginLoader::listAppletMetaDataForMimeType(const QString &mimeType)
@ -673,7 +681,7 @@ QStringList PluginLoader::listContainmentTypes()
QSet<QString> types; QSet<QString> types;
for (const KPluginInfo &containmentInfo : containmentInfos) { for (const KPluginInfo &containmentInfo : containmentInfos) {
const QStringList theseTypes = containmentInfo.service()->property(QStringLiteral("X-Plasma-ContainmentType")).toStringList(); const QStringList theseTypes = containmentInfo.property(QStringLiteral("X-Plasma-ContainmentType")).toStringList();
for (const QString &type : theseTypes) { for (const QString &type : theseTypes) {
types.insert(type); types.insert(type);
} }
@ -719,14 +727,20 @@ KPluginInfo::List PluginLoader::listContainmentActionsInfo(const QString &parent
knownPlugins.insert(p.pluginName()); knownPlugins.insert(p.pluginName());
} }
#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0)
//FIXME: this is only for backwards compatibility, but probably will have to stay //FIXME: this is only for backwards compatibility, but probably will have to stay
//for the time being //for the time being
const KService::List offers = KServiceTypeTrader::self()->query(QStringLiteral("Plasma/ContainmentActions"), constraint); const KService::List offers = KServiceTypeTrader::self()->query(QStringLiteral("Plasma/ContainmentActions"), constraint);
for (KService::Ptr s : offers) { for (KService::Ptr s : offers) {
if (!knownPlugins.contains(s->pluginKeyword())) { if (!knownPlugins.contains(s->pluginKeyword())) {
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations")
QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations")
list.append(KPluginInfo(s)); list.append(KPluginInfo(s));
QT_WARNING_POP
} }
} }
#endif
return list; return list;
} }

21
src/plasma/private/containmentactions_p.h
View File

@ -25,11 +25,30 @@
namespace Plasma namespace Plasma
{ {
#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0)
static KPluginMetaData pluginMetaDatafromArg(const QVariant& arg)
{
if (arg.canConvert<KPluginMetaData>()) {
return arg.value<KPluginMetaData>();
}
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations")
QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations")
return KPluginInfo(KService::serviceByStorageId(arg.toString())).toMetaData();
QT_WARNING_POP
}
#endif
class ContainmentActionsPrivate class ContainmentActionsPrivate
{ {
public: public:
ContainmentActionsPrivate(const QVariant& arg, ContainmentActions */*containmentActions*/) ContainmentActionsPrivate(const QVariant& arg, ContainmentActions */*containmentActions*/)
: containmentActionsDescription(arg.canConvert<KPluginMetaData>() ? arg.value<KPluginMetaData>() : KPluginInfo(KService::serviceByStorageId(arg.toString())).toMetaData()) #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0)
: containmentActionsDescription(pluginMetaDatafromArg(arg))
#else
: containmentActionsDescription(arg.value<KPluginMetaData>())
#endif
{ {
} }