Port away from deprecated KPluginLoader

[dolphin.git] / src / views / versioncontrol / versioncontrolobserver.cpp

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 9f0933a487be4a74685a5367bd116b89d3f4ec6e..895ce6614ab332e8fd88e5a1342e7e036a1ac58f 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -13,9 +13,7 @@
 #include "updateitemstatesthread.h"
 
 #include <KLocalizedString>
 #include "updateitemstatesthread.h"
 
 #include <KLocalizedString>

-#include <KService>
-#include <KServiceTypeTrader>
-#include <KPluginLoader>
+#include <KPluginFactory>

 #include <KPluginMetaData>
 
 #include <QTimer>
 #include <KPluginMetaData>
 
 #include <QTimer>


@@ -281,15 +279,13 @@ void VersionControlObserver::initPlugins()
         // all fileview version control plugins and remember them in 'plugins'.
         const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 
         // all fileview version control plugins and remember them in 'plugins'.
         const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 

-        const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("dolphin/vcs"));
+        const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("dolphin/vcs"));

 
         QSet<QString> loadedPlugins;
 
         for (const auto &p : plugins) {
             if (enabledPlugins.contains(p.name())) {
 
         QSet<QString> loadedPlugins;
 
         for (const auto &p : plugins) {
             if (enabledPlugins.contains(p.name())) {

-                KPluginLoader loader(p.fileName());
-                KPluginFactory *factory = loader.factory();
-                KVersionControlPlugin *plugin = factory->create<KVersionControlPlugin>();
+                auto plugin = KPluginFactory::instantiatePlugin<KVersionControlPlugin>(p).plugin;

                 if (plugin) {
                     m_plugins.append(plugin);
                     loadedPlugins += p.name();
                 if (plugin) {
                     m_plugins.append(plugin);
                     loadedPlugins += p.name();


@@ -297,20 +293,6 @@ void VersionControlObserver::initPlugins()
             }
         }
 
             }
         }
 

-        // Deprecated: load plugins using KService. This mechanism will be removed with KF6
-        const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("FileViewVersionControlPlugin"));
-        for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) {
-            if (loadedPlugins.contains((*it)->property("Name", QVariant::String).toString())) {
-                continue;
-            }
-            if (enabledPlugins.contains((*it)->name())) {
-                KVersionControlPlugin* plugin = (*it)->createInstance<KVersionControlPlugin>(this);
-                if (plugin) {
-                    m_plugins.append(plugin);
-                }
-            }
-        }
-

         for (auto &plugin : qAsConst(m_plugins)) {
             connect(plugin, &KVersionControlPlugin::itemVersionsChanged,
                 this, &VersionControlObserver::silentDirectoryVerification);
         for (auto &plugin : qAsConst(m_plugins)) {
             connect(plugin, &KVersionControlPlugin::itemVersionsChanged,
                 this, &VersionControlObserver::silentDirectoryVerification);