From 4798310ed7885db9f665a488e583df7a911c7d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Mon, 26 Dec 2016 17:06:09 +0100
Subject: [PATCH] Deprecate Plasma::Package API in PluginLoader

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
---
 src/plasma/pluginloader.cpp |  5 +++++
 src/plasma/pluginloader.h   | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/plasma/pluginloader.cpp b/src/plasma/pluginloader.cpp
index d535afefa..260c874ac 100644
--- a/src/plasma/pluginloader.cpp
+++ b/src/plasma/pluginloader.cpp
@@ -434,6 +434,7 @@ ContainmentActions *PluginLoader::loadContainmentActions(Containment *parent, co
     return actions;
 }
 
+#ifndef PLASMA_NO_DEPRECATED
 Package PluginLoader::loadPackage(const QString &packageFormat, const QString &specialization)
 {
     if (!d->isDefaultLoader) {
@@ -480,6 +481,7 @@ Package PluginLoader::loadPackage(const QString &packageFormat, const QString &s
 
     return Package();
 }
+#endif
 
 QList<KPluginMetaData> PluginLoader::listAppletMetaData(const QString &category, const QString &parentApp)
 {
@@ -770,12 +772,15 @@ Service *PluginLoader::internalLoadService(const QString &name, const QVariantLi
     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
 {
diff --git a/src/plasma/pluginloader.h b/src/plasma/pluginloader.h
index 484767ac0..d096684b2 100644
--- a/src/plasma/pluginloader.h
+++ b/src/plasma/pluginloader.h
@@ -148,8 +148,11 @@ public:
      * @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 @@ protected:
      * @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