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

Deprecate Plasma::Package API in PluginLoader

Browse Source 
Summary:
As Plasma::Package is deprecated API using Plasma::Package should also
be deprecated.

Reviewers: #plasma, #frameworks

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D3812
This commit is contained in:
Martin Gräßlin 2016-12-26 17:06:09 +01:00
parent 2affb1ab56
commit 4798310ed7
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plasma/pluginloader.cpp
View File

@ -434,6 +434,7 @@ ContainmentActions *PluginLoader::loadContainmentActions(Containment *parent, co
return actions; return actions;
} }
#ifndef PLASMA_NO_DEPRECATED
Package PluginLoader::loadPackage(const QString &packageFormat, const QString &specialization) Package PluginLoader::loadPackage(const QString &packageFormat, const QString &specialization)
{ {
if (!d->isDefaultLoader) { if (!d->isDefaultLoader) {
@ -480,6 +481,7 @@ Package PluginLoader::loadPackage(const QString &packageFormat, const QString &s
return Package(); return Package();
} }
#endif
QList<KPluginMetaData> PluginLoader::listAppletMetaData(const QString &category, const QString &parentApp) QList<KPluginMetaData> PluginLoader::listAppletMetaData(const QString &category, const QString &parentApp)
{ {
@ -770,12 +772,15 @@ Service *PluginLoader::internalLoadService(const QString &name, const QVariantLi
return 0; return 0;
} }
#ifndef PLASMA_NO_DEPRECATED
Package PluginLoader::internalLoadPackage(const QString &name, const QString &specialization) Package PluginLoader::internalLoadPackage(const QString &name, const QString &specialization)
{ {
Q_UNUSED(name); Q_UNUSED(name);
Q_UNUSED(specialization); Q_UNUSED(specialization);
return Package(); return Package();
} }
#endif
KPluginInfo::List PluginLoader::internalAppletInfo(const QString &category) const KPluginInfo::List PluginLoader::internalAppletInfo(const QString &category) const
{ {

10
src/plasma/pluginloader.h
View File

@ -148,8 +148,11 @@ public:
* @param specialization used to find script extensions for the given format, e.g. "QML" for "Plasma/Applet" * @param specialization used to find script extensions for the given format, e.g. "QML" for "Plasma/Applet"
* *
* @return a Package object matching name, or an invalid package on failure * @return a Package object matching name, or an invalid package on failure
* @deprecated since 5.29 use KPackage::PackageLoader::loadPackage
**/ **/
Package loadPackage(const QString &packageFormat, const QString &specialization = QString()); #ifndef PLASMA_NO_DEPRECATED
PLASMA_DEPRECATED Package loadPackage(const QString &packageFormat, const QString &specialization = QString());
#endif
/** /**
* Returns a list of all known applets. * Returns a list of all known applets.
@ -407,8 +410,11 @@ protected:
* @param parent the parent object, if any, for the service * @param parent the parent object, if any, for the service
* *
* @return a Service object, unlike Plasma::Service::loadService, this can return null. * @return a Service object, unlike Plasma::Service::loadService, this can return null.
* @deprecated since 5.29
**/ **/
virtual Package internalLoadPackage(const QString &name, const QString &specialization); #ifndef PLASMA_NO_DEPRECATED
virtual PLASMA_DEPRECATED Package internalLoadPackage(const QString &name, const QString &specialization);
#endif
/** /**
* A re-implementable method that allows subclasses to provide additional applets * A re-implementable method that allows subclasses to provide additional applets