diff --git a/src/plasma/pluginloader.h b/src/plasma/pluginloader.h --- a/src/plasma/pluginloader.h +++ b/src/plasma/pluginloader.h @@ -148,8 +148,11 @@ * @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 + * @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. @@ -407,8 +410,11 @@ * @param parent the parent object, if any, for the service * * @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 diff --git a/src/plasma/pluginloader.cpp b/src/plasma/pluginloader.cpp --- a/src/plasma/pluginloader.cpp +++ b/src/plasma/pluginloader.cpp @@ -434,6 +434,7 @@ return actions; } +#ifndef PLASMA_NO_DEPRECATED Package PluginLoader::loadPackage(const QString &packageFormat, const QString &specialization) { if (!d->isDefaultLoader) { @@ -480,6 +481,7 @@ return Package(); } +#endif QList PluginLoader::listAppletMetaData(const QString &category, const QString &parentApp) { @@ -770,12 +772,15 @@ return 0; } + +#ifndef PLASMA_NO_DEPRECATED Package PluginLoader::internalLoadPackage(const QString &name, const QString &specialization) { Q_UNUSED(name); Q_UNUSED(specialization); return Package(); } +#endif KPluginInfo::List PluginLoader::internalAppletInfo(const QString &category) const {