From 3cdf7cb16a157f39e0bdfb31a8e838a503676aca Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Sat, 30 Apr 2022 14:57:14 +0200
Subject: [PATCH] Port away from deprecated KPluginLoader

---
 core/kget.cpp | 13 +++++++------
 core/kget.h   |  1 -
 kget_macro.h  |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/kget.cpp b/core/kget.cpp
index 32149ef3..28407ff4 100644
--- a/core/kget.cpp
+++ b/core/kget.cpp
@@ -1145,7 +1145,7 @@ void KGet::loadPlugins()
     m_pluginList.clear();
 
     // TransferFactory plugins
-    const QVector<KPluginMetaData> offers = KPluginLoader::findPlugins(QStringLiteral("kget"), [](const KPluginMetaData& md) {
+    const QVector<KPluginMetaData> offers = KPluginMetaData::findPlugins(QStringLiteral("kget"), [](const KPluginMetaData& md) {
         return md.value(QStringLiteral("X-KDE-KGet-framework-version")) == QString::number(FrameworkVersion) &&
             md.value(QStringLiteral("X-KDE-KGet-rank")).toInt() > 0 &&
             md.value(QStringLiteral("X-KDE-KGet-plugintype")) == QStringLiteral("TransferFactory");
@@ -1233,14 +1233,15 @@ void KGet::setHasNetworkConnection(bool hasConnection)
 
 KGetPlugin* KGet::loadPlugin(const KPluginMetaData& md)
 {
-    KPluginFactory* factory = KPluginLoader(md.fileName()).factory();
-    if (factory) {
-        return factory->create<TransferFactory>(KGet::m_mainWindow);
+    const KPluginFactory::Result<TransferFactory> result = KPluginFactory::instantiatePlugin<TransferFactory>(md, KGet::m_mainWindow);
+
+    if (result) {
+        return result.plugin;
     } else {
         KGet::showNotification(m_mainWindow, "error",
-                               i18n("Plugin loader could not load the plugin: %1.", md.fileName()),
+                               i18n("Plugin loader could not load the plugin %1: %2.", md.fileName(), result.errorString),
                                "dialog-info");
-        qCCritical(KGET_DEBUG) << "KPluginFactory could not load the plugin:" << md.fileName();
+        qCCritical(KGET_DEBUG) << "KPluginFactory could not load the plugin" << md.fileName() << result.errorText;
         return nullptr;
     }
 }
diff --git a/core/kget.h b/core/kget.h
index b79be670..f17f8ea6 100644
--- a/core/kget.h
+++ b/core/kget.h
@@ -21,7 +21,6 @@
 #include <KActionCollection>
 #include <KNotification>
 #include <KLocalizedString>
-#include <KPluginLoader>
 #include <KPluginFactory>
 
 #include <QNetworkConfigurationManager>
diff --git a/kget_macro.h b/kget_macro.h
index 426eddaa..0deb9f9c 100644
--- a/kget_macro.h
+++ b/kget_macro.h
@@ -12,7 +12,6 @@
 #define KGET_EXPORT_H
 
 #include <KPluginFactory>
-#include <KPluginLoader>
 
 /**
  * @short Declares a class as plugin.
-- 
GitLab